diff --git a/.github/ISSUE_TEMPLATE/bug-report.yml b/.github/ISSUE_TEMPLATE/bug-report.yml
new file mode 100644
index 00000000000..f8185afb5ff
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug-report.yml
@@ -0,0 +1,75 @@
+name: 🐛 Bug report
+description: Create a bug report
+body:
+  - type: checkboxes
+    attributes:
+      label: Are you certain it's a bug?
+      description: If you're uncertain, please report at https://github.com/serverless/serverless/discussions instead
+      options:
+        - label: Yes, it looks like a bug
+          required: true
+  - type: checkboxes
+    attributes:
+      label: Is the issue caused by a plugin?
+      description: If it comes from an external plugin, please report in the plugin issue tracker
+      options:
+        - label: It is not a plugin issue
+          required: true
+  - type: checkboxes
+    attributes:
+      label: Are you using the latest version?
+      description: Latest version can be checked at https://github.com/serverless/serverless/releases/latest
+      options:
+        - label: Yes, I'm using the latest version
+          required: true
+  - type: checkboxes
+    attributes:
+      label: Is there an existing issue for this?
+      description: Please search to see if an issue already exists
+      options:
+        - label: I have searched existing issues, it hasn't been reported yet
+          required: true
+  - type: textarea
+    attributes:
+      label: Issue description
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Service configuration (serverless.yml) content
+      description: |
+        Provide  COMPLETE content of serverless.yml, ensuring that:
+        • It consistently reproduces described issue
+        • It's as minimal as possible
+        • Ideally with no plugins involved (plugin related issues need to be reported at plugin repositories)
+        • Has sensitive parts masked out
+
+        If not applicable, fill with "N/A"
+      render: yaml
+    validations:
+      required: true
+  - type: input
+    attributes:
+      label: Command name and used flags
+      description: |
+        Full command name with used flags (If not applicable, fill with "N/A")
+      placeholder: serverless <command name> [...flags]
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Command output
+      description: |
+        COMPLETE command output.
+
+        If not applicable, fill with "N/A"
+      render: shell
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Environment information
+      description: '"serverless --version" output'
+      render: shell
+    validations:
+      required: true
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
deleted file mode 100644
index 0f2a901c510..00000000000
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ /dev/null
@@ -1,61 +0,0 @@
----
-name: '🐛 Bug report'
-about: Create a bug report
----
-
-<!-- ⚠️⚠️ Acknowledge ALL below remarks -->
-<!-- ⚠️⚠️ Request may not be processed if it doesn't meet outlined criteria -->
-
-<!-- ⚠️⚠️ Ensure you're using *latest* version of a Framework -->
-<!-- ⚠️⚠️ If you're uncertain you deal with a bug, ask first at https://forum.serverless.com -->
-<!-- ⚠️⚠️ If your issue is influenced by a plugin, report at plugin repository, not here -->
-<!-- ⚠️⚠️ Search existing issues to avoid creating duplicates  -->
-
-<!-- ⚠️⚠️ Answer ALL the questions below -->
-
-<!--
-Q1: Describe the issue
--->
-
-⚠️⚠️ REPLACE WITH DESCRIPTION
-
-<!--
-Q2: Provide (in below placeholder) FULL content of serverless.yml, ensuring that:
-• It consistently reproduces described issue
-• It's as minimal as possible
-• There's no plugins involved (plugin related issues need to be reported at plugin repositories)
-• Has sensitive parts masked out
--->
-
-<details>
-<summary><code>serverless.yml</code></summary>
-
-```yaml
-# ⚠️⚠️ REPLACE THIS COMMENT WITH FULL serverless.yml CONTENT
-```
-
-</details>
-
-<!--
-Q3: Provide (in below placeholder) FULL name and output of the command that exposes the problem.
-       Note: Ensure SLS_DEBUG=* env var for verbose debug output
--->
-
-<details>
-<summary><b><code>⚠️⚠️ REPLACE WITH FULL COMMAND NAME</code> output</b></summary>
-
-```
-⚠️⚠️ REPLACE WITH FULL COMMAND OUTPUT
-```
-
-</details>
-
-<!--
-Q4: Provide (in below placeholder) output of serverless --version
--->
-
-<b>Installed version</b>
-
-```
-⚠️⚠️ REPLACE WITH `serverless --version` OUTPUT
-```
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
index 33cdd346c64..764ab7fadf8 100644
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -1,5 +1,5 @@
 blank_issues_enabled: false
 contact_links:
   - name: Question
-    url: https://forum.serverless.com/
+    url: https://github.com/serverless/serverless/discussions
     about: Please ask and answer questions here
diff --git a/.github/ISSUE_TEMPLATE/feature-request.yml b/.github/ISSUE_TEMPLATE/feature-request.yml
new file mode 100644
index 00000000000..b2e7548b143
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature-request.yml
@@ -0,0 +1,21 @@
+name: 🎉 Feature request
+description: Suggest an idea
+body:
+  - type: checkboxes
+    attributes:
+      label: Is there an existing issue for this?
+      description: Please search to see if an issue already exists
+      options:
+        - label: I have searched existing issues, it hasn't been reported yet
+          required: true
+  - type: textarea
+    attributes:
+      label: Use case description
+      description: Describe the problem (use case) that needs to be solved
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Proposed solution (optional)
+      description: |
+        e.g. propose how the configuration of the new feature could look
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
deleted file mode 100644
index 668060785ee..00000000000
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ /dev/null
@@ -1,30 +0,0 @@
----
-name: '🎉 Feature request'
-about: Suggest an idea
----
-
-<!-- ⚠️⚠️ Acknowledge ALL below remarks -->
-<!-- ⚠️⚠️ Request may not be processed if it doesn't meet outlined criteria -->
-
-<!-- ⚠️⚠️ Search existing issues to avoid creating duplicates  -->
-<!-- ⚠️⚠️ Plugin enhancements should be proposed at plugin repository, not here -->
-
-<!-- ⚠️⚠️ Answer ALL required questions below -->
-
-<!--
-Q1: Describe the problem (use case) that needs to be solved
--->
-
-### Use case description
-
-⚠️⚠️ REPLACE WITH DESCRIPTION
-
-<!--
-Q2: Propose a solution (e.g. provide configuration example)
-
-Note: This is optional, remove this section if you do not wish to propose anything at this point
--->
-
-### Proposed solution
-
-⚠️⚠️ REPLACE WITH PROPOSAL
diff --git a/.github/prepare-canary.js b/.github/prepare-canary.js
index f9bc05da9a6..d7ba7dc2780 100755
--- a/.github/prepare-canary.js
+++ b/.github/prepare-canary.js
@@ -10,7 +10,6 @@ const packageJsonPath = path.resolve(__dirname, '../package.json');
 const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, 'utf8'));
 
 packageJson.version = `${packageJson.version}-${process.env.GITHUB_SHA.slice(0, 8)}`;
-packageJson.dependencies['@serverless/components'] = 'canary';
-packageJson.dependencies['@serverless/enterprise-plugin'] = 'canary';
+packageJson.dependencies['@serverless/dashboard-plugin'] = 'canary';
 
 fs.writeFileSync(packageJsonPath, `${JSON.stringify(packageJson, null, 2)}\n`);
diff --git a/.github/workflows/integrate.yml b/.github/workflows/integrate.yml
index f83c5dd3f30..dbd86bc9a63 100644
--- a/.github/workflows/integrate.yml
+++ b/.github/workflows/integrate.yml
@@ -9,33 +9,20 @@ on:
 env:
   SLS_IGNORE_WARNING: '*'
   FORCE_COLOR: 1
+  SLS_SCHEMA_CACHE_BASE_DIR: '/home/runner'
 
 jobs:
-  linuxNode14:
-    name: '[Linux] Node.js 14: Publish canary, Unit & packaging tests '
+  linuxNode16:
+    name: '[Linux] Node.js 16: Publish canary, Unit & packaging tests '
     runs-on: ubuntu-latest
     steps:
-      - name: Resolve last validated commit hash (for `git diff` purposes)
-        env:
-          # See https://github.com/serverlessinc/setup-cicd-resources
-          GET_LAST_VALIDATED_COMMIT_HASH_URL: ${{ secrets.GET_LAST_VALIDATED_COMMIT_HASH_URL }}
-          PUT_LAST_VALIDATED_COMMIT_HASH_URL: ${{ secrets.PUT_LAST_VALIDATED_COMMIT_HASH_URL }}
-        run: |
-          curl -f "$GET_LAST_VALIDATED_COMMIT_HASH_URL" -o /home/runner/last-validated-commit-hash || :
-          curl -X PUT -H "User-Agent:" -H "Accept:" -H "Content-Type:" -d "$GITHUB_SHA" "$PUT_LAST_VALIDATED_COMMIT_HASH_URL"
-      - name: Store last validated commit hash (as it's to be used in other job)
-        uses: actions/upload-artifact@v2
-        with:
-          name: last-validated-commit-hash
-          path: /home/runner/last-validated-commit-hash
-
       - name: Checkout repository
         uses: actions/checkout@v2
 
       - name: Install Node.js and npm
         uses: actions/setup-node@v1
         with:
-          node-version: 14.x
+          node-version: 16.x
           registry-url: https://registry.npmjs.org
 
       - name: Publish canary
@@ -55,8 +42,8 @@ jobs:
           path: |
             ~/.npm
             node_modules
-          key: npm-v14-${{ runner.os }}-${{ github.ref }}-${{ hashFiles('package.json') }}
-          restore-keys: npm-v14-${{ runner.os }}-${{ github.ref }}-
+          key: npm-v16-${{ runner.os }}-${{ github.ref }}-${{ hashFiles('package.json') }}
+          restore-keys: npm-v16-${{ runner.os }}-${{ github.ref }}-
 
       - name: Install dependencies
         if: steps.cacheNpm.outputs.cache-hit != 'true'
@@ -70,8 +57,8 @@ jobs:
       - name: Packaging tests
         run: npm run integration-test-run-package
 
-  windowsNode14:
-    name: '[Windows] Node.js v14: Unit tests'
+  windowsNode16:
+    name: '[Windows] Node.js v16: Unit tests'
     runs-on: windows-latest
     steps:
       - name: Checkout repository
@@ -84,13 +71,13 @@ jobs:
           path: |
             ~/.npm
             node_modules
-          key: npm-v14-${{ runner.os }}-${{ github.ref }}-${{ hashFiles('package.json') }}
-          restore-keys: npm-v14-${{ runner.os }}-${{ github.ref }}-
+          key: npm-v16-${{ runner.os }}-${{ github.ref }}-${{ hashFiles('package.json') }}
+          restore-keys: npm-v16-${{ runner.os }}-${{ github.ref }}-
 
       - name: Install Node.js and npm
         uses: actions/setup-node@v1
         with:
-          node-version: 14.x
+          node-version: 16.x
 
       - name: Install dependencies
         if: steps.cacheNpm.outputs.cache-hit != 'true'
@@ -100,8 +87,8 @@ jobs:
       - name: Unit tests
         run: npm test -- -b
 
-  linuxNode12:
-    name: '[Linux] Node.js 12: Isolated unit tests'
+  linuxNode14:
+    name: '[Linux] Node.js 14: Isolated unit tests'
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
@@ -114,13 +101,13 @@ jobs:
           path: |
             ~/.npm
             node_modules
-          key: npm-v12-${{ runner.os }}-${{ github.ref }}-${{ hashFiles('package.json') }}
-          restore-keys: npm-v12-${{ runner.os }}-${{ github.ref }}-
+          key: npm-v14-${{ runner.os }}-${{ github.ref }}-${{ hashFiles('package.json') }}
+          restore-keys: npm-v14-${{ runner.os }}-${{ github.ref }}-
 
       - name: Install Node.js and npm
         uses: actions/setup-node@v1
         with:
-          node-version: 12.x
+          node-version: 14.x
 
       - name: Install dependencies
         if: steps.cacheNpm.outputs.cache-hit != 'true'
@@ -132,8 +119,8 @@ jobs:
         # Workaround taken from https://github.com/actions/runner/issues/241#issuecomment-577360161
         run: script -e -c "npm run test:isolated -- -b"
 
-  linuxNode10:
-    name: '[Linux] Node.js v10: Unit tests with coverage'
+  linuxNode12:
+    name: '[Linux] Node.js 12: Unit tests with coverage'
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
@@ -146,13 +133,13 @@ jobs:
           path: |
             ~/.npm
             node_modules
-          key: npm-v10-${{ runner.os }}-${{ github.ref }}-${{ hashFiles('package.json') }}
-          restore-keys: npm-v10-${{ runner.os }}-${{ github.ref }}-
+          key: npm-v12-${{ runner.os }}-${{ github.ref }}-${{ hashFiles('package.json') }}
+          restore-keys: npm-v12-${{ runner.os }}-${{ github.ref }}-
 
       - name: Install Node.js and npm
         uses: actions/setup-node@v1
         with:
-          node-version: 10.x
+          node-version: 12.x
 
       - name: Install dependencies
         if: steps.cacheNpm.outputs.cache-hit != 'true'
@@ -164,21 +151,32 @@ jobs:
         # Workaround taken from https://github.com/actions/runner/issues/241#issuecomment-577360161
         run: script -e -c "npm run coverage"
       - name: Push coverage
-        # TODO: Remove inline token, once support for GA is added on Codecov side
-        # See: https://github.com/codecov/codecov-node/issues/118
-        env:
-          CODECOV_TOKEN: 3898f3e1-f317-453e-a3a9-0462390f93c5
         run: npx codecov
 
+  linuxNode4:
+    name: '[Linux] Node.js v4: Node version validation test'
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v2
+
+      - name: Install Node.js and npm
+        uses: actions/setup-node@v1
+        with:
+          node-version: 4.x
+
+      - name: Node version validation test
+        run: ./bin/serverless.js 2>&1 | grep -q "does not support"
+
   integrate:
     name: Integrate
     runs-on: ubuntu-latest
-    needs: [linuxNode14, windowsNode14, linuxNode12, linuxNode10]
+    needs: [linuxNode16, windowsNode16, linuxNode14, linuxNode12, linuxNode4]
     timeout-minutes: 30 # Default is 360
     env:
       AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
       AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-      SLS_AWS_REQUEST_MAX_RETRIES: 21 #Increase number of retries, do to observed "Rate exceeded" fails
+      SLS_AWS_REQUEST_MAX_RETRIES: 50 #Increase number of retries, due to observed "Rate exceeded" fails
       SERVERLESS_BINARY_PATH: ./dist/serverless-linux
     steps:
       - name: Checkout repository
@@ -197,12 +195,18 @@ jobs:
           path: |
             ~/.npm
             node_modules
-          key: npm-v14-${{ runner.os }}-${{ github.ref }}-${{ hashFiles('package.json') }}
+          key: npm-v16-${{ runner.os }}-${{ github.ref }}-${{ hashFiles('package.json') }}
+
+      # Potentially needed for test/integration/curated-plugins-python.test.js
+      # (current GA runtime comes with Python 3.8 preinstalled, but that might be subject to changes)
+      - uses: actions/setup-python@v2
+        with:
+          python-version: '3.8'
 
       - name: Install Node.js and npm
         uses: actions/setup-node@v1
         with:
-          node-version: 14.x
+          node-version: 16.x
 
       # Note: No need to install dependencies as we have retrieved cached `node_modules` for very
       #       same `package.json` as stored with previous job
@@ -215,21 +219,11 @@ jobs:
       - name: Full integration tests against standalone binary
         run: npm run integration-test-run-all
 
-      - name: Resolve last validated commit hash (for `git diff` purposes)
-        uses: actions/download-artifact@v2
-        continue-on-error: true
-        with:
-          name: last-validated-commit-hash
-          path: /home/runner
       - name: Tag if new version
         run: |
-          LAST_VALIDATED_COMMIT_HASH=`cat /home/runner/last-validated-commit-hash` || :
-          if [ -n "$LAST_VALIDATED_COMMIT_HASH" ];
+          NEW_VERSION=`git diff -U0 ${{ github.event.before }} package.json | grep '"version": "' | tail -n 1 | grep -oE "[0-9]+\.[0-9]+\.[0-9]+"` || :
+          if [ -n "$NEW_VERSION" ];
           then
-            NEW_VERSION=`git diff -U0 $LAST_VALIDATED_COMMIT_HASH package.json | grep '"version": "' | tail -n 1 | grep -oE "[0-9]+\.[0-9]+\.[0-9]+"` || :
-            if [ -n "$NEW_VERSION" ];
-            then
-              git tag v$NEW_VERSION
-              git push --tags
-            fi
+            git tag v$NEW_VERSION
+            git push --tags
           fi
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index a070aafe4a5..ead46dddbdf 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -21,12 +21,12 @@ jobs:
           path: |
             ~/.npm
             node_modules
-          key: npm-v14-${{ runner.os }}-${{ github.ref }}-${{ hashFiles('package.json') }}
+          key: npm-v16-${{ runner.os }}-${{ github.ref }}-${{ hashFiles('package.json') }}
 
       - name: Install Node.js and npm
         uses: actions/setup-node@v1
         with:
-          node-version: 14.x
+          node-version: 16.x
           registry-url: https://registry.npmjs.org
 
       - name: Install dependencies
@@ -68,12 +68,12 @@ jobs:
           path: |
             ~/.npm
             node_modules
-          key: npm-v14-${{ runner.os }}-refs/heads/master-${{ hashFiles('package.json') }}
+          key: npm-v16-${{ runner.os }}-refs/heads/master-${{ hashFiles('package.json') }}
 
       - name: Install Node.js and npm
         uses: actions/setup-node@v1
         with:
-          node-version: 14.x
+          node-version: 16.x
           registry-url: https://registry.npmjs.org
 
       # Normally we have a guarantee that deps are already there, still it may not be the case when:
@@ -126,12 +126,12 @@ jobs:
           path: |
             ~/.npm
             node_modules
-          key: npm-v14-${{ runner.os }}-refs/heads/master-${{ hashFiles('package.json') }}
+          key: npm-v16-${{ runner.os }}-refs/heads/master-${{ hashFiles('package.json') }}
 
       - name: Install Node.js and npm
         uses: actions/setup-node@v1
         with:
-          node-version: 14.x
+          node-version: 16.x
           registry-url: https://registry.npmjs.org
 
       # Note: No need to install dependencies as we have retrieved cached `node_modules` for very
diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml
index 0e1be5766a9..2436a52d437 100644
--- a/.github/workflows/validate.yml
+++ b/.github/workflows/validate.yml
@@ -9,10 +9,11 @@ on:
 env:
   SLS_IGNORE_WARNING: '*'
   FORCE_COLOR: 1
+  SLS_SCHEMA_CACHE_BASE_DIR: '/home/runner'
 
 jobs:
-  linuxNode14:
-    name: '[Linux] Node.js 14: Lint, Formatting, Eventual Commitlint, Eventual Changelog, Unit & packaging tests'
+  linuxNode16:
+    name: '[Linux] Node.js 16: Lint, Formatting, Eventual Commitlint, Eventual Changelog, Unit & packaging tests'
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
@@ -36,15 +37,15 @@ jobs:
           path: |
             ~/.npm
             node_modules
-          key: npm-v14-${{ runner.os }}-${{ github.ref }}-${{ hashFiles('package.json') }}
+          key: npm-v16-${{ runner.os }}-${{ github.ref }}-${{ hashFiles('package.json') }}
           restore-keys: |
-            npm-v14-${{ runner.os }}-${{ github.ref }}-
-            npm-v14-${{ runner.os }}-refs/heads/master-
+            npm-v16-${{ runner.os }}-${{ github.ref }}-
+            npm-v16-${{ runner.os }}-refs/heads/master-
 
       - name: Install Node.js and npm
         uses: actions/setup-node@v1
         with:
-          node-version: 14.x
+          node-version: 16.x
 
       - name: Install dependencies
         if: steps.cacheNpm.outputs.cache-hit != 'true'
@@ -72,8 +73,8 @@ jobs:
       - name: Packaging tests
         run: npm run integration-test-run-package
 
-  windowsNode14:
-    name: '[Windows] Node.js v14: Unit tests'
+  windowsNode16:
+    name: '[Windows] Node.js v16: Unit tests'
     runs-on: windows-latest
     steps:
       - name: Checkout repository
@@ -86,15 +87,15 @@ jobs:
           path: |
             ~/.npm
             node_modules
-          key: npm-v14-${{ runner.os }}-${{ github.ref }}-${{ hashFiles('package.json') }}
+          key: npm-v16-${{ runner.os }}-${{ github.ref }}-${{ hashFiles('package.json') }}
           restore-keys: |
-            npm-v14-${{ runner.os }}-${{ github.ref }}-
-            npm-v14-${{ runner.os }}-refs/heads/master-
+            npm-v16-${{ runner.os }}-${{ github.ref }}-
+            npm-v16-${{ runner.os }}-refs/heads/master-
 
       - name: Install Node.js and npm
         uses: actions/setup-node@v1
         with:
-          node-version: 14.x
+          node-version: 16.x
 
       - name: Install dependencies
         if: steps.cacheNpm.outputs.cache-hit != 'true'
@@ -104,8 +105,8 @@ jobs:
       - name: Unit tests
         run: npm test -- -b
 
-  linuxNode12:
-    name: '[Linux] Node.js 12: Isolated unit tests'
+  linuxNode14:
+    name: '[Linux] Node.js 14: Isolated unit tests'
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
@@ -118,15 +119,15 @@ jobs:
           path: |
             ~/.npm
             node_modules
-          key: npm-v12-${{ runner.os }}-${{ github.ref }}-${{ hashFiles('package.json') }}
+          key: npm-v14-${{ runner.os }}-${{ github.ref }}-${{ hashFiles('package.json') }}
           restore-keys: |
-            npm-v12-${{ runner.os }}-${{ github.ref }}-
-            npm-v12-${{ runner.os }}-refs/heads/master-
+            npm-v14-${{ runner.os }}-${{ github.ref }}-
+            npm-v14-${{ runner.os }}-refs/heads/master-
 
       - name: Install Node.js and npm
         uses: actions/setup-node@v1
         with:
-          node-version: 12.x
+          node-version: 14.x
 
       - name: Install dependencies
         if: steps.cacheNpm.outputs.cache-hit != 'true'
@@ -138,8 +139,8 @@ jobs:
         # Workaround taken from https://github.com/actions/runner/issues/241#issuecomment-577360161
         run: script -e -c "npm run test:isolated -- -b"
 
-  linuxNode10:
-    name: '[Linux] Node.js v10: Unit tests with coverage'
+  linuxNode12:
+    name: '[Linux] Node.js 12: Unit tests with coverage'
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
@@ -152,15 +153,15 @@ jobs:
           path: |
             ~/.npm
             node_modules
-          key: npm-v10-${{ runner.os }}-${{ github.ref }}-${{ hashFiles('package.json') }}
+          key: npm-v12-${{ runner.os }}-${{ github.ref }}-${{ hashFiles('package.json') }}
           restore-keys: |
-            npm-v10-${{ runner.os }}-${{ github.ref }}-
-            npm-v10-${{ runner.os }}-refs/heads/master-
+            npm-v12-${{ runner.os }}-${{ github.ref }}-
+            npm-v12-${{ runner.os }}-refs/heads/master-
 
       - name: Install Node.js and npm
         uses: actions/setup-node@v1
         with:
-          node-version: 10.x
+          node-version: 12.x
 
       - name: Install dependencies
         if: steps.cacheNpm.outputs.cache-hit != 'true'
@@ -172,8 +173,19 @@ jobs:
         # Workaround taken from https://github.com/actions/runner/issues/241#issuecomment-577360161
         run: script -e -c "npm run coverage"
       - name: Push coverage
-        # TODO: Remove inline token, once support for GA is added on Codecov side
-        # See: https://github.com/codecov/codecov-node/issues/118
-        env:
-          CODECOV_TOKEN: 3898f3e1-f317-453e-a3a9-0462390f93c5
         run: npx codecov
+
+  linuxNode4:
+    name: '[Linux] Node.js v4: Node version validation test'
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v2
+
+      - name: Install Node.js and npm
+        uses: actions/setup-node@v1
+        with:
+          node-version: 4.x
+
+      - name: Node version validation test
+        run: ./bin/serverless.js 2>&1 | grep -q "does not support"
diff --git a/.gitignore b/.gitignore
index 3e71f2a2d15..3f2216472d0 100755
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@
 /node_modules
 npm-debug.log
 /package-lock.json
+/yarn.lock
diff --git a/.prettierignore b/.prettierignore
index 222fbdbebe5..9a695cf4754 100644
--- a/.prettierignore
+++ b/.prettierignore
@@ -1,6 +1,6 @@
 /.nyc_output
 /coverage
-/test/fixtures/cli/configSyntaxError/serverless.yml
+/test/fixtures/cli/config-syntax-error/serverless.yml
 /test/unit/lib/configuration/variables/sources/fixture/invalid.json
 /test/unit/lib/configuration/variables/sources/fixture/invalid.yml
 !/test/fixtures/programmatic/locallyInstalledServerless/node_modules/**
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6f02d391e7e..5067688aca4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,1197 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [3.0.1](https://github.com/serverless/serverless/compare/v3.0.0...v3.0.1) (2022-01-28)
+
+### Bug Fixes
+
+- Report more meaningful strict schema mode error ([#10574](https://github.com/serverless/serverless/pull/10574)) ([e98d699](https://github.com/serverless/serverless/commit/e98d699e7800780e7d56340d778116e1b3b5b005)) ([Piotr Grzesik](https://github.com/pgrzesik))
+
+### Maintenance Improvements
+
+- **CLI Onboarding:** Minor wording adjustments ([#10575](https://github.com/serverless/serverless/pull/10575)) ([772a9bb](https://github.com/serverless/serverless/commit/772a9bb86c4b9b4e65f5f834c39620359cfc7c7a)) ([Piotr Grzesik](https://github.com/pgrzesik))
+
+### Templates
+
+- Update dependencies of `aws-nodejs-typescript` to v3 ([#10582](https://github.com/serverless/serverless/pull/10582)) ([88ac3d0](https://github.com/serverless/serverless/commit/88ac3d0586b3ed98ee0c1b7c618cbca095ee85d3)) ([Paul Lessing](https://github.com/paullessing))
+
+## [3.0.0](https://github.com/serverless/serverless/compare/v2.72.2...v3.0.0) (2022-01-27)
+
+We are excited to announce the release of Serverless Framework v3!
+
+This new major version brings **a cleaner and redesigned CLI experience** as well as a brand new feature: **stage parameters**.
+
+Read all about Serverless Framework v3 **[in the official blog post](https://www.serverless.com/blog/serverless-framework-v3-is-live)**.
+
+<a title="Serverless Framework v3 is live!" href="https://www.serverless.com/blog/serverless-framework-v3-is-live"><img src="https://assets-global.website-files.com/60acbb950c4d66d0ab3e2007/6193d4f3300e602de28a56e8_6193d008f4d92d593c0e6fb1_6193c1d7c81caf0fa82bbe65_terminal-light.gif" width="700"></a>
+
+---
+
+### ⚠ BREAKING CHANGES
+
+Read the [**complete v3 Upgrade Guide**](https://www.serverless.com/framework/docs/guides/upgrading-v3).
+
+- **Variables:** Old variables resolver is permanently removed. Any resolution error as approached with current resolver is assumed as final (there's no longer fallback to old resolver)
+- **AWS Lambda:**
+  - Default lambda hashing algorithm was changed to `20201221`
+  - Runtimes `nodejs10.x`, `python2.7`, `ruby2.5` and `dotnetcore2.1` reached end of support on AWS and are no longer recognized in configuration.
+  - Default runtime has been changed from `nodejs12.x` to `nodejs14.x`
+  - Properties `service.awsKmsKeyArn` and `functions[].awsKmsKeyArn` are no longer supported. Use `provider.kmsKeyArn` and `functions[].kmsKeyArn` instead.
+- **CLI:**
+  - CLI params put before command tokens are no longer recgonized (e.g. `sls -f <function-name> deploy function` will no longer work). In all cases construct CLI args in `sls <command> <options>` order
+  - Unrecognized CLI options will no longer be supported and will result in an error.
+  - `enableLocalInstallationFallback` configuration property is no longer supported.
+  - Remove `studio` command schema
+  - The `--verbose` CLI flag does no longer support `-v` alias
+  - Opt-in tab-tab autocompletion feature is removed due to performance and security issues
+- **AWS API Gateway:**
+  - Enabling logs or tracing for imported API Gateway will now result in an error instead of warning
+  - For authorizers with `request` type and caching disabled (`resultTtlInSeconds: 0`), the `identitySource` will no longer be set to `method.request.header.Authorization` by default.
+  - Support for `usagePlan`, `resourcePolicy` and `apiKeys` on `provider` level is removed. Use `provider.apiGateway` level instead to set them.
+  - Support for `http.request.schema` has been removed and replaced with `http.request.schemas`.
+- **AWS HTTP API:** Tags from `provider.tags` are applied by default to HTTP API Gateway.
+- **AWS CloudFront:** Support for `MinTTL`, `MaxTTL`, `DefaultTTL` and `ForwardedValues` on `cloudfront.behavior` has been removed.
+- **AWS EventBridge:** By default, EventBridge resources now will be deployed using native CloudFormation resources instead of Custom Resources.
+- **AWS Alexa:** Support for simple `alexaSkill` event was removed and now `appId` is required for all `alexaSkill` events.- Serverless Components (`@serverless/components`) CLI is no longer integrated with Framework CLI.
+- **Dashboard:** `tenant` configuration setting is no longer respected. Ensure to rely on `org` instead
+- Serverless Components v1 (`@serverless/cli`) CLI is no longer integrated with Framework CLI.
+- Custom nested configuration paths will no longer be supported and such usage will result in an error.
+- Object notation is no longer supported for `service` property. Set name directly to `service`.
+- When creating `Serverless` class instance programatically, both `options` and `commands` have to be passed via `config` to the constructor.
+- Duplicate plugin definition in configuration will now result in an error instead of a warning.
+- Using `--aws-s3-accelerate` flag will result in an error instead of deprecation when custom S3 bucket is used.
+- Removed support for `provider.disableDefaultOutputExportNames`
+- Node.js versions lower than 12 is no longer supported
+- Lifecycle events marked as deprecated (in context of v1) are no longer evaluated
+
+### Features
+
+- **Variables:** Remove old variables resolver ([#10512](https://github.com/serverless/serverless/issues/10512)) ([9bf6c16](https://github.com/serverless/serverless/commit/9bf6c16cb787ae48092d90bd7613d86a1c8ca075)) ([Mariusz Nowak](https://github.com/medikoo))
+- **Packaging:** Deprecate `package.include` and `package.exclude` ([#10348](https://github.com/serverless/serverless/issues/10348)) ([aa4f9e3](https://github.com/serverless/serverless/commit/aa4f9e344e313f1ca64fa7af9475e6b84be8fb56)) ([Mariusz Nowak](https://github.com/medikoo))
+- **CLI:**
+  - Unconditionally fallback when local installation found ([#10503](https://github.com/serverless/serverless/issues/10503)) ([137554c](https://github.com/serverless/serverless/commit/137554c9d35eb14bf3bba654673b99d343c0a7d1)) ([Mariusz Nowak](https://github.com/medikoo))
+  - Simplify `logs` command output ([#10203](https://github.com/serverless/serverless/issues/10203)) ([d4124a3](https://github.com/serverless/serverless/commit/d4124a3ca6d3895289ef605d4dc6e5eb0cd2e3df)) ([Piotr Grzesik](https://github.com/pgrzesik))
+  - Deprecate support for `deploy -f` alias ([#10346](https://github.com/serverless/serverless/issues/10346)) ([09c9ea3](https://github.com/serverless/serverless/commit/09c9ea3a38afc30c1c15d21c926b8d06dfd81356)) ([Mariusz Nowak](https://github.com/medikoo))
+  - Deprecate missing options schema ([#10394](https://github.com/serverless/serverless/issues/10394)) ([0db9c49](https://github.com/serverless/serverless/commit/0db9c49e2d435499e2b836b948e815b4a8839521)) ([Mariusz Nowak](https://github.com/medikoo))
+  - Deprecate recognition of `projectDir` configuration setting ([#10511](https://github.com/serverless/serverless/issues/10511)) ([00fcd83](https://github.com/serverless/serverless/commit/00fcd83f49703188f3ddb0317afaa88fbece4801)) ([Mariusz Nowak](https://github.com/medikoo))
+  - Global `--debug` flag for debug logging ([#10197](https://github.com/serverless/serverless/issues/10197)) ([3b4f267](https://github.com/serverless/serverless/commit/3b4f2677f8d83fd76a47bfac781bf1b81bfec924)) ([Mariusz Nowak](https://github.com/medikoo))
+  - Global `--verbose` flag for verbose logging ([#10197](https://github.com/serverless/serverless/issues/10197)) ([2eef264](https://github.com/serverless/serverless/commit/2eef264bdca3dc7ae270aa09b974f23546425344)) ([Mariusz Nowak](https://github.com/medikoo))
+  - Register `-v` as global `--version` alias ([#10332](https://github.com/serverless/serverless/issues/10332)) ([211db81](https://github.com/serverless/serverless/commit/211db8149cad519174490fbb5d2f1f42f859aabb)) ([Mariusz Nowak](https://github.com/medikoo))
+  - Remove `-v` alias for `--verbose` flag ([#10153](https://github.com/serverless/serverless/issues/10153)) ([03b77c0](https://github.com/serverless/serverless/commit/03b77c0d2392e74f7d5caf76b9c01675d6d14023)) ([Mariusz Nowak](https://github.com/medikoo))
+  - Remove support for unrecognized cli options ([#10172](https://github.com/serverless/serverless/issues/10172)) ([7c2b2ea](https://github.com/serverless/serverless/commit/7c2b2ea6a84c62fcb5c8830c16437376002b2a10)) ([Piotr Grzesik](https://github.com/pgrzesik))
+  - Simplify CLI args parsing to `<command> <options>` format ([#10332](https://github.com/serverless/serverless/issues/10332)) ([8229812](https://github.com/serverless/serverless/commit/8229812e2bd1632efd9c8c8999236f6dff79171c)) ([Mariusz Nowak](https://github.com/medikoo))
+  - Support `serverless-tencent` CLI ([#10305](https://github.com/serverless/serverless/issues/10305)) ([10db944](https://github.com/serverless/serverless/commit/10db944c73357014db20062c70ec666898505b0f)) ([Mariusz Nowak](https://github.com/medikoo))
+  - Do not decorate `cli.log` logs ([#10196](https://github.com/serverless/serverless/issues/10196)) ([1f44227](https://github.com/serverless/serverless/commit/1f44227b7feeef30ca2ac151fffe219bde6a8461)) ([Mariusz Nowak](https://github.com/medikoo))
+  - Expose `sls doctor` command ([#10504](https://github.com/serverless/serverless/issues/10504)) ([d403bfc](https://github.com/serverless/serverless/commit/d403bfc94eb13490d6a91d3352ae3b163caa6d68)) ([Mariusz Nowak](https://github.com/medikoo))
+  - Remove `studio` command schema ([#10191](https://github.com/serverless/serverless/issues/10191)) ([7f1e7e1](https://github.com/serverless/serverless/commit/7f1e7e163b65580a2f0d10cad012f69605f32b18)) ([Piotr Grzesik](https://github.com/pgrzesik))
+  - Remove tab autocomplete feature ([#10414](https://github.com/serverless/serverless/issues/10414)) ([519ce0c](https://github.com/serverless/serverless/commit/519ce0cb77056ba53be92968958f55f8eb7cc779)) ([Mariusz Nowak](https://github.com/medikoo))
+- **AWS Lambda:**
+  - Change default hashing algorithm ([#10255](https://github.com/serverless/serverless/issues/10255)) ([775debf](https://github.com/serverless/serverless/commit/775debf5e2bebc51346853d99d109776f9856cee)) ([Piotr Grzesik](https://github.com/pgrzesik))
+  - Change default runtime to `nodejs14.x` ([#10147](https://github.com/serverless/serverless/issues/10147)) ([30e99fb](https://github.com/serverless/serverless/commit/30e99fb92f72a968f8e1c9a1ddbbb81a6bdc5288)) ([Piotr Grzesik](https://github.com/pgrzesik))
+  - Remove support for `awsKmsKeyArn` setting ([#10146](https://github.com/serverless/serverless/issues/10146)) ([6de37bf](https://github.com/serverless/serverless/commit/6de37bf3b7c14ca84a32188b377e92dfbd0af473)) ([Piotr Grzesik](https://github.com/pgrzesik))
+  - Remove support for obsolete runtimes ([#10207](https://github.com/serverless/serverless/issues/10207)) ([23cfb63](https://github.com/serverless/serverless/commit/23cfb63cdf400ac4601f13571554f4d8fc5ee0cd)) ([Piotr Grzesik](https://github.com/pgrzesik))
+- **AWS HTTP API:**
+  - Always apply `provider.tags` to HTTP API ([#10141](https://github.com/serverless/serverless/issues/10141)) ([b34d549](https://github.com/serverless/serverless/commit/b34d5497b6290635037f6d8f3b65451803ef6027)) ([Piotr Grzesik](https://github.com/pgrzesik))
+  - Deprecate `provider.httpApi.useProviderTags` ([#105](https://github.com/serverless/serverless/issues/105)) ([fee410a](https://github.com/serverless/serverless/commit/fee410a445b088d4fb86074924604208043934c0)) ([Piotr Grzesik](https://github.com/pgrzesik))
+- **AWS API Gateway:**
+  - Change default identity source for authorizers ([#10168](https://github.com/serverless/serverless/issues/10168)) ([1139255](https://github.com/serverless/serverless/commit/11392557d2800cdf226bd17bd32407f61a9dba52)) ([Piotr Grzesik](https://github.com/pgrzesik))
+  - Error on tracing or logs set for external API ([#10198](https://github.com/serverless/serverless/issues/10198)) ([64ea6e5](https://github.com/serverless/serverless/commit/64ea6e59b5bbd1c807a948fd092c5792923e9559)) ([Piotr Grzesik](https://github.com/pgrzesik))
+  - Remove API specific settings from `provider` ([#10157](https://github.com/serverless/serverless/issues/10157)) ([99941f0](https://github.com/serverless/serverless/commit/99941f0a5723aef0395ea0fb5b059e9ade8321b4)) ([Piotr Grzesik](https://github.com/pgrzesik))
+  - Remove support for `request.schema` ([#10143](https://github.com/serverless/serverless/issues/10143)) ([b8019d8](https://github.com/serverless/serverless/commit/b8019d82ccabf732a75c2f97c958b84efb1e43ef)) ([Piotr Grzesik](https://github.com/pgrzesik))
+- **AWS CloudFront:** Remove support for deprecated `behavior` props ([#10149](https://github.com/serverless/serverless/issues/10149)) ([c22277f](https://github.com/serverless/serverless/commit/c22277f69c327f271ea5cd51c98538c9b4eb7b1b)) ([Piotr Grzesik](https://github.com/pgrzesik))
+- **AWS EventBridge:** Change default deployment method to native CF ([#10164](https://github.com/serverless/serverless/issues/10164)) ([46956f3](https://github.com/serverless/serverless/commit/46956f3e9f5dde9367669b0d9c1ca2dc454bfc8e)) ([Piotr Grzesik](https://github.com/pgrzesik))
+- **AWS IAM:** Deprecate IAM settings grouped directly at `provider` ([#10348](https://github.com/serverless/serverless/issues/10348)) ([d7fd239](https://github.com/serverless/serverless/commit/d7fd23997f570c868437a5ea0187797403f8fe0a)) ([Piotr Grzesik](https://github.com/pgrzesik))
+- **Plugins:** Pass log writers to plugin constructor ([#10140](https://github.com/serverless/serverless/issues/10140)) ([57079b7](https://github.com/serverless/serverless/commit/57079b78a671d7756c768f3136518f6a6f46d8ef)) ([Mariusz Nowak](https://github.com/medikoo))
+- **Config Schema:** Deprecate `warn` as a validation mode default ([#10348](https://github.com/serverless/serverless/issues/10348)) ([6e27cc1](https://github.com/serverless/serverless/commit/6e27cc18c6c50fbd3311427e92c9e7f16055ae85)) ([Mariusz Nowak](https://github.com/medikoo))
+- **Standalone:** Upgrade `npm` to v8 ([#10349](https://github.com/serverless/serverless/issues/10349)) ([6bfdc0c](https://github.com/serverless/serverless/commit/6bfdc0cda4b2009e4433f2fda45356c5d297c172)) ([Mariusz Nowak](https://github.com/medikoo))
+- **Dashboard:** Drop support for `tenant` ([#10525](https://github.com/serverless/serverless/issues/10525)) ([9894875](https://github.com/serverless/serverless/commit/98948750e6cb856c62f1b4f4138a5157da07ae7e)) ([Mariusz Nowak](https://github.com/medikoo))
+- **AWS Alexa:** Remove support for alexaSkill without appId ([#10142](https://github.com/serverless/serverless/issues/10142)) ([a9edd06](https://github.com/serverless/serverless/commit/a9edd063039a41fee1679827f7abe0e754036b45)) ([Piotr Grzesik](https://github.com/pgrzesik))
+- Disallow custom nested configuration path ([#10205](https://github.com/serverless/serverless/issues/10205)) ([aeb9a57](https://github.com/serverless/serverless/commit/aeb9a57681cc3ff67c6dedbbf051b0c42d8ba6bb)) ([Piotr Grzesik](https://github.com/pgrzesik))
+- Error instead of warning when missing `commands` or `options` ([#10158](https://github.com/serverless/serverless/issues/10158)) ([f86f691](https://github.com/serverless/serverless/commit/f86f69131678a3a9be13acaeba0b56b751e6ce57)) ([Piotr Grzesik](https://github.com/pgrzesik))
+- Remove `@serverless/cli` CLI integration ([#10462](https://github.com/serverless/serverless/issues/10462)) ([396cfb9](https://github.com/serverless/serverless/commit/396cfb9621a5db211e2853b8105386103f9f097c)) ([Mariusz Nowak](https://github.com/medikoo))
+- Remove `@serverless/components` CLI integration ([#10327](https://github.com/serverless/serverless/issues/10327)) ([3395395](https://github.com/serverless/serverless/commit/33953958ae354b240e6d949b889e376dcce09cc8)) ([Mariusz Nowak](https://github.com/medikoo))
+- Remove support for `provider.disableDefaultOutputExportNames` ([#10148](https://github.com/serverless/serverless/issues/10148)) ([a9cd331](https://github.com/serverless/serverless/commit/a9cd3317b2e68b1b08c3f7388a2d4d459db1f2d7)) ([Piotr Grzesik](https://github.com/pgrzesik))
+- Remove support for Node v10 ([#10186](https://github.com/serverless/serverless/issues/10186)) ([90f00b7](https://github.com/serverless/serverless/commit/90f00b7c02113932034f4e3ee3ef659b1ec0db02)) ([Piotr Grzesik](https://github.com/pgrzesik))
+- Remove support for object notation for `service` ([#10156](https://github.com/serverless/serverless/issues/10156)) ([bccd188](https://github.com/serverless/serverless/commit/bccd188a0da7fe335b3e2b573f3ab19ccd0c49f8)) ([Piotr Grzesik](https://github.com/pgrzesik))
+- Restrict stage name with pattern ([c8c9f49](https://github.com/serverless/serverless/commit/c8c9f49fd239df723e3841fbfe22abdb90c02dae)) ([Mariusz Nowak](https://github.com/medikoo))
+- Support `params` configuration ([#10400](https://github.com/serverless/serverless/issues/10400)) ([4675b57](https://github.com/serverless/serverless/commit/4675b57117e7d850a6015ab97c81938b9f374bf1)) ([Mariusz Nowak](https://github.com/medikoo))
+- Throw error on duplicated plugin definition ([#10150](https://github.com/serverless/serverless/issues/10150)) ([d3aca0a](https://github.com/serverless/serverless/commit/d3aca0a7955c48b123720a887e6dd7300475fe03)) ([Piotr Grzesik](https://github.com/pgrzesik))
+- Throw for `--aws-s3-accelerate` when custom bucket used ([#10151](https://github.com/serverless/serverless/issues/10151)) ([b7d48e5](https://github.com/serverless/serverless/commit/b7d48e59fdbe2a2056c6352d6ac33d4c43099e53)) ([Piotr Grzesik](https://github.com/pgrzesik))
+
+### Maintenance Improvements
+
+- **AWS Deploy:** Use change sets in CF deployments ([#10390](https://github.com/serverless/serverless/issues/10390)) ([e2c65a2](https://github.com/serverless/serverless/commit/e2c65a2230b9bf9fb78c7445b02d3ee4945ee1aa)) ([Piotr Grzesik](https://github.com/pgrzesik))
+- **CLI Onboarding:** Download templates from v3 examples branch ([#10482](https://github.com/serverless/serverless/issues/10482)) ([ded1b0e](https://github.com/serverless/serverless/commit/ded1b0e832c420871ffe37fedff0afe990d1d3e6)) ([Piotr Grzesik](https://github.com/pgrzesik))
+- **CLI:**
+  - Convert `isLocallyInstalled` to export result directly ([#10503](https://github.com/serverless/serverless/issues/10503)) ([ad0bbb0](https://github.com/serverless/serverless/commit/ad0bbb0a9161bc823d1c542e6dbf993f436f6b5a)) ([Mariusz Nowak](https://github.com/medikoo))
+  - Export resolved local installation path directly ([#10503](https://github.com/serverless/serverless/issues/10503)) ([fb3b39a](https://github.com/serverless/serverless/commit/fb3b39a5a9bd35e211600530a30fc5583deec0db)) ([Mariusz Nowak](https://github.com/medikoo))
+  - Improve post install log to reflect modern style ([#10418](https://github.com/serverless/serverless/issues/10418)) ([843764b](https://github.com/serverless/serverless/commit/843764baf837f195ec8ee911f103c9f3817f9a10)) ([Mariusz Nowak](https://github.com/medikoo))
+  - Improve progress for CloudFormation updates ([#10458](https://github.com/serverless/serverless/issues/10458)) ([14b1443](https://github.com/serverless/serverless/commit/14b14432730c77ca34d41000e9aaaad0c29ffb35)) ([Piotr Grzesik](https://github.com/pgrzesik))
+  - Seclude `paramRegExp` ([#10346](https://github.com/serverless/serverless/issues/10346)) ([703e40f](https://github.com/serverless/serverless/commit/703e40f0d217d925560ba2c1d43b403bb61d335b)) ([Mariusz Nowak](https://github.com/medikoo))
+  - Seclude uncaught exception handling ([#10542](https://github.com/serverless/serverless/issues/10542)) ([b4bd0d4](https://github.com/serverless/serverless/commit/b4bd0d437074a29a972ecdbdc3a026554657817e)) ([Mariusz Nowak](https://github.com/medikoo))
+  - Unify finalization of a process handling ([#10542](https://github.com/serverless/serverless/issues/10542)) ([29357f4](https://github.com/serverless/serverless/commit/29357f4e182f102504e5ea841fb95915ccfe6821)) ([Mariusz Nowak](https://github.com/medikoo))
+  - Move `isLocalyInstalled` util to CLI context ([#105](https://github.com/serverless/serverless/issues/105)) ([3dc8395](https://github.com/serverless/serverless/commit/3dc8395d88dfebf4742625ec054955c40a4e2499)) ([Mariusz Nowak](https://github.com/medikoo))
+- **Config Schema:**
+  - Upgrade `ajv` to `v8` along with related packages ([#10440](https://github.com/serverless/serverless/issues/10440)) ([15cd724](https://github.com/serverless/serverless/commit/15cd724f723b55ca73cd0bb00d41d67307ffbed8)) ([Piotr Grzesik](https://github.com/pgrzesik))
+  - Do not rely on `ajv-keywords` ([#10490](https://github.com/serverless/serverless/issues/10490)) ([#10490](https://github.com/serverless/serverless/issues/10490)) ([4a22a4e](https://github.com/serverless/serverless/commit/4a22a4e58cd8c10d6da34a094a0768b5caafbdb9)) ([Piotr Grzesik](https://github.com/pgrzesik))
+- **Telemetry:** Include `paramsCount` in telemetry ([#10460](https://github.com/serverless/serverless/issues/10460)) ([dd721b0](https://github.com/serverless/serverless/commit/dd721b0a2038e4b7256593397b5db19833cef387)) ([Piotr Grzesik](https://github.com/pgrzesik))
+- Rely on `require.resolve` to detect wether module exist ([#10503](https://github.com/serverless/serverless/issues/10503)) ([040be5f](https://github.com/serverless/serverless/commit/040be5fe7321e051bb6e5e1aa78458c17d2582bc)) ([Mariusz Nowak](https://github.com/medikoo))
+- Remove `legacy` logs ([#10527](https://github.com/serverless/serverless/issues/10527)) ([a92ab91](https://github.com/serverless/serverless/commit/a92ab917128629e4e516d69976fdac1014cb5ebb)) ([Piotr Grzesik](https://github.com/pgrzesik))
+- Remove `lib/classes/Error.js` ([#10563](https://github.com/serverless/serverless/issues/10563)) ([44391fa](https://github.com/serverless/serverless/commit/44391fac513c7941447d03bdeae95043590cc52c)) ([Mariusz Nowak](https://github.com/medikoo))
+- Remove evaluation of deprecated lifecycle events ([#10345](https://github.com/serverless/serverless/issues/10345)) ([34bb51e](https://github.com/serverless/serverless/commit/34bb51e71d542e31a13cfb0f56443d57b6e0f89a)) ([Mariusz Nowak](https://github.com/medikoo))
+- Remove internal `suppressLogIfPrintCommand` method ([#10526](https://github.com/serverless/serverless/issues/10526)) ([584286e](https://github.com/serverless/serverless/commit/584286ec7aba94ac96eb747361f79fafb7c0f32b)) ([Mariusz Nowak](https://github.com/medikoo))
+- Unify file naming convention ([#10563](https://github.com/serverless/serverless/issues/10563)) ([Mariusz Nowak](https://github.com/medikoo))
+- Replace `ncjsm/resolve` usage with native `createRequire` ([#10503](https://github.com/serverless/serverless/issues/10503)) ([d18efc2](https://github.com/serverless/serverless/commit/d18efc2d43789dc11857d677851ba4b66e09a6a4)) ([Mariusz Nowak](https://github.com/medikoo))
+- Adapt to rename in `@serverless/dashboard-plugin` ([#10543](https://github.com/serverless/serverless/issues/10543)) ([88234a5](https://github.com/serverless/serverless/commit/88234a51233e74b3155427a5bf0a4022ec182c04)) ([Mariusz Nowak](https://github.com/medikoo))
+- Upgrade `@serverless/utils` to v6 ([74d9c70](https://github.com/serverless/serverless/commit/74d9c70f8abbfab1af4c6440ed93fd163145a597)) ([Mariusz Nowak](https://github.com/medikoo))
+
+### [2.72.2](https://github.com/serverless/serverless/compare/v2.72.1...v2.72.2) (2022-01-24)
+
+### Bug Fixes
+
+- **Variables:** Fix too eager nested resolution tracking ([#10554](https://github.com/serverless/serverless/issues/10554)) ([8db03c9](https://github.com/serverless/serverless/commit/8db03c90ffba68ebda800d2a009452cd09f7bf7f)) ([Steven Noorbergen](https://github.com/steven-xaroth))
+
+### [2.72.1](https://github.com/serverless/serverless/compare/v2.72.0...v2.72.1) (2022-01-21)
+
+### Maintenance Improvements
+
+- Refactor direct use of `@serverless/utils/log` ([#10534](https://github.com/serverless/serverless/pull/10534)) ([05fb97f](https://github.com/serverless/serverless/commit/05fb97fdab0c0ddc471ca554e48e09e661f797db)) ([Piotr Grzesik](https://github.com/pgrzesik))
+
+## [2.72.0](https://github.com/serverless/serverless/compare/v2.71.0...v2.72.0) (2022-01-17)
+
+### Features
+
+- **CLI Onboarding:** Auto login if `org` provided or configured ([#10510](https://github.com/serverless/serverless/pull/10510)) ([dcf5273](https://github.com/serverless/serverless/commit/dcf52731ea3920ecf16b2484e2673080acbfe1cd)) ([Piotr Grzesik](https://github.com/pgrzesik))
+
+### Bug Fixes
+
+- **CLI:** Respect old Node.js versions in version detection ([#10499](https://github.com/serverless/serverless/pull/10499)) ([427920e](https://github.com/serverless/serverless/commit/427920ee0fc1c98109c0b673c794baac1cc5caf7)) ([Mariusz Nowak](https://github.com/medikoo))
+
+### Maintenance Improvements
+
+- **AWS Deploy:** Improve custom resource generation log ([#10496](https://github.com/serverless/serverless/pull/10496)) ([521861b](https://github.com/serverless/serverless/commit/521861b6510fd345c2b596e4ec9e9ef7be01ac10)) ([Mariusz Nowak](https://github.com/medikoo))
+- **CLI Onboarding:** Improve user message when `app` does not exist ([#10509](https://github.com/serverless/serverless/pull/10509)) ([20afe33](https://github.com/serverless/serverless/commit/20afe339231112e4d5ade9498386ac3c00e37e04)) ([Mariusz Nowak](https://github.com/medikoo))
+- Ensure support for `warn` mode for modern deprecations ([#10502](https://github.com/serverless/serverless/pull/10502)) ([82303b3](https://github.com/serverless/serverless/commit/82303b38942b35fa6cb8ad3f19f2d528a1736587)) ([Piotr Grzesik](https://github.com/pgrzesik))
+- Support `conceal` option in modern logs ([#10501](https://github.com/serverless/serverless/pull/10501)) ([0dacf1b](https://github.com/serverless/serverless/commit/0dacf1bb3bd53da32a24cf2286cf081aecf22806)) ([Piotr Grzesik](https://github.com/pgrzesik))
+
+### Templates
+
+- Ensure `esbuild` dependency in `aws-nodejs-typescript` ([#10484](https://github.com/serverless/serverless/pull/10484)) ([452e4d8](https://github.com/serverless/serverless/commit/452e4d8279802ab2ce1ca300ab2c75ec8588a9e8)) ([François Farge](https://github.com/fargito))
+
+## [2.71.0](https://github.com/serverless/serverless/compare/v2.70.0...v2.71.0) (2022-01-10)
+
+### Features
+
+- **AWS Cognito:** Support `forceDeploy` setting ([#10435](https://github.com/serverless/serverless/issues/10435)) ([c67a3f1](https://github.com/serverless/serverless/commit/c67a3f1a4fe6c64f2b6c68ef1b184b2642ad2266)) ([TsimpDim](https://github.com/TsimpDim))
+- **Variables:** Resign from `projectDir` concept ([#10478](https://github.com/serverless/serverless/pull/10478)) ([5a76437](https://github.com/serverless/serverless/commit/5a764373c49d5fb313f50218ab8166f1638c2c32)) ([Mariusz Nowak](https://github.com/medikoo))
+
+### Bug Fixes
+
+- **CLI:** Fix handling of provider URL handling ([#10461](https://github.com/serverless/serverless/pull/10461)) ([7ebe133](https://github.com/serverless/serverless/commit/7ebe133b35fa9affafd73b61ee4626d8ce5aee1f)) ([Mariusz Nowak](https://github.com/medikoo))
+- **Config Schema:** Address invalid schema definitions ([#10452](https://github.com/serverless/serverless/pull/10452)) ([9e1fe0a](https://github.com/serverless/serverless/commit/9e1fe0ad5da8b936ccb238041fb2b452e6309faf)) ([Piotr Grzesik](https://github.com/pgrzesik))
+
+### Maintenance Improvements
+
+- **CLI Onboarding:** Download templates from v2 examples branch ([#10447](https://github.com/serverless/serverless/pull/10447)) ([46d090a](https://github.com/serverless/serverless/commit/46d090a302b9f7f4a3cf479695489b7ffc46b75b)) ([Piotr Grzesik](https://github.com/pgrzesik))
+- **CLI:** Ensure telemetry logs are issued at debug level ([#10424](https://github.com/serverless/serverless/pull/10424)) ([7b36038](https://github.com/serverless/serverless/commit/7b360386eadb9a83af73514ced34bc901af43457)) ([Mariusz Nowak](https://github.com/medikoo))
+
+### Templates
+
+- Upgrade `log4j` to `2.17.1` in corresponding templates ([#10430](https://github.com/serverless/serverless/issues/10430)) ([2c3ab1d](https://github.com/serverless/serverless/commit/2c3ab1db9aa7c22c315957d1e474568e62e07e37)) ([Graham Campbell](https://github.com/GrahamCampbell))
+
+## [2.70.0](https://github.com/serverless/serverless/compare/v2.69.1...v2.70.0) (2021-12-27)
+
+### Features
+
+- **AWS API Gateway:** Allow use of custom authorizer with authorizerId ([#10384](https://github.com/serverless/serverless/pull/10384)) ([c0eda27](https://github.com/serverless/serverless/commit/c0eda272901fd91947c6f37589b33f65c804dc9b)) ([Adam Lanners](https://github.com/darksun))
+- **AWS Local Invocation:** Upgrade `log4j` to version 2.17.0 ([#10396](https://github.com/serverless/serverless/issues/10396)) ([2782ed4](https://github.com/serverless/serverless/commit/2782ed4221caa410708cbabbbd09d45a6363be29)) ([Vassili Gorshkov](https://github.com/atlasgurus))
+
+### Bug Fixes
+
+- **AWS API Gateway:** Meaningfully reject missing `restApiRootResourceId` ([#10371](https://github.com/serverless/serverless/issues/10371)) ([2c0a962](https://github.com/serverless/serverless/commit/2c0a962c4fc0ad82ecbc6a266d56bfaa81ad8054)) ([Sudipto Das](https://github.com/sdas13))
+- **AWS Deploy:** Fix reliability of VPC config change detection in `deploy function` ([#10409](https://github.com/serverless/serverless/issues/10409)) ([0190d0d](https://github.com/serverless/serverless/commit/0190d0df05f4e37c8e965913ef1ceaf6b8a9b525)) ([Piotr Grzesik](https://github.com/pgrzesik))
+
+### Templates
+
+- Upgrade `log4j` in `aws-lambda-java-log4j2` ([#10383](https://github.com/serverless/serverless/issues/10383)) ([786f5e4](https://github.com/serverless/serverless/commit/786f5e45d54ae9925649367b0a0e8660eda542e6)) ([Marina](https://github.com/MarinaMeza))
+- Upgrade `log4j` in `aws-kotlin-jvm-gradle` ([#10382](https://github.com/serverless/serverless/issues/10382)) ([7bf8f1b](https://github.com/serverless/serverless/commit/7bf8f1b723cc4f6624df7be3d27f246b3a826140)) ([Varun](https://github.com/varun73))
+- Upgrade `log4j` dependencies ([#10392](https://github.com/serverless/serverless/issues/10392)) ([86fa604](https://github.com/serverless/serverless/commit/86fa60445c83cf35f3411ae49c2a1c4fc7fd82f0)) ([Juan Bermúdez](https://github.com/JuanBermudezN))
+
+### Maintenance Improvements
+
+- **Telemetry:**
+  - Report `didCreateService` property ([#10406](https://github.com/serverless/serverless/pull/10406)) ([4fa20a5](https://github.com/serverless/serverless/commit/4fa20a56eafcab9d8675baa2f0fe6a9c6ee5e184)) ([Piotr Grzesik](https://github.com/pgrzesik))
+  - Report `projectId` in remove command ([#10415](https://github.com/serverless/serverless/pull/10415)) ([0de3bc3](https://github.com/serverless/serverless/commit/0de3bc3cb9c1685226ea0c610e030f9279e79e4e)) ([Piotr Grzesik](https://github.com/pgrzesik))
+  - Ensure to report `projectId` for interactive ([#10406](https://github.com/serverless/serverless/pull/10406)) ([08b5acb](https://github.com/serverless/serverless/commit/08b5acbaa901c7ce529064c394151e05bdd43aef)) ([Piotr Grzesik](https://github.com/pgrzesik))
+- **CLI:** Replace internal old logging utils with modern interface ([#10417](https://github.com/serverless/serverless/pull/10417)) ([5a451ad](https://github.com/serverless/serverless/commit/5a451ad0249b6924cd4105e5c372028402517ecd)) ([Mariusz Nowak](https://github.com/medikoo))
+- **Variables:** Support custom sources in internal resolver ([#10393](https://github.com/serverless/serverless/pull/10393)) ([365a7f1](https://github.com/serverless/serverless/commit/365a7f13afaf40e9e2d573b0668159d6dea7aa02)) ([Mariusz Nowak](https://github.com/medikoo))
+
+## [2.69.1](https://github.com/serverless/serverless/compare/v2.69.0...v2.69.1) (2021-12-15)
+
+### Bug Fixes
+
+- **AWS Lambda:** Fix event config setup for provisioned lambdas ([#10366](https://github.com/serverless/serverless/pull/10366)) ([3b4e453](https://github.com/serverless/serverless/commit/3b4e4539d8b56de6a7cccb2e9c8455f34a5289f6)) ([Mariusz Nowak](https://github.com/medikoo))
+- **CLI:**
+  - Do not crash on help request ([#10347](https://github.com/serverless/serverless/pull/10347)) ([f6feb0b](https://github.com/serverless/serverless/commit/f6feb0b7b3b5ceb727119056e44e756a8105ec5b)) ([Mariusz Nowak](https://github.com/medikoo))
+  - Improve error handler resolution ([#10367](https://github.com/serverless/serverless/pull/10)) ([0dedd3e](https://github.com/serverless/serverless/commit/0dedd3e8790f568527b8a2444720fe47048ba719)) ([Mariusz Nowak](https://github.com/medikoo))
+
+### Templates
+
+- Upgrade `log4j` in Java based templates ([#10363](https://github.com/serverless/serverless/issues/10363)) ([7de020b](https://github.com/serverless/serverless/commit/7de020bbadad0aed47859f2129c9e58409b9ac65)) ([Vassili Gorshkov](https://github.com/atlasgurus))
+- Upgrade `log4j` in Java based templates ([#10339](https://github.com/serverless/serverless/issues/10339)) ([c1df4f8](https://github.com/serverless/serverless/commit/c1df4f860a585ff62c364ac8fd6d8b64b323b156)) ([Vassili Gorshkov](https://github.com/atlasgurus))
+
+## [2.69.0](https://github.com/serverless/serverless/compare/v2.68.0...v2.69.0) (2021-12-13)
+
+### Features
+
+- **AWS Deploy:** Ensure existence of S3 deployment bucket (if possible) ([#10317](https://github.com/serverless/serverless/pull/10317)) ([f358585](https://github.com/serverless/serverless/commit/f35858599ad749b5417c238f510e726615e221dc)) ([Piotr Grzesik](https://github.com/pgrzesik))
+- **AWS Kafka:** Add support for `mTLS` access configuration ([#10273](https://github.com/serverless/serverless/issues/10273)) ([9faf37a](https://github.com/serverless/serverless/commit/9faf37aa153a60784ca783b1e2b7364625e8761f)) ([Misha Bruml](https://github.com/mishabruml))
+- **Standalone:**
+  - Support installation on M1-based Macs ([#10291](https://github.com/serverless/serverless/pull/10291)) ([92ae054](https://github.com/serverless/serverless/commit/92ae054f02dc631c178628492af7049ce2936204)) ([Piotr Grzesik](https://github.com/pgrzesik))
+  - Use Node 16 as base for binaries ([#10291](https://github.com/serverless/serverless/pull/10291)) ([eb8f474](https://github.com/serverless/serverless/commit/eb8f474940c4cd69f08ec062adfaa15d62d81ee2)) ([Piotr Grzesik](https://github.com/pgrzesik))
+
+### Bug Fixes
+
+- **AWS Deploy:**
+  - Allow removal of stack with bucket missing ([#10306](https://github.com/serverless/serverless/pull/10306)) ([1a85a4a](https://github.com/serverless/serverless/commit/1a85a4a901caf4ca05096bf11bfcad31959c8044)) ([Piotr Grzesik](https://github.com/pgrzesik))
+  - Ensure to strip all `null` properties from CloudFormation template ([#10304](https://github.com/serverless/serverless/issues/10304)) ([1f58760](https://github.com/serverless/serverless/commit/1f58760f467f2dcb960e23c2eb028f4abef23209)) ([GurmeharS](https://github.com/GurmeharS))
+  - Recognize all boolean values at `provider.disableRollback` ([#10324](https://github.com/serverless/serverless/pull/10324)) ([2485c7e](https://github.com/serverless/serverless/commit/2485c7efcc4f6f5b1d65b56d4d0d71297d113fa5)) ([François Farge](https://github.com/fargito))
+- **Variables:** Provide opt-out from forced decryption at`ssm` source ([#10315](https://github.com/serverless/serverless/issues/10315)) ([503c031](https://github.com/serverless/serverless/commit/503c0319b7e9acc2b674d5d61874dfa3fcfc857e)) ([Omer Shacham](https://github.com/omerinvia))
+
+### Maintenance Improvements
+
+- Configure promise returning functions as async ([#10309](https://github.com/serverless/serverless/issues/10309)) ([4d4f863](https://github.com/serverless/serverless/commit/4d4f8637d830ba9a72806fc127fe3497f7c0f23c)) ([mdanyalkhan](https://github.com/mdanyalkhan))
+- Use `async/await` syntax in `bucket.js` ([#10306](https://github.com/serverless/serverless/pull/10306)) ([39e43b5](https://github.com/serverless/serverless/commit/39e43b51e5e13c708900e0ccc4d4f25ccf0df61c)) ([Piotr Grzesik](https://github.com/pgrzesik))
+
+## [2.68.0](https://github.com/serverless/serverless/compare/v2.67.0...v2.68.0) (2021-12-02)
+
+### Features
+
+- **AWS Deploy:**
+  - Ensure consistent function state in `deploy function` ([#10288](https://github.com/serverless/serverless/pull/10288)) ([d52526b](https://github.com/serverless/serverless/commit/d52526bb6059ce20eba341c29ad5a2373c238624)) ([Piotr Grzesik](https://github.com/pgrzesik))
+  - Support all regions from `iso` and `isob` partition ([25eb571](https://github.com/serverless/serverless/commit/25eb571dd3299ac0f61dd1ea40b6b44b355f6898)) ([#10299](https://github.com/serverless/serverless/issues/10299)) ([maafk](https://github.com/maafk))
+- **AWS SQS:** Support `filterPatterns` ([#10297](https://github.com/serverless/serverless/pull/10297)) ([3f0a80a](https://github.com/serverless/serverless/commit/3f0a80acd3fcf9eb7768625eb6cfe06cf572afa0)) ([Piotr Grzesik](https://github.com/pgrzesik))
+- **AWS Stream:** Support `filterPatterns` ([#10285](https://github.com/serverless/serverless/issues/10285)) ([fc00505](https://github.com/serverless/serverless/commit/fc0050559cd1ee7b8a53a08fae73940177da93cb)) ([Frédéric Barthelet](https://github.com/fredericbarthelet))
+
+### Bug Fixes
+
+- **AWS SQS:** Accept only plain string form in direct ARN assignement ([#10263](https://github.com/serverless/serverless/issues/10263)) ([f7bbd17](https://github.com/serverless/serverless/commit/f7bbd176866b99725dcf1fef1128b0d2194217e0)) ([Sudipto Das](https://github.com/sdas13))
+- **Variables:** Resolve variables in resolved address & params values ([#10296](https://github.com/serverless/serverless/pull/10296)) ([63d54e1](https://github.com/serverless/serverless/commit/63d54e1537e10ae63c171892edd886f6b81e83f6)) ([Mariusz Nowak](https://github.com/medikoo))
+
+### Maintenance Improvements
+
+- **Variables:** Seclude internal logic for reuse ([#10296](https://github.com/serverless/serverless/pull/10296)) ([9c75044](https://github.com/serverless/serverless/commit/9c75044fd59d8f181c7daee22d53a7bac3786e09)) ([Mariusz Nowak](https://github.com/medikoo))
+
+### Templates
+
+- Update dependencies in `aws-java-maven` ([#10289](https://github.com/serverless/serverless/issues/10289)) ([0714f7d](https://github.com/serverless/serverless/commit/0714f7df0642d7a900c9d72eb26ae8c5ae1eddd7)) ([burakaktasfe](https://github.com/burakaktasfe))
+
+## [2.67.0](https://github.com/serverless/serverless/compare/v2.66.2...v2.67.0) (2021-11-26)
+
+### Features
+
+- **AWS Deploy:** Support `disableRollback` parameter ([#10236](https://github.com/serverless/serverless/issues/10236)) ([c9fefce](https://github.com/serverless/serverless/commit/c9fefced103e47d5d793d979cbb10072daeabf01)) ([Frédéric Barthelet](https://github.com/fredericbarthelet))
+- **AWS Lambda:** Add `platform` option for container images ([#10237](https://github.com/serverless/serverless/issues/10237)) ([5b61b41](https://github.com/serverless/serverless/commit/5b61b415a0f19ce0755924eae969caf02185d8af)) ([Zane Mountcastle](https://github.com/zanemountcastle))
+- **AWS S3:** Support `Fn::If` CF function for s3 event ([#10272](https://github.com/serverless/serverless/pull/10272)) ([a4fa498](https://github.com/serverless/serverless/commit/a4fa49844d23afea90f7c9aa4616beedd2a80db8)) ([Piotr Grzesik](https://github.com/pgrzesik))
+- **AWS SQS:** Support `functionResponseType` ([#10265](https://github.com/serverless/serverless/issues/10265)) ([44511f3](https://github.com/serverless/serverless/commit/44511f343b1a68ca147e8ba9e8b493143b89c324)) ([nicoeft](https://github.com/nicoeft))
+
+## [2.66.2](https://github.com/serverless/serverless/compare/v2.66.1...v2.67.0) (2021-11-17)
+
+### Bug Fixes
+
+- **CLI:** Fix component template recognition in triage ([#10252](https://github.com/serverless/serverless/issues/10252)) ([4494f77](https://github.com/serverless/serverless/commit/4494f77f6111249d97295923a706883a8910840d)) ([Mariusz Nowak](https://github.com/medikoo))
+
+### Maintenance Improvements
+
+- **CLI:** Expose dashboard provider name when starting deployment ([#10194](https://github.com/serverless/serverless/issues/10194)) ([6698fa6](https://github.com/serverless/serverless/commit/6698fa657e5a5b35908c2b2de0815525f948064f)) ([Mariusz Nowak](https://github.com/medikoo))
+
+### Templates
+
+- Use `iam.role` syntax ([#10227](https://github.com/serverless/serverless/issues/10227)) ([a55d51c](https://github.com/serverless/serverless/commit/a55d51c6a4aa38153f61192d374cb23bf09ff66c)) ([Piotr Grzesik](https://github.com/pgrzesik))
+- Update `ts-node` for es2020 and es2021 support in `aws-nodes-typescript` ([#10234](https://github.com/serverless/serverless/issues/10234)) ([e131609](https://github.com/serverless/serverless/commit/e13160902848912a6bb652299d1bc6107cf09eb1)) ([Frédéric Barthelet](https://github.com/fredericbarthelet))
+
+### [2.66.1](https://github.com/serverless/serverless/compare/v2.66.0...v2.66.1) (2021-11-10)
+
+### Bug Fixes
+
+- **AWS API Gateway:** Ensure proper `apiId` resolution ([#10221](https://github.com/serverless/serverless/pull/10221)) ([95f3a56](https://github.com/serverless/serverless/commit/95f3a5603897ad43ba6e008a7ea2a35d21a4eacf)) ([Piotr Grzesik](https://github.com/pgrzesik))
+
+### Maintenance Improvements
+
+- **CLI:** Improve timestamp visiblity in `deploy list` output ([#10211](https://github.com/serverless/serverless/pull/10211)) ([55146c4](https://github.com/serverless/serverless/commit/55146c4595024b0e3702dc2023264af784b906e9)) ([Mariusz Nowak](https://github.com/medikoo))
+
+### Templates
+
+- Upgrade `middy` in `aws-nodejs-typescript` ([#10215](https://github.com/serverless/serverless/issues/10215)) ([ad95e03](https://github.com/serverless/serverless/commit/ad95e030b3581a65babc8dd175b8bb69f1215534)) ([Frédéric Barthelet](https://github.com/fredericbarthelet))
+- Use non deprecated API in `aws-nodejs-typescript` ([#10214](https://github.com/serverless/serverless/issues/10214)) ([6671d98](https://github.com/serverless/serverless/commit/6671d98615ab7d003c3c7413c9334b63b2d735e8)) ([Frédéric Barthelet](https://github.com/fredericbarthelet))
+
+## [2.66.0](https://github.com/serverless/serverless/compare/v2.65.0...v2.66.0) (2021-11-09)
+
+### Features
+
+- Introduce `enforce-hash-update` flag to help Lambda hashing version migration ([#10209](https://github.com/serverless/serverless/pull/10209)) ([afd0a5b](https://github.com/serverless/serverless/commit/afd0a5bd6f131c9b12148199d4995e055e5963f0)) ([Piotr Grzesik](https://github.com/pgrzesik))
+- **Variables:** Recognize `:` in variable address to support `output` source ([#10208](https://github.com/serverless/serverless/pull/10208)) ([723927f](https://github.com/serverless/serverless/commit/723927f2dcdcc425025da03ac0be5edd3c203dc7)) ([Piotr Grzesik](https://github.com/pgrzesik))
+
+### Bug Fixes
+
+- **AWS API Gateway:** Ensure `shouldStartNameWithService` support ([#10177](https://github.com/serverless/serverless/pull/10177)) ([e8c8d25](https://github.com/serverless/serverless/commit/e8c8d259fb79ae04e33e01af162c6666f0060189)) ([Vicary A.](https://github.com/vicary))
+- **CLI:** Do not recommend `frameworkVersion` when running pre release ([#10204](https://github.com/serverless/serverless/pull/10204)) ([53490a5](https://github.com/serverless/serverless/commit/53490a55183db5f304d0e3ef69feadd9a20fa815)) ([Mariusz Nowak](https://github.com/medikoo))
+
+### Maintenance Improvements
+
+- Ensure to use `legacy.log` instead of `cli.log` ([#10206](https://github.com/serverless/serverless/pull/10206)) ([ea05d7c](https://github.com/serverless/serverless/commit/ea05d7c41e84b0f68017804b06d6435062673d26)) ([Mariusz Nowak](https://github.com/medikoo))
+
+## [2.65.0](https://github.com/serverless/serverless/compare/v2.64.1...v2.65.0) (2021-11-03)
+
+### Features
+
+- **AWS Lambda:**
+  - Support CF intrinsic functions at `functions[].reservedConcurrency` ([#10129](https://github.com/serverless/serverless/issues/10129)) ([7cfddff](https://github.com/serverless/serverless/commit/7cfddff31433582ac031be0a168eba2d356d7ee9)) ([ROSeaboyer](https://github.com/ROSeaboyer))
+  - Allow to stick to current default Lambda hashing version mode with `lambdaHashingVersion: 20200924` setting ([#10173](https://github.com/serverless/serverless/pull/10173)) ([50a8457](https://github.com/serverless/serverless/commit/50a845709eb846ce5ca3b60116c4ec278896a8b3)) ([Piotr Grzesik](https://github.com/pgrzesik))
+- **AWS EventBridge:** Adjust deprecation of deployment method and allow to keep using old approach ([#10133](https://github.com/serverless/serverless/pull/10133)) ([bf62b7c](https://github.com/serverless/serverless/commit/bf62b7c4dabbecc892fde4d0d988dc2dd2cb7461)) ([Piotr Grzesik](https://github.com/pgrzesik))
+- **AWS Local Invocation:** Support decimal serialization for Python ([#10178](https://github.com/serverless/serverless/pull/10178)) ([9ef46ba](https://github.com/serverless/serverless/commit/9ef46ba05ff033dbf04c451a214bf4ced23c90e8)) ([Shane R. Spencer](https://github.com/whardier))
+
+### Bug Fixes
+
+- **AWS Deploy:** Fix handling of deployment bucket extensions ([#10137](https://github.com/serverless/serverless/issues/10137)) ([39bdea0](https://github.com/serverless/serverless/commit/39bdea07500b8fb814a5cce83ec6f78a0c75006c)) ([Mars Lan](https://github.com/mars-lan))
+- **AWS HTTP API:** Recognize max timeout as 30s instead of 29s ([#10119](https://github.com/serverless/serverless/issues/10119)) ([e3e02fe](https://github.com/serverless/serverless/commit/e3e02fe8e2f1bbd236cfa49f80a360fd828c1ead)) ([Caio Fauza](https://github.com/CaioFauza))
+- **CLI:**
+  - Fix `help` command usage information ([#10175](https://github.com/serverless/serverless/issues/10175)) ([254e70c](https://github.com/serverless/serverless/commit/254e70cd0ad9bb1803d3a5741b966f5807e9d869)) ([Sebastian Bille](https://github.com/TastefulElk))
+  - Fix resolution of help for not integrated commands ([#10128](https://github.com/serverless/serverless/pull/10128)) ([204f205](https://github.com/serverless/serverless/commit/204f2051f6a5ca5f046eb905292dfae0c597e33f)) ([Mariusz Nowak](https://github.com/medikoo))
+- Recognize accessible configuration parts on validation errors ([#10134](https://github.com/serverless/serverless/pull/10134)) ([b7a6349](https://github.com/serverless/serverless/commit/b7a634974dc2ee138d85ec58609bf2559c5de9f6)) ([Mariusz Nowak](https://github.com/medikoo))
+
+### Performance Improvements
+
+- **CLI:** Integrate CLI triage into this package (no `@serverless/components` and `@serverless/cli` modules are loaded unless their CLI is used)([#10131](https://github.com/serverless/serverless/pull/10131)) ([415bdef](https://github.com/serverless/serverless/commit/415bdefca092e60cacd867006bacddfda231ed94)) ([Mariusz Nowak](https://github.com/medikoo))
+
+### Maintenance Improvements
+
+- **CLI:**
+  - Improve file size output in logs ([#10169](https://github.com/serverless/serverless/pull/10169)) ([4448490](https://github.com/serverless/serverless/commit/44484903b38eaa18c3e3838b8a3f217922a233e5)) ([Mariusz Nowak](https://github.com/medikoo))
+  - Improve main progress message ([#10183](https://github.com/serverless/serverless/pull/10183)) ([533f709](https://github.com/serverless/serverless/commit/533f709c5833619d5ce86ec987133ff0f148c8e0)) ([Mariusz Nowak](https://github.com/medikoo))
+- **Telemetry:** Add `projectId` to payload ([#10180](https://github.com/serverless/serverless/pull/10180)) ([cc7d7e4](https://github.com/serverless/serverless/commit/cc7d7e4d531090e81bf08842433397588d00afce)) ([Piotr Grzesik](https://github.com/pgrzesik))
+- **AWS EventBridge:** Address typos in error messages ([#10165](https://github.com/serverless/serverless/issues/10165)) ([ee38f6a](https://github.com/serverless/serverless/commit/ee38f6a3081a3a0f22ee9fea8975f13520ac18ec)) ([Andreas Kohn](https://github.com/ankon))
+- Seprate internal and plugin output sections ([#10184](https://github.com/serverless/serverless/pull/10184)) ([7bb2520](https://github.com/serverless/serverless/commit/7bb2520f491d008075eb08be64bdb2e0b60ec5c6)) ([Mariusz Nowak](https://github.com/medikoo))
+
+### Templates
+
+- Package lambdas individually in `aws-nodejs-typescript` ([#10106](https://github.com/serverless/serverless/pull/10106)) ([3aab5f8](https://github.com/serverless/serverless/commit/3aab5f86985598d6bb3135f4ab934092ad467df5)) ([Adrien Cacciaguerra](https://github.com/adriencaccia))
+- Upgrade `azure-nodejs-typescript` ([#10163](https://github.com/serverless/serverless/issues/10163)) ([26846d5](https://github.com/serverless/serverless/commit/26846d5879d655ffe299db694a33f1f6d187a941)) ([Giang Nguyen](https://github.com/giangnm))
+
+### [2.64.1](https://github.com/serverless/serverless/compare/v2.64.0...v2.64.1) (2021-10-20)
+
+### Bug Fixes
+
+- **CLI:** Handle gently case where temp folder is on other device ([#10124](https://github.com/serverless/serverless/issues/10124)) ([a030636](https://github.com/serverless/serverless/commit/a0306365fc2c18c04698640723db2f4efeb34e2f)) ([Mariusz Nowak](https://github.com/medikoo))
+
+## [2.64.0](https://github.com/serverless/serverless/compare/v2.63.0...v2.64.0) (2021-10-20)
+
+### Features
+
+- **AWS RabbitMQ:** Support for Amazon MQ RabbitMQ events ([#9919](https://github.com/serverless/serverless/issues/9919)) ([a3edecf](https://github.com/serverless/serverless/commit/a3edecf0c6b4e066bde2de8095582432d9fdd635)) ([Michael](https://github.com/liegeandlief))
+
+### Bug Fixes
+
+- **AWS Deploy:** Recognize `LogicalResourceId` in `stackPolicy` ([#10097](https://github.com/serverless/serverless/pull/10097)) ([1a528c2](https://github.com/serverless/serverless/commit/1a528c2cc0746bfe6a692183f96b0831e3dd92f4)) ([Monsma](https://github.com/jmonsma))
+- **AWS EventBridge:** Allow intrinsic functions in `pattern` ([#10120](https://github.com/serverless/serverless/issues/10120)) ([1c105a4](https://github.com/serverless/serverless/commit/1c105a4c16e8bdca9fc66c5eddf12153ebc9a1fb)) ([Benoît Bouré](https://github.com/bboure))
+- **CLI:** Ensure command validation for service independent commands ([#10115](https://github.com/serverless/serverless/pull/10115)) ([6022fb9](https://github.com/serverless/serverless/commit/6022fb98331e8f7d8893a28d3dcb20d91d0a1e20)) ([Mariusz Nowak](https://github.com/medikoo))
+- **Packaging:** Ensure to show deprecation in all cases ([#10111](https://github.com/serverless/serverless/pull/10111)) ([cc71fc9](https://github.com/serverless/serverless/commit/cc71fc99ffe2e1f2fcc764b29dafa197c665cef1)) ([Mariusz Nowak](https://github.com/medikoo))
+
+### Maintenance Improvements
+
+- **CLI:**
+  - Support `decoratedMessage` on `ServerlessError` ([#10112](https://github.com/serverless/serverless/pull/10112)) ([2217158](https://github.com/serverless/serverless/commit/2217158764dde8ceee472292b531836ada20d79a)) ([Piotr Grzesik](https://github.com/pgrzesik))
+  - Enhanced modern error reporting for CloudFormation ([#10112](https://github.com/serverless/serverless/pull/10112)) ([cfd828e](https://github.com/serverless/serverless/commit/cfd828ece872b572cbb46670437e8196f2200903)) ([Piotr Grzesik](https://github.com/pgrzesik))
+  - Report `credentials` source in modern error output ([#10114](https://github.com/serverless/serverless/pull/10114)) ([b4ff87d](https://github.com/serverless/serverless/commit/b4ff87dc81286b8123830f20bccfb3aa320e4ccd)) ([Piotr Grzesik](https://github.com/pgrzesik))
+  - Improve style for local fallback modern notice ([#10111](https://github.com/serverless/serverless/pull/10111)) ([73c071b](https://github.com/serverless/serverless/commit/73c071b060216d330974a2f98917eba315eb634b)) ([Mariusz Nowak](https://github.com/medikoo))
+  - Introduce `doctor` command for modern handling of deprecations ([#10115](https://github.com/serverless/serverless/pull/10115)) ([452e234](https://github.com/serverless/serverless/commit/452e234306a3703e95ad349305e1e211c165bf22)) ([Mariusz Nowak](https://github.com/medikoo))
+  - Do not filter commands by `lifecycleEvents` for help ([#10115](https://github.com/serverless/serverless/pull/10115)) ([6991d66](https://github.com/serverless/serverless/commit/6991d66987d6276665bff07259bf1ca464ffeab7)) ([Mariusz Nowak](https://github.com/medikoo))
+
+## [2.63.0](https://github.com/serverless/serverless/compare/v2.62.0...v2.63.0) (2021-10-15)
+
+### Features
+
+- **AWS Deploy:** Introduce warning about `deploy -f` alias ([#10078](https://github.com/serverless/serverless/pull/10078)) ([40f574f](https://github.com/serverless/serverless/commit/40f574f946e2f40cba13e18b22ee82c7aaa31d3f)) ([Piotr Grzesik](https://github.com/pgrzesik))
+- **AWS Lambda:** Allow overriding provider VPC with no VPC on function level ([#10060](https://github.com/serverless/serverless/pull/10060)) ([44a81fc](https://github.com/serverless/serverless/commit/44a81fcc6a229ac6ff59b8c8e51742a9470eef15)) ([Oliver](https://github.com/HowManyOliversAreThere))
+- **AWS S3:** Recognize `ExpirationInDays` property for `s3` events ([#10083](https://github.com/serverless/serverless/pull/10083)) ([8e6dcd1](https://github.com/serverless/serverless/commit/8e6dcd1aaed50007b5b99e18f61dfa849b898cd9)) ([ROSeaboyer](https://github.com/ROSeaboyer))
+- **CLI:**
+  - Introduce deprecation for duplicate plugin definition ([#10080](https://github.com/serverless/serverless/pull/10080)) ([d2a75ea](https://github.com/serverless/serverless/commit/d2a75ea95e814cd5aaba5eca4c5acebd2aad0bb8)) ([Piotr Grzesik](https://github.com/pgrzesik))
+  - Introduce deprecation instead of warning on S3 Accelerate for user provided bucket ([#10080](https://github.com/serverless/serverless/pull/10080)) ([04b921a](https://github.com/serverless/serverless/commit/04b921acdc5fd486ffd10fe81fcb2243f37329db)) ([Piotr Grzesik](https://github.com/pgrzesik))
+- Opt-in support for deployment bucket versioning ([#9912](https://github.com/serverless/serverless/issues/9912)) ([c4cb0f3](https://github.com/serverless/serverless/commit/c4cb0f30f5f565e2fd34877dfc383f6b81d135fd)) ([Mars Lan](https://github.com/mars-lan))
+
+### Maintenance Improvements
+
+- **CLI: New logs (experimental):**
+  - Adapt `logInfo` to modern logs ([#10078](https://github.com/serverless/serverless/pull/10078)) ([771f99b](https://github.com/serverless/serverless/commit/771f99b18d76060f030d36b5fa619dd41a7000c8)) ([Piotr Grzesik](https://github.com/pgrzesik))
+  - Adapt `logWarning` to modern logs ([#10078](https://github.com/serverless/serverless/pull/10078)) ([d43298d](https://github.com/serverless/serverless/commit/d43298d25bc9fcf5f5724a800b2693321e88e838)) ([Piotr Grzesik](https://github.com/pgrzesik))
+  - Cover image building with modern logs ([#10070](https://github.com/serverless/serverless/pull/10070)) ([a2be338](https://github.com/serverless/serverless/commit/a2be3387b16fdb7324e1342a5f6ee3974e4e34f5)) ([Piotr Grzesik](https://github.com/pgrzesik))
+  - Improve handling of service outputs in modern logs ([#10100](https://github.com/serverless/serverless/pull/10100)) ([7d19ca8](https://github.com/serverless/serverless/commit/7d19ca857230a56bbe40bda4d6704edd34019e4e)) ([Mariusz Nowak](https://github.com/medikoo))
+  - Introduce modern warning about resource limit ([#10086](https://github.com/serverless/serverless/pull/10086)) ([ca705b8](https://github.com/serverless/serverless/commit/ca705b8cc2854c302158a56294c2507ba5f2038f)) ([Piotr Grzesik](https://github.com/pgrzesik))
+  - Minor modern logs updates ([#10071](https://github.com/serverless/serverless/pull/10071)) ([39c09e4](https://github.com/serverless/serverless/commit/39c09e44b6380ec1a13aa50aca9082cffb0aeca1)) ([Piotr Grzesik](https://github.com/pgrzesik))
+  - Remove empty line in `info` command ([#10086](https://github.com/serverless/serverless/pull/10086)) ([03b4b3d](https://github.com/serverless/serverless/commit/03b4b3d47c25b6f98a46699463288c94b051f42c)) ([Piotr Grzesik](https://github.com/pgrzesik))
+  - Replace `process.stdout` use with modern logs ([#10087](https://github.com/serverless/serverless/pull/10087)) ([be00a26](https://github.com/serverless/serverless/commit/be00a2672cbc90fb33dee5e4bd44a1f6a127eb7c)) ([Piotr Grzesik](https://github.com/pgrzesik))
+  - Replace warnings with modern counterparts ([#10080](https://github.com/serverless/serverless/pull/10080)) ([4da0899](https://github.com/serverless/serverless/commit/4da08996736c9a8f2b0a0193f7cca4b24f3fc6f1)) ([Piotr Grzesik](https://github.com/pgrzesik))
+  - Update link style for modern logs ([#10096](https://github.com/serverless/serverless/pull/10096)) ([6264296](https://github.com/serverless/serverless/commit/62642964bc38eae77b009ea84d05ba741383570f)) ([Mariusz Nowak](https://github.com/medikoo))
+- Fix typo in `lib/classes/Variables.js` ([#10093](https://github.com/serverless/serverless/issues/10093)) ([49f0913](https://github.com/serverless/serverless/commit/49f0913466110ac32d89c7c044fc781e524b9ed9)) ([Chris Poli](https://github.com/chris-poli))
+
+### Templates
+
+- Add `esbuild` to `gitignore` in `aws-nodejs-typescript` ([#10076](https://github.com/serverless/serverless/pull/10076)) ([865f21f](https://github.com/serverless/serverless/commit/865f21f970340b45c6fb341d01647721f0fa5682)) ([ssshun](https://github.com/ssshun))
+
+## [2.62.0](https://github.com/serverless/serverless/compare/v2.61.0...v2.62.0) (2021-10-08)
+
+### Features
+
+- **AWS Deploy:** Remove `deploy -f` deprecation ([#10063](https://github.com/serverless/serverless/pull/10063)) ([1084251](https://github.com/serverless/serverless/commit/10842513f0c5422f8627b652b6483523e0351a3c)) ([Mariusz Nowak](https://github.com/medikoo))
+- **Config Schema:** Remove validation mode related deprecation ([#10063](https://github.com/serverless/serverless/pull/10063)) ([a9bf916](https://github.com/serverless/serverless/commit/a9bf916fbb15140373a54d22c624296b8a1dbe03)) ([Mariusz Nowak](https://github.com/medikoo))
+- **Packaging:** Remove `package[include|exclude]` deprecation ([#10063](https://github.com/serverless/serverless/pull/10063)) ([70e2736](https://github.com/serverless/serverless/commit/70e27362260f97b68bb1dfaf52fa3fe7877a2adc)) ([Mariusz Nowak](https://github.com/medikoo))
+
+### Bug Fixes
+
+- **AWS Deploy:** Throw on attempt of extending not existing resource ([#10063](https://github.com/serverless/serverless/pull/10063)) ([02be86c](https://github.com/serverless/serverless/commit/02be86ca4954553388ac70845d8ff3aca205abcd)) ([Mariusz Nowak](https://github.com/medikoo))
+
+### Maintenance Improvements
+
+- **CLI: New logs (experimental):**
+  - Simplify CF deploy progress ([#10068](https://github.com/serverless/serverless/pull/10068)) ([be60ed4](https://github.com/serverless/serverless/commit/be60ed4cee15ec0a47be5c08da9e0ce4a3f54136)) ([Mariusz Nowak](https://github.com/medikoo))
+  - Expose function artifact size in deploy summary ([#10062](https://github.com/serverless/serverless/pull/10062)) ([8746100](https://github.com/serverless/serverless/commit/87461007f809c67a78b7dd722847efef2e4f72b3)) ([Mariusz Nowak](https://github.com/medikoo))
+  - `create` command ([#10066](https://github.com/serverless/serverless/pull/10066)) ([05f937f](https://github.com/serverless/serverless/commit/05f937f2e731e641e93e9db4af4acd58dc117422)) ([Piotr Grzesik](https://github.com/pgrzesik))
+  - `invoke local` command ([#10065](https://github.com/serverless/serverless/pull/10065)) ([82dd1e4](https://github.com/serverless/serverless/commit/82dd1e4c70d335cc10485b5ac20467447809941b)) ([Piotr Grzesik](https://github.com/pgrzesik))
+  - `invoke` command ([#10052](https://github.com/serverless/serverless/pull/10052)) ([2af95c0](https://github.com/serverless/serverless/commit/2af95c03865b5b59bacba9e080348dddf11d0bb5)) ([Piotr Grzesik](https://github.com/pgrzesik))
+  - `metrics` command ([#10051](https://github.com/serverless/serverless/pull/10051)) ([592596c](https://github.com/serverless/serverless/commit/592596c73bfe0a9b6ef6bdff5d898ae9ef5e2788)) ([Piotr Grzesik](https://github.com/pgrzesik))
+  - `remove` command ([#10050](https://github.com/serverless/serverless/pull/10050)) ([3934cad](https://github.com/serverless/serverless/commit/3934cadce052b50d76c1dcd49da588cd9f079175)) ([Piotr Grzesik](https://github.com/pgrzesik))
+  - `rollback function` command ([#10064](https://github.com/serverless/serverless/pull/10064)) ([4cbc342](https://github.com/serverless/serverless/commit/4cbc3424dabebb3b533d463b3ead523f2daf4a77)) ([Piotr Grzesik](https://github.com/pgrzesik))
+  - `rollback` command ([#10064](https://github.com/serverless/serverless/pull/10064)) ([f0970e0](https://github.com/serverless/serverless/commit/f0970e04fa31774aa7400b4c620920dadcb3cfa2)) ([Piotr Grzesik](https://github.com/pgrzesik))
+  - `uninstall` command ([#10034](https://github.com/serverless/serverless/pull/10034)) ([2787ea0](https://github.com/serverless/serverless/commit/2787ea07a9a183695e6f7a58bcc0171e086d456b)) ([Piotr Grzesik](https://github.com/pgrzesik))
+  - `upgrade` command ([#10034](https://github.com/serverless/serverless/pull/10034)) ([9b5e6b1](https://github.com/serverless/serverless/commit/9b5e6b12371317356d9cb4600a4a574df305f63f)) ([Piotr Grzesik](https://github.com/pgrzesik))
+  - Ensure empty line prior final status with progress ([#10063](https://github.com/serverless/serverless/pull/10062)) ([#10062](https://github.com/serverless/serverless/pull/10062)) ([c9f2227](https://github.com/serverless/serverless/commit/c9f22278b3a8c5fd4d1400ef948ae6b72f333223)) ([Mariusz Nowak](https://github.com/medikoo))
+  - Reconfigure dashboard related warning ([#10053](https://github.com/serverless/serverless/pull/10053)) ([7c91cde](https://github.com/serverless/serverless/commit/7c91cde7ac5c8bbe983b213de090bde4326af85a)) ([Mariusz Nowak](https://github.com/medikoo))
+- **AWS Deploy:** Improve error message ([#10063](https://github.com/serverless/serverless/pull/10063)) ([d071c5f](https://github.com/serverless/serverless/commit/d071c5f74d2d1deca71edebc53d072a1c90d8bad)) ([Mariusz Nowak](https://github.com/medikoo))
+- Remove _async_ handling from _sync_ function ([#10053](https://github.com/serverless/serverless/pull/10053)) ([5f1a916](https://github.com/serverless/serverless/commit/5f1a916d4d9c8833755833bc064f51e4f89e50e0)) ([Mariusz Nowak](https://github.com/medikoo))
+
+## [2.61.0](https://github.com/serverless/serverless/compare/v2.60.3...v2.61.0) (2021-10-04)
+
+### Features
+
+- **AWS Lambda:** Support 64-bit ARM architecture ([#10049](https://github.com/serverless/serverless/pull/10049)) ([fe655d4](https://github.com/serverless/serverless/commit/fe655d4f15ca789a1e3a46ce49dc7d23ca806c00)) ([Mariusz Nowak](https://github.com/medikoo))
+
+### Bug Fixes
+
+- **AWS Credentials:** Fail when profile is already configured ([#10038](https://github.com/serverless/serverless/pull/10038)) ([f8ad7bc](https://github.com/serverless/serverless/commit/f8ad7bca6a26e39864d139fec4aadddd24b34a5b)) ([Piotr Grzesik](https://github.com/pgrzesik))
+
+### Maintenance Improvements
+
+- **CLI: New logs (experimental):**
+  - `config credentials` command ([#10038](https://github.com/serverless/serverless/pull/10038)) ([bcb2408](https://github.com/serverless/serverless/commit/bcb240893d89127cc1eada7255864b7bfeb88a61)) ([Piotr Grzesik](https://github.com/pgrzesik))
+  - `config tabcompletion install` command ([#10038](https://github.com/serverless/serverless/pull/10038)) ([16a7739](https://github.com/serverless/serverless/commit/16a7739411141487fa33f8a72f88d82db712bfc9)) ([Piotr Grzesik](https://github.com/pgrzesik))
+  - `config tabcompletion uninstall` command ([#10038](https://github.com/serverless/serverless/pull/10038)) ([02eebb4](https://github.com/serverless/serverless/commit/02eebb4643435341235340f5da8c7db903cb12e6)) ([Piotr Grzesik](https://github.com/pgrzesik))
+  - `config` command ([#10038](https://github.com/serverless/serverless/pull/10038)) ([7926570](https://github.com/serverless/serverless/commit/7926570557e5c0a4dd661c069eecc1d4a0cf9b5d)) ([Piotr Grzesik](https://github.com/pgrzesik))
+  - `slstats` command ([#10036](https://github.com/serverless/serverless/pull/10036)) ([0c9dae1](https://github.com/serverless/serverless/commit/0c9dae1210b9456ec96bc38a717a901beaa45a7b)) ([Piotr Grzesik](https://github.com/pgrzesik))
+
+### [2.60.3](https://github.com/serverless/serverless/compare/v2.60.2...v2.60.3) (2021-10-01)
+
+### Bug Fixes
+
+- **CLI:** Fix resolution of handler in case of local fallback ([#10042](https://github.com/serverless/serverless/pull/10042)) ([7d31410](https://github.com/serverless/serverless/commit/7d31410b74efb4c48c1c1b18ca33733a564268f2)) ([Mariusz Nowak](https://github.com/medikoo))
+
+### Maintenance Improvements
+
+- **CLI:**
+  - Improve modern `info` output ([#10037](https://github.com/serverless/serverless/pull/10037)) ([2828a2c](https://github.com/serverless/serverless/commit/2828a2c44388d731d4396e0ea11ae48953f20b0a)) ([Mariusz Nowak](https://github.com/medikoo))
+  - Improve modern error reporting ([#10037](https://github.com/serverless/serverless/pull/10037)) ([a205f88](https://github.com/serverless/serverless/commit/a205f88310653331c96f51402d148c576dd79db8)) ([Mariusz Nowak](https://github.com/medikoo))
+  - Improve modern logs for `logs` command ([#10037](https://github.com/serverless/serverless/pull/10037)) ([d1701bf](https://github.com/serverless/serverless/commit/d1701bf13a7155cce388424964e35ca536b2ce8a)) ([Mariusz Nowak](https://github.com/medikoo))
+  - Modern logs for `install` command ([#10040](https://github.com/serverless/serverless/pull/10040)) ([bd4d215](https://github.com/serverless/serverless/commit/bd4d215266b16793c26d06a34af8482f00e47844)) ([Piotr Grzesik](https://github.com/pgrzesik))
+  - Modern logs for `print` command ([#10035](https://github.com/serverless/serverless/pull/10035)) ([4ed34c3](https://github.com/serverless/serverless/commit/4ed34c3e5e21903a3fe9e512621739ef5bf0bd84)) ([Piotr Grzesik](https://github.com/pgrzesik))
+  - Generalize `writeServiceOutputs` ([#10037](https://github.com/serverless/serverless/pull/10037)) ([8aa700d](https://github.com/serverless/serverless/commit/8aa700dc7947d36aa46bba4b0e475f21fd19ac89)) ([Mariusz Nowak](https://github.com/medikoo))
+
+### [2.60.2](https://github.com/serverless/serverless/compare/v2.60.1...v2.60.2) (2021-09-30)
+
+### Bug Fixes
+
+- **AWS EventBridge:** Ensure proper support for `deadLetterQueueArn` (instead of `deadLetterConfig`) ([#10030](https://github.com/serverless/serverless/pull/10030)) ([846cfa1](https://github.com/serverless/serverless/commit/846cfa1bcf678a748678014c6359e5f0907d35ff)) ([Piotr Grzesik](https://github.com/pgrzesik))
+
+### [2.60.1](https://github.com/serverless/serverless/compare/v2.60.0...v2.60.1) (2021-09-29)
+
+### Bug Fixes
+
+- **AWS EventBridge:** Fix `MaximumEventAgeInSecond` template reference ([#10023](https://github.com/serverless/serverless/issues/10023)) ([cd03f55](https://github.com/serverless/serverless/commit/cd03f550ae5307ca44e1e27d4d0822bef6cc9dcf)) ([Mariusz Nowak](https://github.com/medikoo))
+- **Standalone:**
+  - Fix internal npm installation handling ([#10014](https://github.com/serverless/serverless/issues/10014)) ([5a583a9](https://github.com/serverless/serverless/commit/5a583a97980117209a614bfd40630b1bb714b744)) ([Mariusz Nowak](https://github.com/medikoo))
+  - Upgrade `npm` version to one that supports Node.js v14 ([#10014](https://github.com/serverless/serverless/issues/10014)) ([62d697c](https://github.com/serverless/serverless/commit/62d697c8615e8103aa07401eef2ebae559cc4a17)) ([Mariusz Nowak](https://github.com/medikoo))
+- **CLI:** Fix handling when local `serverless` is removed in command run ([#10016](https://github.com/serverless/serverless/issues/10016)) ([1a3ccdb](https://github.com/serverless/serverless/commit/1a3ccdbef8cd9c41b87f7fe440ca300970f3e138)) ([Mariusz Nowak](https://github.com/medikoo))
+
+### Maintenance Improvements
+
+- **Plugins:**
+  - Seclude `plugin install` standalone command ([#9942](https://github.com/serverless/serverless/issues/9942)) ([713ac1e](https://github.com/serverless/serverless/commit/713ac1e2a111426fb501b5fa29588a53efcba9bc)) ([Seungchan Ahn](https://github.com/issea1015))
+  - Seclude `plugin uninstall` standalone command ([#10015](https://github.com/serverless/serverless/issues/10015)) ([26ce1c6](https://github.com/serverless/serverless/commit/26ce1c636be7754584cf47a87f1b92d3b7d98122)) ([Seungchan Ahn](https://github.com/issea1015))
+  - Fix manual update notice ([#10016](https://github.com/serverless/serverless/issues/10016)) ([0d5884e](https://github.com/serverless/serverless/commit/0d5884ebbf015332c08cedea7a4359d66c3a2761)) ([Mariusz Nowak](https://github.com/medikoo))
+- **CLI: New logs (experimental):**
+  - `plugin install` command ([#10016](https://github.com/serverless/serverless/issues/10016)) ([8c5f22c](https://github.com/serverless/serverless/commit/8c5f22ceb67c3a2f4ace3adf8e19cf5e69d4c7b3)) ([Mariusz Nowak](https://github.com/medikoo))
+  - `plugin list` command ([#10016](https://github.com/serverless/serverless/issues/10016)) ([00e016c](https://github.com/serverless/serverless/commit/00e016c4bba86095744129d24683343f0cc5129f)) ([Mariusz Nowak](https://github.com/medikoo))
+  - `plugin search` command ([#10016](https://github.com/serverless/serverless/issues/10016)) ([1463171](https://github.com/serverless/serverless/commit/1463171cae93e9e050350f6eb272e35cfade0204)) ([Mariusz Nowak](https://github.com/medikoo))
+  - `plugin uninstall` command ([#10016](https://github.com/serverless/serverless/issues/10016)) ([3094be0](https://github.com/serverless/serverless/commit/3094be0cf06f916d8cf180036433677ecd73e013)) ([Mariusz Nowak](https://github.com/medikoo))
+  - interactive setup ([#10024](https://github.com/serverless/serverless/issues/10024)) ([07aed34](https://github.com/serverless/serverless/commit/07aed3429c63ed13ad9ca6262c641a907170f4f9)) ([Mariusz Nowak](https://github.com/medikoo))
+  - Local version fallback ([#10024](https://github.com/serverless/serverless/issues/10024)) ([231095d](https://github.com/serverless/serverless/commit/231095d28d4e3f137ef0a456692dd5d6a770a5db)) ([Mariusz Nowak](https://github.com/medikoo))
+  - Rely on newly introduced log style functions ([#10024](https://github.com/serverless/serverless/issues/10024)) ([e070110](https://github.com/serverless/serverless/commit/e070110eee0e679694aefd4e6b5f25ecc90793d4)) ([Mariusz Nowak](https://github.com/medikoo))
+  - Move variables resolution log to debug level ([#10016](https://github.com/serverless/serverless/issues/10016)) ([b0d854a](https://github.com/serverless/serverless/commit/b0d854af20d46ef9e07e5d4bce26b88e84f4c4f1)) ([Mariusz Nowak](https://github.com/medikoo))
+
+## [2.60.0](https://github.com/serverless/serverless/compare/v2.59.0...v2.60.0) (2021-09-24)
+
+### Features
+
+- **CLI:**
+  - Remove missing CLI options schema deprecation ([#10001](https://github.com/serverless/serverless/issues/10001)) ([5b38232](https://github.com/serverless/serverless/commit/5b38232e631e1fb6d944d5f323f533d7dd7b701f)) ([Mariusz Nowak](https://github.com/medikoo))
+  - Revert from unconditional `.env` support announcement ([#10003](https://github.com/serverless/serverless/issues/10003)) ([40cdb4f](https://github.com/serverless/serverless/commit/40cdb4f1a191d330e31ddadc4caaa4b314229e3d)) ([Mariusz Nowak](https://github.com/medikoo))
+- **AWS Stream:** Support `tumblingWindowInSeconds` ([#9979](https://github.com/serverless/serverless/issues/9979)) ([af39fc0](https://github.com/serverless/serverless/commit/af39fc016bd6386ea7d5d1ff71a26553a25b7ec5)) ([Guilherme Martins Crocetti](https://github.com/gmcrocetti))
+- Support `finalize` hook, triggered on command finalization ([#9956](https://github.com/serverless/serverless/issues/9956)) ([cb4f08a](https://github.com/serverless/serverless/commit/cb4f08ad7dd8eed3da69d61d51c6d5379a486bd0)) ([Mariusz Nowak](https://github.com/medikoo))
+
+### Bug Fixes
+
+- **AWS S3:** Recognize `BucketKeyEnabled` setting ([#9985](https://github.com/serverless/serverless/issues/9985)) ([54bb13b](https://github.com/serverless/serverless/commit/54bb13b6a6d3fd41548615fc23f4ae4d6d663dcc)) ([John Armstrong](https://github.com/jlarmstrongiv))
+- **CLI:** Fix general help output when in context of AWS service ([#9994](https://github.com/serverless/serverless/issues/9994)) ([0833fd0](https://github.com/serverless/serverless/commit/0833fd03d17d292bd4393ecec9569328daae68d2)) ([Mariusz Nowak](https://github.com/medikoo))
+- **Plugins:** Ensure to keep `options` as passed to plugins up to date ([#9999](https://github.com/serverless/serverless/issues/9999)) ([e3af1f3](https://github.com/serverless/serverless/commit/e3af1f3a94253a7900de104afaa1c49aa436965c)) ([Mariusz Nowak](https://github.com/medikoo))
+- **Telemetry:** Ensure to not show backend notification on error ([#9999](https://github.com/serverless/serverless/issues/9999)) ([dce0ff1](https://github.com/serverless/serverless/commit/dce0ff1a892959b12414f1bff3915fe50b900ba2)) ([Mariusz Nowak](https://github.com/medikoo))
+
+### Templates
+
+- Improve source maps handling in `aws-nodejs-typescript` ([#9961](https://github.com/serverless/serverless/issues/9961)) ([28d230f](https://github.com/serverless/serverless/commit/28d230f946df6cbcc8173822494b50cd056ef63c)) ([Adrien Cacciaguerra](https://github.com/adriencaccia))
+- Switch to esbuild in `aws-nodejs-typescript` ([#9962](https://github.com/serverless/serverless/issues/9962)) ([aaabb50](https://github.com/serverless/serverless/commit/aaabb50f1beb12683506ca7ab9e93ded75294694)) ([Adrien Cacciaguerra](https://github.com/adriencaccia))
+
+### Maintenance Improvements
+
+- Reorganize hooks resolution ([#9976](https://github.com/serverless/serverless/issues/9976)) ([76006ec](https://github.com/serverless/serverless/commit/76006ec1e80f51e194b51d4c0f2a11c64434158e)) ([Mariusz Nowak](https://github.com/medikoo))
+- Simplify lifecycle event hooks resolution ([#9976](https://github.com/serverless/serverless/issues/9976)) ([8b4498c](https://github.com/serverless/serverless/commit/8b4498c911e24ef7a46daf66380f1c122f988af3)) ([Mariusz Nowak](https://github.com/medikoo))
+- Replace `_.flatMap` usage ([#9948](https://github.com/serverless/serverless/issues/9948)) ([26b8bd5](https://github.com/serverless/serverless/commit/26b8bd5c5fd2154f47fa12804f1aee140000155f)) ([Jonas Matos](https://github.com/JonasMatos0))
+- **CLI: New logs (experimental):**
+  - Fix final `deploy` statuses timing ([#9967](https://github.com/serverless/serverless/issues/9967)) ([084a995](https://github.com/serverless/serverless/commit/084a9955f440ee18847df8a3087aba38405883b7)) ([Mariusz Nowak](https://github.com/medikoo))
+  - Fix CloudFormation update resources status log in _verbose_ mode ([#9967](https://github.com/serverless/serverless/issues/9967)) ([bcd8a02](https://github.com/serverless/serverless/commit/bcd8a022a1e2e50a5d2708c374f4d5bcc30c80b5)) ([Mariusz Nowak](https://github.com/medikoo))
+  - Ensure to strip colors from error messages ([#9967](https://github.com/serverless/serverless/issues/9967)) ([80005aa](https://github.com/serverless/serverless/commit/80005aaf6b57aa8d013fe4cda0be52d494cd4d78)) ([Mariusz Nowak](https://github.com/medikoo))
+  - Ensure to write outputs on `info` ([#9991](https://github.com/serverless/serverless/issues/9991)) ([43d17de](https://github.com/serverless/serverless/commit/43d17debee20bfc7ee535fd643df0538f8bee9f8)) ([Mariusz Nowak](https://github.com/medikoo))
+  - Present deprecations with single summary log ([#9960](https://github.com/serverless/serverless/issues/9960)) ([7eba95f](https://github.com/serverless/serverless/commit/7eba95fcb7f9b09a8a2aebd50c433f92e15cac97)) ([Piotr Grzesik](https://github.com/pgrzesik))
+  - Add timer to final `deploy` statuses ([#9959](https://github.com/serverless/serverless/issues/9959)) ([7828cc7](https://github.com/serverless/serverless/commit/7828cc77f1fcea8f901887c12b07f5e18b34dcc8)) ([Piotr Grzesik](https://github.com/pgrzesik))
+  - _debug_ (previously _verbose_) `deploy` logs ([#9967](https://github.com/serverless/serverless/issues/9967)) ([655140b](https://github.com/serverless/serverless/commit/655140b764c8f2998188c3d47110494cbd742688)) ([Mariusz Nowak](https://github.com/medikoo))
+  - Help output ([#9998](https://github.com/serverless/serverless/issues/9998)) ([b2df3cc](https://github.com/serverless/serverless/commit/b2df3cc0c8cba17c1995d3038e4a2caaca2f47f5)) ([Mariusz Nowak](https://github.com/medikoo))
+  - `deploy function` command ([#9990](https://github.com/serverless/serverless/issues/9990)) ([4d42ce3](https://github.com/serverless/serverless/commit/4d42ce3fa4f44f63d68a3841752746021500fe4f)) ([Mariusz Nowak](https://github.com/medikoo))
+  - `deploy list functions` command ([#10000](https://github.com/serverless/serverless/issues/10000)) ([ffbdfed](https://github.com/serverless/serverless/commit/ffbdfed292fdc379040052e6ec73107e5fdae5a8)) ([Mariusz Nowak](https://github.com/medikoo))
+  - `deploy list` command ([#10000](https://github.com/serverless/serverless/issues/10000)) ([9d6482c](https://github.com/serverless/serverless/commit/9d6482c6710cb2d05c8c03a29e207881efcc0138)) ([Mariusz Nowak](https://github.com/medikoo))
+  - `package` command ([#9956](https://github.com/serverless/serverless/issues/9956)) ([fa2507d](https://github.com/serverless/serverless/commit/fa2507dad06b037aa5a24b3392432cefc810a972)) ([Piotr Grzesik](https://github.com/pgrzesik))
+  - `deploy function` command ([#9990](https://github.com/serverless/serverless/issues/9990)) ([10df2e5](https://github.com/serverless/serverless/commit/10df2e5300e04ec9d00ebd343d9d8fe30c96afa7)) ([Mariusz Nowak](https://github.com/medikoo))
+  - _verbose_ logs for `deploy` operation ([#9967](https://github.com/serverless/serverless/issues/9967)) ([e423404](https://github.com/serverless/serverless/commit/e423404290a757a8adfc97d45e9aef7aa93f1404)) ([Mariusz Nowak](https://github.com/medikoo))
+  - dapt pre-created log style generators ([#9998](https://github.com/serverless/serverless/issues/9998)) ([8c9bd4a](https://github.com/serverless/serverless/commit/8c9bd4a6eda58d2ed6da08cc3bb806d970df4d17)) ([Mariusz Nowak](https://github.com/medikoo))
+  - Convert custom resource packaging related log ([#9989](https://github.com/serverless/serverless/issues/9989)) ([0f0b85a](https://github.com/serverless/serverless/commit/0f0b85a6373dfcd9d21f1668e7fb3e0d20a3b393)) ([Mariusz Nowak](https://github.com/medikoo))
+  - `logs` command ([#9991](https://github.com/serverless/serverless/issues/9991)) ([cbd2e64](https://github.com/serverless/serverless/commit/cbd2e64f705e54e37dd9116d0931a3a96bceaa88)) ([Mariusz Nowak](https://github.com/medikoo))
+  - Refactor main progress event with `isMainEvent` option ([#9981](https://github.com/serverless/serverless/issues/9981)) ([a6553f8](https://github.com/serverless/serverless/commit/a6553f8668b66e2281626e7e79a3a2042279f92d)) ([Mariusz Nowak](https://github.com/medikoo))
+
+## [2.59.0](https://github.com/serverless/serverless/compare/v2.58.0...v2.59.0) (2021-09-14)
+
+### Features
+
+- **CLI Onboarding:** Switch to `httpApi`-based templates ([#9954](https://github.com/serverless/serverless/pull/9954)) ([12216db](https://github.com/serverless/serverless/commit/12216db579f7f2d055410f1ea9449825628631b7)) ([Piotr Grzesik](https://github.com/pgrzesik))
+- **CLI:** First iteration of support for `verbose` mode in `deploy` with modern logs ([#9952](https://github.com/serverless/serverless/pull/9952)) ([fbdd124](https://github.com/serverless/serverless/commit/fbdd124029d10ef029ee5446777db44f907e026c)) ([Piotr Grzesik](https://github.com/pgrzesik))
+
+### Bug Fixes
+
+- **AWS API Gateway:** Ensure consistent default for `cors` conf ([#9909](https://github.com/serverless/serverless/issues/9909)) ([7cd3966](https://github.com/serverless/serverless/commit/7cd3966897fa4432caf3f2bda0037df0c76e382b)) ([Seungchan Ahn](https://github.com/issea1015))
+
+### Maintenance Improvements
+
+- Replace `_.pick` with native property assignment ([#9937](https://github.com/serverless/serverless/issues/9937)) ([6087fa3](https://github.com/serverless/serverless/commit/6087fa3400b508092a5113d40e4b2c4fd8ec22a7)) ([Jonas Matos](https://github.com/JonasMatos0))
+
+## [2.58.0](https://github.com/serverless/serverless/compare/v2.57.0...v2.58.0) (2021-09-13)
+
+### Features
+
+- **AWS API Gateway:** Support `enabled` for `apiKeys` config ([#9918](https://github.com/serverless/serverless/pull/9918)) ([1107763](https://github.com/serverless/serverless/commit/1107763df8fb07a40ec45529f77d99e5a0f6d4d6)) ([Piotr Grzesik](https://github.com/pgrzesik))
+- **AWS CloudFront:** Support `behavior.CachePolicyId` ([#9895](https://github.com/serverless/serverless/issues/9895)) ([3abc2f0](https://github.com/serverless/serverless/commit/3abc2f06428b72d964aa8683c34cdcf1d761d140)) ([Seungchan Ahn](https://github.com/issea1015))
+- **AWS EventBridge:** Support `deadLetterQueue` and `retryPolicy` ([#9903](https://github.com/serverless/serverless/pull/9903)) ([130fb38](https://github.com/serverless/serverless/commit/130fb3838fd3ea382caabffad74fde8a4041d4fc)) ([Eve](https://github.com/evemontalvao) & [JP Bochi](https://github.com/jpbochi))
+- **AWS ActiveMQ:** Add support for `activemq` event ([#8840](https://github.com/serverless/serverless/issues/8840)) ([cacb529](https://github.com/serverless/serverless/commit/cacb529925ed2b2c591984f48bc52cf31f88e698)) ([lewgordon](https://github.com/lewgordon) & [Piotr Grzesik](https://github.com/pgrzesik))
+- **AWS Schedule:** Allow multiple `rate` expressions in single event ([#9892](https://github.com/serverless/serverless/pull/9892)) ([9f0bc68](https://github.com/serverless/serverless/commit/9f0bc689cc2ac3e53b4db665b899e1446ac37456)) ([Federico Jasson](https://github.com/federicojasson))
+- **CLI:**
+  - Configure log writing with new (experimental) log engine ([#9923](https://github.com/serverless/serverless/pull/9923)) ([ec93174](https://github.com/serverless/serverless/commit/ec93174b8ccfe1715ce3615dcb2223b145ad0f31)) ([Mariusz Nowak](https://github.com/medikoo))
+  - Introduce first iteration of modern logs for `deploy` ([#9934](https://github.com/serverless/serverless/issues/9934)) ([171897d](https://github.com/serverless/serverless/commit/171897d60e5adaa590be1f08c99ab2cc76e89ee4)) ([Piotr Grzesik](https://github.com/pgrzesik))
+- Do not retry AWS requests if the token has expired ([#9914](https://github.com/serverless/serverless/issues/9914)) ([b0ca237](https://github.com/serverless/serverless/commit/b0ca2376bbfb543d98db1585c3a20a391e1791c6)) ([Mars Lan](https://github.com/mars-lan))
+- Support `error` hook to be triggered on command error ([#9936](https://github.com/serverless/serverless/pull/9936)) ([5c9766c](https://github.com/serverless/serverless/commit/5c9766c085531b04e169aa36a552159755029cca)) ([Mariusz Nowak](https://github.com/medikoo))
+
+### Bug Fixes
+
+- **AWS API Gateway:** Ensure proper `RequestValidator` name ([#9910](https://github.com/serverless/serverless/pull/9910)) ([510b1d1](https://github.com/serverless/serverless/commit/510b1d165924d000aa8e81e74e27c69ac1a2e0b6)) ([Piotr Grzesik](https://github.com/pgrzesik))
+- **AWS CloudFront:** Recognize `behavior.TrustedKeyGroups` in schema ([#9884](https://github.com/serverless/serverless/pull/9884)) ([da71df6](https://github.com/serverless/serverless/commit/da71df603295397229589c88dd8366426e06e982)) ([Petr Reshetin](https://github.com/preshetin))
+- **AWS Lambda:** Recognize `Fn::If` function for `environment` ([#9905](https://github.com/serverless/serverless/pull/9905)) ([63743ad](https://github.com/serverless/serverless/commit/63743ade31207049eee1811203db5622bc510f1a)) ([Piotr Grzesik](https://github.com/pgrzesik))
+
+### Maintenance Improvements
+
+- **CLI:**
+  - Ensure no monkey patching by progress override ([#9923](https://github.com/serverless/serverless/pull/9923)) ([e46ce80](https://github.com/serverless/serverless/commit/e46ce80d99414ff730355efd1636bab71bb1771c)) ([Mariusz Nowak](https://github.com/medikoo))
+  - Ensure to clear progress in expected time points ([#9928](https://github.com/serverless/serverless/pull/9928)) ([29aec52](https://github.com/serverless/serverless/commit/29aec529b53d7dd10f4ec61db7c0dc3859995d27)) ([Mariusz Nowak](https://github.com/medikoo))
+- Replace `fse.access` with `fs.promises.access` ([#9915](https://github.com/serverless/serverless/issues/9915)) ([5155e01](https://github.com/serverless/serverless/commit/5155e0180e0cd5e3130bc74e308a97c0ea1a5c2b)) ([Sudipto Das](https://github.com/sdas13))
+- Replace `fse.readFile` with `fs.promises.readFile` ([#9935](https://github.com/serverless/serverless/issues/9935)) ([f431218](https://github.com/serverless/serverless/commit/f431218790ae31efdc4e0a65a5b17a32605ede3e)) ([Sudipto Das](https://github.com/sdas13))
+- Use `getCompiledTemplateS3Suffix` from `provider.naming` ([#9926](https://github.com/serverless/serverless/pull/9926)) ([95d3024](https://github.com/serverless/serverless/commit/95d3024ef55ce80edf20fe27d9c72ffd15bba2bb)) ([Andreas Kohn](https://github.com/ankon))
+- Internal API to register service outputs ([#9933](https://github.com/serverless/serverless/pull/9933)) ([b425cf1](https://github.com/serverless/serverless/commit/b425cf1582623c1e796ae9f3d33dc060a9492cb5)) ([Mariusz Nowak](https://github.com/medikoo))
+- Register service outputs ([#9933](https://github.com/serverless/serverless/pull/9933)) ([312266e](https://github.com/serverless/serverless/commit/312266e90819866199354183641954636bd5a076)) ([Mariusz Nowak](https://github.com/medikoo))
+
+### Templates
+
+- Remove unnecessary `fmt.Sprintf` in `tencent-go` ([#9847](https://github.com/serverless/serverless/pull/9847)) ([e798c26](https://github.com/serverless/serverless/commit/e798c269df6f456bccf6a1e755015ea1e7631117)) ([kou](https://github.com/kou-pg-0131))
+
+## [2.57.0](https://github.com/serverless/serverless/compare/v2.56.0...v2.57.0) (2021-08-31)
+
+### Features
+
+- **Variables:** Enable `env` variables in `provider.stage` property ([#9896](https://github.com/serverless/serverless/issues/9896)) ([bbb6c6c](https://github.com/serverless/serverless/commit/bbb6c6cd7dea9100af3ff84dd490b2cac1e2971e)) ([Mariusz Nowak](https://github.com/medikoo))
+
+### Bug Fixes
+
+- **AWS API Gateway:**
+  - Recognize CF functions at `functions[].events[].http.connectionId` ([#9894](https://github.com/serverless/serverless/issues/9894)) ([3e8858b](https://github.com/serverless/serverless/commit/3e8858b1a8cde32a3659498c6dbdc7d8637e86c6)) ([Piotr Grzesik](https://github.com/pgrzesik))
+  - Recognize CF functions at `functions[].events[].http.request.headers[].mappedValue` ([#9894](https://github.com/serverless/serverless/issues/9894)) ([868ac02](https://github.com/serverless/serverless/commit/868ac02fd4d41a893d23a3f29101e3a3b952597b)) ([Piotr Grzesik](https://github.com/pgrzesik))
+  - Recognize CF functions at `functions[].events[].http.request.uri` ([#9894](https://github.com/serverless/serverless/issues/9894)) ([13ce56a](https://github.com/serverless/serverless/commit/13ce56ae314dff1c157fc8351fc702bf15573fce)) ([Piotr Grzesik](https://github.com/pgrzesik))
+  - Fix request validator triage ([#9887](https://github.com/serverless/serverless/issues/9887)) ([cb109dd](https://github.com/serverless/serverless/commit/cb109dd835ec358bfb1af10fe8f82aa283ffbafe)) ([Mariusz Nowak](https://github.com/medikoo))
+- **Variables:** Fix new sources resolution error message at old resolver ([#9888](https://github.com/serverless/serverless/issues/9888)) ([8dece7f](https://github.com/serverless/serverless/commit/8dece7f6c6544f91366a2c8f70389be8b4b659c8)) ([Mariusz Nowak](https://github.com/medikoo))
+
+### Maintenance Improvements
+
+- **Variables:** Enable early `sls:stage` resolution ([#9890](https://github.com/serverless/serverless/issues/9890)) ([56e9423](https://github.com/serverless/serverless/commit/56e9423cd74dc05cc85b176bb1f0502f7ce05139)) ([Mariusz Nowak](https://github.com/medikoo))
+- Replace `fse.writeFile` with `fs.promises.writeFile` ([#9870](https://github.com/serverless/serverless/issues/9870)) ([05fff98](https://github.com/serverless/serverless/commit/05fff98a0003b22a66e8932c622c0e10c57bf06b)) ([Sudipto Das](https://github.com/sdas13))
+- Upgrade `filesize` to v8 ([#9901](https://github.com/serverless/serverless/issues/9901)) ([9a2511c](https://github.com/serverless/serverless/commit/9a2511cf90c60ba5b67ecea81121328c8dd93702)) ([Mariusz Nowak](https://github.com/medikoo))
+
+## [2.56.0](https://github.com/serverless/serverless/compare/v2.55.0...v2.56.0) (2021-08-25)
+
+### Features
+
+- **AWS EventBridge:** Support disabling a rule ([#9865](https://github.com/serverless/serverless/issues/9865)) ([6193d38](https://github.com/serverless/serverless/commit/6193d3867ec826898d4effbd641e49a35d9efbbc)) ([Jake Scott](https://github.com/jakejscott))
+- **AWS HTTP API:** Support `shouldStartNameWithService` option ([#9758](https://github.com/serverless/serverless/issues/9758)) ([ef5a8fa](https://github.com/serverless/serverless/commit/ef5a8faf13a8fbf8564e7c0621e88d1ea5357ea5)) ([Thiago Moraes](https://github.com/thiagomr))
+- **CLI Onboarding:** Improve onboarding messaging ([#9877](https://github.com/serverless/serverless/pull/9877)) ([f69a19c](https://github.com/serverless/serverless/commit/f69a19c6804366a34324e7cfcbbdb3f247a12b85)) ([Piotr Grzesik](https://github.com/pgrzesik))
+
+### Bug Fixes
+
+- **AWS HTTP API:** Always allow to define catch-all route ([#9840](https://github.com/serverless/serverless/issues/9840)) ([7e9bfd6](https://github.com/serverless/serverless/commit/7e9bfd63fce56f880a3ad0379fd97fdfce89d91b)) ([Karim Kanso](https://github.com/kazkansouh))
+- **CLI:** Mark `dashboard` command with optional service dependency ([#9874](https://github.com/serverless/serverless/pull/9874)) ([9a8e7e4](https://github.com/serverless/serverless/commit/9a8e7e44b44fdcf4c43d6e11c5eefa5051782506)) ([Piotr Grzesik](https://github.com/pgrzesik))
+- **AWS Local Invocation:** Support `python3.9` runtime ([#9879](https://github.com/serverless/serverless/issues/9879)) ([ee17ee5](https://github.com/serverless/serverless/commit/ee17ee5aca25af152c2720a55199d92dfab3216d)) ([Shane R. Spencer](https://github.com/whardier))
+- **AWS Lambda:** Prevent external subscription filter removal for CloudWatch ([#9839](https://github.com/serverless/serverless/issues/9839)) ([afc9a13](https://github.com/serverless/serverless/commit/afc9a13386479f79b4c9ef64b65af5bbcdfaa68b)) ([Han Sang Hoon (한상훈)](https://github.com/poerty))
+
+### Maintenance Improvements
+
+- Convert `upload` and `rollback` to `async/await` ([#9866](https://github.com/serverless/serverless/issues/9866)) ([0682ba8](https://github.com/serverless/serverless/commit/0682ba8b6a70d27e74c478d6e5fa5de71b9e0070)) ([Remigiusz Orłowski](https://github.com/remi00))
+
+## [2.55.0](https://github.com/serverless/serverless/compare/v2.54.0...v2.55.0) (2021-08-18)
+
+### Features
+
+- **AWS Lambda:** Recognize `python3.9` as valid runtime ([#9854](https://github.com/serverless/serverless/pull/9854)) ([1aa24b8](https://github.com/serverless/serverless/commit/1aa24b8991032ba3fe6f2c4b65bf0e70bc4171dd)) ([Piotr Grzesik](https://github.com/pgrzesik))
+
+### Bug Fixes
+
+- **AWS HTTP API:** Properly handle authorizer function with alias (e.g. with `provisionedConcurrency`) ([#9850](https://github.com/serverless/serverless/pull/9850)) ([0ca6aaa](https://github.com/serverless/serverless/commit/0ca6aaae526b16df2039edff5db166a39bb1de10)) ([Piotr Grzesik](https://github.com/pgrzesik))
+
+### Maintenance Improvements
+
+- **CLI Onboarding:** Adjust summary messages in deploy step ([#9835](https://github.com/serverless/serverless/pull/9835)) ([b751c50](https://github.com/serverless/serverless/commit/b751c505c8050e229edb77d44016925c4e52a05e)) ([Piotr Grzesik](https://github.com/pgrzesik))
+- Replace `fse.stat` with `fs.promises.stat` ([#9845](https://github.com/serverless/serverless/issues/9845)) ([bb0484e](https://github.com/serverless/serverless/commit/bb0484e6b54a3cc6aed46ff23100e08c90c995ce)) ([Sudipto Das](https://github.com/sdas13))
+- **Telemetry:** Recognize `notificationsMode` ([#9851](https://github.com/serverless/serverless/pull/9851)) ([00fdba1](https://github.com/serverless/serverless/commit/00fdba154655b15b5b2de4b9ceca08f8bfce599e)) ([Piotr Grzesik](https://github.com/pgrzesik))
+
+## [2.54.0](https://github.com/serverless/serverless/compare/v2.53.1...v2.54.0) (2021-08-12)
+
+### Features
+
+- **AWS IAM:** Resign from deprecating old format of IAM settings ([#9778](https://github.com/serverless/serverless/pull/9778)) ([847dd8f](https://github.com/serverless/serverless/commit/847dd8f47503ddf03971122e5700110aa3ff77d1)) ([Mariusz Nowak](https://github.com/medikoo))
+- **AWS Lambda:** Add support for multiple subscription filters ([#9760](https://github.com/serverless/serverless/issues/9760)) ([5c9ca56](https://github.com/serverless/serverless/commit/5c9ca56d14a90dfd9aa5c064bd15137504336ed7)) ([Han Sang Hoon (한상훈)](https://github.com/poerty))
+- **AWS API Gateway:** Deprecate default for `identitySource` for `request` authorizers with disabled caching ([#9825](https://github.com/serverless/serverless/pull/9825)) ([0e01d9e](https://github.com/serverless/serverless/commit/0e01d9e337860b9d1136586fbfaf0c43ac21cde0)) ([Piotr Grzesik](https://github.com/pgrzesik))
+- **CLI:** Deprecate `-v` as alias for `--verbose` ([#9811](https://github.com/serverless/serverless/commit/53b41eb53aeefe22dc29b785a428f3b184906d2c)) ([53b41eb](https://github.com/serverless/serverless/commit/53b41eb53aeefe22dc29b785a428f3b184906d2c)) ([Piotr Grzesik](https://github.com/pgrzesik))
+
+### Bug Fixes
+
+- **AWS Deploy:** Ensure right code for `deploy -f` deprecation ([#9833](https://github.com/serverless/serverless/pull/9833)) ([90877d5](https://github.com/serverless/serverless/commit/90877d575ec9436db30a3a16fc90e5190ea30018)) ([Mariusz Nowak](https://github.com/medikoo))
+- **AWS Layers:** Support references to external layers ([#9826](https://github.com/serverless/serverless/pull/9826)) ([dc74f41](https://github.com/serverless/serverless/commit/dc74f41470447c1fab0a646c15284a4eb212ecb6)) ([Piotr Grzesik](https://github.com/pgrzesik))
+- **Variables:** Unconditionally deprecate old vars engine extensions ([#9827](https://github.com/serverless/serverless/pull/9827)) ([b7f4e08](https://github.com/serverless/serverless/commit/b7f4e08661cd149a29ae7107241a16928dc606eb)) ([Mariusz Nowak](https://github.com/medikoo))
+
+### [2.53.1](https://github.com/serverless/serverless/compare/v2.53.0...v2.53.1) (2021-08-06)
+
+### Bug Fixes
+
+- **AWS API Gateway:** Ensure `MinimumCompressionSize` can be set to 0 ([#9806](https://github.com/serverless/serverless/issues/9806)) ([f0ae032](https://github.com/serverless/serverless/commit/f0ae032252f88d4d864c2bfe526d70064168231a)) ([Lewis Putz](https://github.com/Putzy))
+
+### Maintenance Improvements
+
+- **CLI:** Change formatting of notifications ([#9807](https://github.com/serverless/serverless/issues/9807)) ([7c51f55](https://github.com/serverless/serverless/commit/7c51f55f5b8af6f853560ba5d757c65b1068a7ab)) ([Piotr Grzesik](https://github.com/pgrzesik))
+- Use `async` in `lib/utils` ([#9809](https://github.com/serverless/serverless/issues/9809)) ([48c3d99](https://github.com/serverless/serverless/commit/48c3d990beccef7dc3f4b5d29ec5bc4238fd9cf6)) ([Nyambayar Turbat](https://github.com/nyamba))
+
+## [2.53.0](https://github.com/serverless/serverless/compare/v2.52.1...v2.53.0) (2021-08-04)
+
+### Features
+
+- **Variables:** Accept case-insensitive strings in `strToBool` ([#9770](https://github.com/serverless/serverless/issues/9770)) ([612f668](https://github.com/serverless/serverless/commit/612f668c931013bea21b91f47d9cbfd1c7dbb888)) ([Shane R. Spencer](https://github.com/whardier))
+
+### Bug Fixes
+
+- **AWS API Gateway:** Ensure to attach validator when required parameters are defined ([#9793](https://github.com/serverless/serverless/issues/9793)) ([d275459](https://github.com/serverless/serverless/commit/d2754594c462afd39e1576312e361ca57d4f13f2)) ([Karim Kanso](https://github.com/kazkansouh))
+- **Plugins:** Improve error message when a plugin is missing ([#9798](https://github.com/serverless/serverless/issues/9798)) ([5c9df56](https://github.com/serverless/serverless/commit/5c9df56f1bc89af1fd929519f3cf8dac967e514d)) ([Matthieu Napoli](https://github.com/mnapoli))
+
+### Maintenance Improvements
+
+- **Telemetry:** Recognize used variable sources ([#9790](https://github.com/serverless/serverless/pull/9790)) ([60d729b](https://github.com/serverless/serverless/commit/60d729b5d42ae32cc418b9578582da3dc8492754)) ([Piotr Grzesik](https://github.com/pgrzesik))
+- Replace `fse.readdir` with `fs.promises.readdir` ([#9780](https://github.com/serverless/serverless/issues/9780)) ([1e00f9e](https://github.com/serverless/serverless/commit/1e00f9edfb5f7618759f9f03d0dad58701a5a27a)) ([Sudipto Das](https://github.com/sdas13))
+- Use `async` in `lib/plugins/create` ([#9683](https://github.com/serverless/serverless/issues/9683)) ([4b87497](https://github.com/serverless/serverless/commit/4b87497875a19348e444763eea85671ed2c4f0b7)) ([Nyambayar Turbat](https://github.com/nyamba))
+- Use `async` in `lib/plugins/plugin` ([#9680](https://github.com/serverless/serverless/issues/9680)) ([377da09](https://github.com/serverless/serverless/commit/377da097c564778c8d2c42ffe49e38000c520106)) ([Nyambayar Turbat](https://github.com/nyamba))
+
+### [2.52.1](https://github.com/serverless/serverless/compare/v2.52.0...v2.52.1) (2021-07-22)
+
+### Bug Fixes
+
+- **CLI Onboarding:** Ensure credentials resolution is always performed before deploy step ([#9761](https://github.com/serverless/serverless/pull/9761)) ([b85f393](https://github.com/serverless/serverless/commit/b85f3934ed87e9c78494e9ad26163ee1d041599e)) ([Piotr Grzesik](https://github.com/pgrzesik))
+- **CLI:**
+  - Ensure `processedInput` is properly resolved in local fallback ([#9769](https://github.com/serverless/serverless/pull/9769)) ([464467e](https://github.com/serverless/serverless/commit/464467e2bece1bf3f35fe60041fa170f412087d3)) ([Mariusz Nowak](https://github.com/medikoo))
+  - Fix validation of `deprecationNotificationMode` config option ([#9762](https://github.com/serverless/serverless/issues/9762)) ([916c76f](https://github.com/serverless/serverless/commit/916c76f48ca86c3e31b719d2bb655c34d0287cec)) ([frozenbonito](https://github.com/frozenbonito))
+- Fix `functions[]` validation (ignore `null` values) ([#9756](https://github.com/serverless/serverless/pull/9756)) ([922ec00](https://github.com/serverless/serverless/commit/922ec0093f0d4ab6f2b2055c6e6f2d5ec1f9d06e)) ([Mariusz Nowak](https://github.com/medikoo))
+
+### Maintenance Improvements
+
+- **CLI Onboarding:**
+  - Move `dashboard-login` step from `@serverless/dashboard-plugin` ([#9766](https://github.com/serverless/serverless/pull/9766)) ([adef710](https://github.com/serverless/serverless/commit/adef7102df2958e976445f0c247895f82decebf9)) ([Piotr Grzesik](https://github.com/pgrzesik))
+  - Move `dashboard-set-org` from `@serverless/dashboard-plugin` ([#9766](https://github.com/serverless/serverless/pull/9766)) ([afdf77c](https://github.com/serverless/serverless/commit/afdf77c960c990f7daa445532789aebb9dc15a53)) ([Piotr Grzesik](https://github.com/pgrzesik))
+- **Telemetry:** Use `prompt-with-history` for onboarding telemetry ([#9768](https://github.com/serverless/serverless/pull/9768)) ([4d56be5](https://github.com/serverless/serverless/commit/4d56be562a4bdaf2588bdc42227a451d098d1420)) ([Piotr Grzesik](https://github.com/pgrzesik))
+- Replace `fse.unlink` with `fs.promises.unlink` ([#9754](https://github.com/serverless/serverless/issues/9754)) ([daee1d5](https://github.com/serverless/serverless/commit/daee1d5375efdb748b85b85a2a4675ac3277001f)) ([Sudipto Das](https://github.com/sdas13))
+
+## [2.52.0](https://github.com/serverless/serverless/compare/v2.51.2...v2.52.0) (2021-07-15)
+
+### Features
+
+- **AWS CloudFormation:** Allow to disable default export names ([#9748](https://github.com/serverless/serverless/pull/9748)) ([6f49488](https://github.com/serverless/serverless/commit/6f494888cc01853894ec33859edbd77a06dc9d76)) ([Piotr Grzesik](https://github.com/pgrzesik))
+- **CLI:** Automatically expand loaded env variables from `.env` files ([#9615](https://github.com/serverless/serverless/issues/9615)) ([1864969](https://github.com/serverless/serverless/commit/186496922a0c4d69f3101dde0a9f4a0d89995ad0)) ([David Asensio Cañas](https://github.com/d-asensio))
+
+### Bug Fixes
+
+- **CLI:** Do not validate configuration with `plugin ..` commands ([#9741](https://github.com/serverless/serverless/pull/9741)) ([040036d](https://github.com/serverless/serverless/commit/040036d1869ceb207da6dad53f17e1ee1b6ee20a)) ([Mariusz Nowak](https://github.com/medikoo))
+- **Variables:** In `ssm` source auto parse only object JSON notation ([#9747](https://github.com/serverless/serverless/pull/9747)) ([8c741d1](https://github.com/serverless/serverless/commit/8c741d1d97f021995f37a61d7340ddfa749cdab9)) ([Mariusz Nowak](https://github.com/medikoo))
+- Improve `functions` validation ([#9741](https://github.com/serverless/serverless/pull/9741)) ([3e58d62](https://github.com/serverless/serverless/commit/3e58d628e7b8f4dbc8e14adf94dd98546099f3be)) ([Mariusz Nowak](https://github.com/medikoo))
+
+### Maintenance Improvements
+
+- **Telemetry:** Record initial context for interactive setup ([#9736](https://github.com/serverless/serverless/pull/9736)) ([560aee5](https://github.com/serverless/serverless/commit/560aee5feb9f143e93933f6536e76edc9a3e56bb)) ([Piotr Grzesik](https://github.com/pgrzesik))
+- **CLI:** Reuse already imported module ([#9741](https://github.com/serverless/serverless/pull/9741)) ([be441cc](https://github.com/serverless/serverless/commit/be441ccd9157b351fffe6ea21664624aeeeb4b29)) ([Mariusz Nowak](https://github.com/medikoo))
+- Add `has-local-credentials` util ([#9736](https://github.com/serverless/serverless/pull/9736)) ([82a35b3](https://github.com/serverless/serverless/commit/82a35b3903ad5d8f761612105036fc11a37e9e55)) ([Piotr Grzesik](https://github.com/pgrzesik))
+
+### [2.51.2](https://github.com/serverless/serverless/compare/v2.51.1...v2.51.2) (2021-07-08)
+
+### Bug Fixes
+
+- **Packaging:** Fix `package.artifact` validation for S3 urls ([#9725](https://github.com/serverless/serverless/issues/9725)) ([ab3c543](https://github.com/serverless/serverless/commit/ab3c543089b0fde4107fc0e579c19f85e0a4ee79)) ([Mariusz Nowak](https://github.com/medikoo))
+
+### [2.51.1](https://github.com/serverless/serverless/compare/v2.51.0...v2.51.1) (2021-07-08)
+
+### Bug Fixes
+
+- **CLI:** Fix `SIGINT` signal handling ([#9712](https://github.com/serverless/serverless/issues/9712)) ([c5a3f69](https://github.com/serverless/serverless/commit/c5a3f6907a115ea2d511b0aa9905a2e762514867)) ([Mariusz Nowak](https://github.com/medikoo))
+- **Packaging:** Validate `package.artifact` paths ([#9721](https://github.com/serverless/serverless/issues/9721)) ([21c0fed](https://github.com/serverless/serverless/commit/21c0fedc507651bb98687acc4145ed667d853589)) ([Mariusz Nowak](https://github.com/medikoo))
+- **AWS Local Invocation:** Bump AWS Java pom version to pull in fix ([#9714](https://github.com/serverless/serverless/issues/9714)) ([504b42a](https://github.com/serverless/serverless/commit/504b42ae0fefd04ccfa013746371c49a02d8a4d3)) ([tlloyd-synalogik](https://github.com/tlloyd-synalogik))
+
+### Maintenance Improvements
+
+- **Telemetry:**
+  - Report all interruption signals ([#9712](https://github.com/serverless/serverless/issues/9712)) ([7354c20](https://github.com/serverless/serverless/commit/7354c2000f25d526f8c3fd97c6d4d22054388755)) ([Mariusz Nowak](https://github.com/medikoo))
+  - Report whether we're in context of TTY terminal ([#9712](https://github.com/serverless/serverless/issues/9712)) ([9cea555](https://github.com/serverless/serverless/commit/9cea555e88bdaadf717def21b5298a64c7ce79b9)) ([Mariusz Nowak](https://github.com/medikoo))
+  - Ensure no doubled telemetry in edge cases ([#9716](https://github.com/serverless/serverless/issues/9716)) ([fd5005e](https://github.com/serverless/serverless/commit/fd5005e404debe103ca54974ca9aee431554ceb8)) ([Mariusz Nowak](https://github.com/medikoo))
+- **CLI:** Improve module imports order ([#9712](https://github.com/serverless/serverless/issues/9712)) ([dff2799](https://github.com/serverless/serverless/commit/dff2799941a1da8c2d5fe76144393db241a7637c)) ([Mariusz Nowak](https://github.com/medikoo))
+
+## [2.51.0](https://github.com/serverless/serverless/compare/v2.50.0...v2.51.0) (2021-07-06)
+
+### Features
+
+- **AWS Kafka:** Add support for `SASL/PLAIN` auth to `kafka` event ([#9666](https://github.com/serverless/serverless/pull/9666)) ([3e14f06](https://github.com/serverless/serverless/commit/3e14f063052385026425021379bfc883dac5ff74)) ([Daniele Iasella](https://github.com/overbit))
+- **CLI:** New `warn:summary` (default) deprecations logging mode ([#9693](https://github.com/serverless/serverless/pull/9693)) ([9b624a5](https://github.com/serverless/serverless/commit/9b624a50677a0363c052b4ea567c050af7863073)) ([Mariusz Nowak](https://github.com/medikoo))
+
+### Bug Fixes
+
+- **CLI:** Recognize `--verbose` option in `info` command ([#9695](https://github.com/serverless/serverless/pull/9695)) ([b124152](https://github.com/serverless/serverless/commit/b1241522ec378f7b7b431050ddc861fef040efc4)) ([Mariusz Nowak](https://github.com/medikoo))
+
+### Maintenance Improvements
+
+- **CLI:** Fix typo in error message ([#9682](https://github.com/serverless/serverless/issues/9682)) ([f16c45f](https://github.com/serverless/serverless/commit/f16c45f84b8be1e469bfdd92191fc760b8f1631e)) ([KIDANI Akito](https://github.com/kdnakt))
+- **Telemetry:**
+  - Properly handle situation when not in service dir in credentials step ([#9678](https://github.com/serverless/serverless/pull/9678)) ([b21c1e4](https://github.com/serverless/serverless/commit/b21c1e415b67cdc8f1fb0ab14152eaf3c6550894))
+  - Ensure to pass all steps with configured questions ([#9701](https://github.com/serverless/serverless/pull/9701)) ([b5d3167](https://github.com/serverless/serverless/commit/b5d3167e9fdd5f08af1389b975322f2146b22507)) ([Piotr Grzesik](https://github.com/pgrzesik))
+  - Correctly report `outcome` for interactive setup ([#9699](https://github.com/serverless/serverless/pull/9699)) ([0c5b8dd](https://github.com/serverless/serverless/commit/0c5b8dd831bcde80628c2ac548172ffaa9ce9ca6)) ([Piotr Grzesik](https://github.com/pgrzesik))
+  - Ensure telemetry generation and related utils are sync ([#9692](https://github.com/serverless/serverless/pull/9692)) ([e65199c](https://github.com/serverless/serverless/commit/e65199c05213e1bac17acedc84cdd6dfd26ff00a)) ([Piotr Grzesik](https://github.com/pgrzesik))
+  - Report `commandUsage` as object ([#9690](https://github.com/serverless/serverless/pull/9690)) ([cc24bc2](https://github.com/serverless/serverless/commit/cc24bc2ae280237b3d439e1934ab75710e0f259f)) ([Piotr Grzesik](https://github.com/pgrzesik))
+  - Handle interruptions and persist telemetry data ([#9699](https://github.com/serverless/serverless/pull/9699)) ([502f7e7](https://github.com/serverless/serverless/commit/502f7e711f0954c2960fb790b749002aeb1789fc)) ([Piotr Grzesik](https://github.com/pgrzesik))
+- Drop old variables engine related deprecation ([#9698](https://github.com/serverless/serverless/pull/9698)) ([5b54ed2](https://github.com/serverless/serverless/commit/5b54ed2e2685c24439c0f835b50a024dbf9d39a9)) ([Mariusz Nowak](https://github.com/medikoo))
+- Make deprecations default mode internally modifyable ([#9693](https://github.com/serverless/serverless/pull/9693)) ([07a69a8](https://github.com/serverless/serverless/commit/07a69a836c506e3ab8ab976ef27d4f3b672722f7)) ([Mariusz Nowak](https://github.com/medikoo))
+- Replace `fse.createWriteStream` with `fs.createWriteStream` ([#9687](https://github.com/serverless/serverless/pull/9687)) ([3500f64](https://github.com/serverless/serverless/commit/3500f641f5212f196f75081e67d1d1518ac3bb6b)) ([Sudipto Das](https://github.com/sdas13))
+- Use `async` in `lib/plugins/package` ([#9644](https://github.com/serverless/serverless/issues/9644)) ([db67b35](https://github.com/serverless/serverless/commit/db67b353c9ed578d7dd334d162efa1ec11fbfa18)) ([Nyambayar Turbat](https://github.com/nyamba))
+
+## [2.50.0](https://github.com/serverless/serverless/compare/v2.49.0...v2.50.0) (2021-07-01)
+
+### Features
+
+- **AWS Lambda:** Support `Fn::If` for `Principal.AWS` ([#9664](https://github.com/serverless/serverless/pull/9664)) ([894ac5b](https://github.com/serverless/serverless/commit/894ac5b6b67eb384dbc29b927161121679afce2d)) ([Piotr Grzesik](https://github.com/pgrzesik))
+- **AWS Deploy:** Deprecate `function` option in `deploy` command ([#9364](https://github.com/serverless/serverless/pull/9364)) ([d861d11](https://github.com/serverless/serverless/commit/d861d119ef94baaaa266934783e00a50182d7434)) ([Jaakko Lappalainen](https://github.com/jkklapp) & [Piotr Grzesik](https://github.com/pgrzesik))
+- **Variables:**
+  - Resolve vars in strings which are subject to be joined ([#9657](https://github.com/serverless/serverless/pull/9657)) ([0e3db01](https://github.com/serverless/serverless/commit/0e3db01db8aeb08b03a98dd7f58a09b66ec8c49e)) ([Mariusz Nowak](https://github.com/medikoo))
+  - Support `aws:region` and `aws:accountId` variables ([#9662](https://github.com/serverless/serverless/pull/9662)) ([33794ea](https://github.com/serverless/serverless/commit/33794ea504e714912137796009c29c802f2e24f0)) ([Piotr Grzesik](https://github.com/pgrzesik))
+  - Support variables across file address resolution ([#9657](https://github.com/serverless/serverless/pull/9657)) ([80b7640](https://github.com/serverless/serverless/commit/80b76406ac305ccb7e55cabd0bd39be6ac7c67c6)) ([Mariusz Nowak](https://github.com/medikoo))
+
+### Bug Fixes
+
+- **AWS Deploy:** Meaningfully report inaccessible file artifacts ([#9668](https://github.com/serverless/serverless/pull/9668)) ([23c290e](https://github.com/serverless/serverless/commit/23c290e4b4049242d62cfb57f4be6aadff6aecf8)) ([Mariusz Nowak](https://github.com/medikoo))
+- **AWS Local Invocation:** Fix error handling of invalid file content ([#9667](https://github.com/serverless/serverless/pull/9667)) ([e836722](https://github.com/serverless/serverless/commit/e836722f976af98eb69fc6d3a85781bb7434dfac)) ([Mariusz Nowak](https://github.com/medikoo))
+- **CLI Onboarding:**
+  - Do not attempt local fallback during onboarding ([#9660](https://github.com/serverless/serverless/pull/9660)) ([ae5be0f](https://github.com/serverless/serverless/commit/ae5be0f5dafaad933000e98142fcb1ec60e04555)) ([Piotr Grzesik](https://github.com/pgrzesik))
+  - Only call `handleError` if plugin defined ([#9659](https://github.com/serverless/serverless/pull/9659)) ([a80681f](https://github.com/serverless/serverless/commit/a80681ffbf23391cb31d34b8eecaef310d9599a3)) ([Piotr Grzesik](https://github.com/pgrzesik))
+
+### Maintenance Improvements
+
+- **Telemetry:**
+  - Include `commandUsage` in case of error ([#9671](https://github.com/serverless/serverless/pull/9671)) ([ac03d83](https://github.com/serverless/serverless/commit/ac03d832896eec26773e5ce06c22c249d240a9ed)) ([Piotr Grzesik](https://github.com/pgrzesik))
+  - Increase error location coverage ([#9669](https://github.com/serverless/serverless/pull/9669)) ([7264d16](https://github.com/serverless/serverless/commit/7264d1672e93fdb1046cf7ebe859b607c80e31ca)) ([Mariusz Nowak](https://github.com/medikoo))
+  - Report `configValidationMode` ([#9669](https://github.com/serverless/serverless/pull/9669)) ([8e2d48f](https://github.com/serverless/serverless/commit/8e2d48fee5a471a960b6a7b55cbd12edc5eb07e6)) ([Mariusz Nowak](https://github.com/medikoo))
+  - Report configuration validation result ([#9669](https://github.com/serverless/serverless/pull/9669)) ([01f1586](https://github.com/serverless/serverless/commit/01f158695b22d721320a77a9a0b68b166c63dc3f)) ([Mariusz Nowak](https://github.com/medikoo))
+
+### Templates
+
+- Adjust `runtime` for `openwhisk-python` template ([#9670](https://github.com/serverless/serverless/pull/9670)) ([6a020d1](https://github.com/serverless/serverless/commit/6a020d121ff2dacd6ad62a824964944ae391a662)) ([Piotr Grzesik](https://github.com/pgrzesik))
+
+## [2.49.0](https://github.com/serverless/serverless/compare/v2.48.1...v2.49.0) (2021-06-29)
+
+### Features
+
+- **AWS Lambda:** Support `Fn::FindInMap` for `vpc` config ([#9653](https://github.com/serverless/serverless/pull/9653)) ([34a9d91](https://github.com/serverless/serverless/commit/34a9d91870c36d154427830d3555425b5fd2d14c)) ([Piotr Grzesik](https://github.com/pgrzesik))
+- **CLI Onboarding:**
+  - Add deploy step ([#9536](https://github.com/serverless/serverless/pull/9536)) ([28a06a0](https://github.com/serverless/serverless/commit/28a06a05aba4306d2f28d26652067b44ed105151)) ([Piotr Grzesik](https://github.com/pgrzesik))
+  - Allow to setup Dashboard Provider credentials during onboarding ([#9509](https://github.com/serverless/serverless/pull/9509)) ([feb0421](https://github.com/serverless/serverless/commit/feb04219f6be186cc54462906394bbd82f9747b5)) ([Piotr Grzesik](https://github.com/pgrzesik))
+
+### Bug Fixes
+
+- **CLI:** Fix standalone detection on Windows ([#9648](https://github.com/serverless/serverless/pull/9648)) ([4bc8e2e](https://github.com/serverless/serverless/commit/4bc8e2e1944364e2c218cbfc05039c43afa9ab01)) ([Mariusz Nowak](https://github.com/medikoo))
+- **Packaging:** Fix artifact generation with temp path on other device ([#9616](https://github.com/serverless/serverless/issues/9616)) ([70fb8b9](https://github.com/serverless/serverless/commit/70fb8b986133789b38fad93c0abab01eaf9dc0c7)) ([Sean Dawson](https://github.com/NoxHarmonium))
+
+### Maintenance Improvements
+
+- Replace `fse.chmod` with `fs.promises.chmod` ([#9647](https://github.com/serverless/serverless/issues/9647)) ([83c7726](https://github.com/serverless/serverless/commit/83c772684d655b233522d1e75128476c29339c83)) ([Sudipto Das](https://github.com/sdas13))
+- Add `resolveRegion` util ([#9509](https://github.com/serverless/serverless/pull/9509)) ([98e3668](https://github.com/serverless/serverless/commit/98e3668a2cbb701c109e1ff8dd70a0ece1770f7b)) ([Piotr Grzesik](https://github.com/pgrzesik))
+- Add `resolveStage` util ([#9509](https://github.com/serverless/serverless/pull/9509)) ([09bb4fa](https://github.com/serverless/serverless/commit/09bb4fa12270807702dcc26483dbcb94cf733342)) ([Piotr Grzesik](https://github.com/pgrzesik))
+- **Telemetry:**
+  - Add `hasLocalCredentials` ([#9594](https://github.com/serverless/serverless/pull/9594)) ([5e0d805](https://github.com/serverless/serverless/commit/5e0d80579e857d016fb4db13288b9d81a3859ee1)) ([Piotr Grzesik](https://github.com/pgrzesik))
+  - Add interactive flow support ([#9594](https://github.com/serverless/serverless/pull/9594)) ([0eba2dc](https://github.com/serverless/serverless/commit/0eba2dcdfeabba58920462ac2cd54d86e3101e05)) ([Piotr Grzesik](https://github.com/pgrzesik))
+
+### Templates
+
+- Use `amd64` arch for `aws-go` template ([#9646](https://github.com/serverless/serverless/issues/9646)) ([cb9f7e2](https://github.com/serverless/serverless/commit/cb9f7e20eedc1db7bb31671c97449e269e992ded)) ([Andrey Kabylin](https://github.com/sysint64))
+
+### [2.48.1](https://github.com/serverless/serverless/compare/v2.48.0...v2.48.1) (2021-06-25)
+
+### Bug Fixes
+
+- **AWS API Gateway:** Ensure that `Method` resource depends on `Permission` resource ([#9609](https://github.com/serverless/serverless/pull/9609)) ([93b9027](https://github.com/serverless/serverless/commit/93b9027f0d48650df50d0a8352d0edaf2bd2e0da)) ([Nyambayar Turbat](https://github.com/nyamba))
+- **CLI:**
+  - Ensure to list version in case of fallback from some versions ([#9641](https://github.com/serverless/serverless/pull/9641)) ([989cb82](https://github.com/serverless/serverless/commit/989cb82db313177a64e062cc800eb85ba501fab5)) ([Mariusz Nowak](https://github.com/medikoo))
+  - Fix standalone detection (case of a fallback from standalone) ([#9641](https://github.com/serverless/serverless/pull/9641)) ([1681af4](https://github.com/serverless/serverless/commit/1681af4897eeec20c1d1af292f9bfde5b1e9ffc3)) ([Mariusz Nowak](https://github.com/medikoo))
+
+### Maintenance Improvements
+
+- **Config Schema:** Improve error message and documentation ([#9639](https://github.com/serverless/serverless/pull/9639)) ([a36247b](https://github.com/serverless/serverless/commit/a36247b7ac1212a27f5e8d671ba39ba4c7e4de18)) ([Mariusz Nowak](https://github.com/medikoo))
+- Replace `fse.rename` with `fs.promises.rename` ([#9605](https://github.com/serverless/serverless/issues/9605)) ([e6ff228](https://github.com/serverless/serverless/commit/e6ff2286a55d8cb8f82e58d8173b0a386a4b1767)) ([Sudipto Das](https://github.com/sdas13))
+
+## [2.48.0](https://github.com/serverless/serverless/compare/v2.47.0...v2.48.0) (2021-06-21)
+
+### Features
+
+- Introduce an opt-in "error" deprecation notification mode ([#9623](https://github.com/serverless/serverless/pull/9623)) ([c22a8b9](https://github.com/serverless/serverless/commit/c22a8b99f2f64a76c592e800a8cf698dbff75b9c)) ([Mariusz Nowak](https://github.com/medikoo))
+
+### Bug Fixes
+
+- **Packaging:** Do not report hashing deprecations for container lambdas ([#9623](https://github.com/serverless/serverless/pull/9623)) ([68c2a08](https://github.com/serverless/serverless/commit/68c2a084f91b58832bd5417efaaa3fd6a6178d53)) ([Mariusz Nowak](https://github.com/medikoo))
+- Ensure to support deprecation settings at early stage of processing ([#9623](https://github.com/serverless/serverless/pull/9623))([011e0ce](https://github.com/serverless/serverless/commit/011e0ce45cec4b1273268fcab4f99e377fae092e)) ([Mariusz Nowak](https://github.com/medikoo))
+
+### Maintenance Improvements
+
+- **Telemetry:** Recognize `constructs` ([#9628](https://github.com/serverless/serverless/pull/9628)) ([9e10cea](https://github.com/serverless/serverless/commit/9e10ceaf81e8b9d13867937fedc9502a1ff4e320)) ([Piotr Grzesik](https://github.com/pgrzesik))
+- Ensure early access to configuration in logDeprecation method ([#9623](https://github.com/serverless/serverless/pull/9623)) ([53b9762](https://github.com/serverless/serverless/commit/53b97621dccdef8f9f2e15e2f4f31045b46970e2)) ([Mariusz Nowak](https://github.com/medikoo))
+
+## [2.47.0](https://github.com/serverless/serverless/compare/v2.46.0...v2.47.0) (2021-06-18)
+
+### Features
+
+- Deprecate Node.js v10 ([#9600](https://github.com/serverless/serverless/issues/9600)) ([e24fdc9](https://github.com/serverless/serverless/commit/e24fdc9f08f9849aad4136261695e44476484b0d)) ([Milind Vaidya](https://github.com/vaidyamilind))
+- **AWS HTTP API:** Support `payload` version per function ([#9551](https://github.com/serverless/serverless/issues/9551)) ([87ce28e](https://github.com/serverless/serverless/commit/87ce28ee4ea0e975859b8d32be8f2edd824b4cda)) ([Nyambayar Turbat](https://github.com/nyamba))
+- **AWS S3:** Support CloudFormation instrinsic functions at `functions[].events[].s3.bucket` property ([#9617](https://github.com/serverless/serverless/issues/9617)) ([42690a7](https://github.com/serverless/serverless/commit/42690a7352751581a8dbd44a4f776af17ab20da8)) ([Piotr Grzesik](https://github.com/pgrzesik))
+
+### Bug Fixes
+
+- **AWS Cognito:** Fix user pool premission resource logical id normalization ([#9592](https://github.com/serverless/serverless/issues/9592)) ([f4c9b58](https://github.com/serverless/serverless/commit/f4c9b58b10a45ae342934e9a61dcdea0c2ef11e2)) ([arunkc](https://github.com/Arun-kc))
+- **AWS Invocation:** Fix resolution of options with non-AWS provider ([#9602](https://github.com/serverless/serverless/issues/9602)) ([54da80e](https://github.com/serverless/serverless/commit/54da80e26497b8f1dbcd3027775628d11e1c6814)) ([Corentin Doue](https://github.com/CorentinDoue))
+- **Variables:** Ensure to strip unrecognized legacy `ssm` resolver instructions ([#9601](https://github.com/serverless/serverless/issues/9601)) ([f61859f](https://github.com/serverless/serverless/commit/f61859fd25908b13b6d9638c550e88ef4a08392e)) ([Mariusz Nowak](https://github.com/medikoo))
+
+### Maintenance Improvements
+
+- **Variables:** Improve error message ([#9601](https://github.com/serverless/serverless/issues/9601)) ([4a732e2](https://github.com/serverless/serverless/commit/4a732e2ebf6c7d81f5e0fbdc2e9bcb4715e4cadf)) ([Mariusz Nowak](https://github.com/medikoo))
+
+### [2.46.0](https://github.com/serverless/serverless/compare/v2.45.2...v2.46.0) (2021-06-11)
+
+### Features
+
+- **CLI Onboarding:** Make it service setup specific, remove `auto-update` step ([#9582](https://github.com/serverless/serverless/pull/9582)) ([519f77e](https://github.com/serverless/serverless/commit/519f77e1a876cea62843a99e58bab1e011e62fa3)) ([Piotr Grzesik](https://github.com/pgrzesik))
+- **Config Schema:** Improve error messaging for same type variants ([#9588](https://github.com/serverless/serverless/pull/9588)) ([8ac249b](https://github.com/serverless/serverless/commit/8ac249b1eadf3173359e02886e71bb89234ebd51)) ([Mariusz Nowak](https://github.com/medikoo))
+- Show information on how to turn on auto updates in postinstall step ([#9582](https://github.com/serverless/serverless/pull/9582)) ([93c88c0](https://github.com/serverless/serverless/commit/93c88c0b8d1eea6455ca6ecb9a022f814f8e79b3)) ([Piotr Grzesik](https://github.com/pgrzesik))
+
+### Bug Fixes
+
+- **Variables:**
+  - Fix resolution visibility of top level properties (as `outputs`) ([#9591](https://github.com/serverless/serverless/pull/9591)) ([004c6e2](https://github.com/serverless/serverless/commit/004c6e26beec98fbfb757aab05f18a623a03cf76)) ([Mariusz Nowak](https://github.com/medikoo))
+  - Improve required properties resolution validation order ([#9591](https://github.com/serverless/serverless/pull/9591)) ([727d7f4](https://github.com/serverless/serverless/commit/727d7f4f089051223db88ceb85a62adabf07dc9e)) ([Mariusz Nowak](https://github.com/medikoo))
+  - Meaningfully report misuse of dashboard sources ([#9591](https://github.com/serverless/serverless/pull/9591)) ([cc09c62](https://github.com/serverless/serverless/commit/cc09c62301f15f89febc50120a7a398640935470)) ([Mariusz Nowak](https://github.com/medikoo))
+  - Recognize `tenant` setting (while deprecated it's still recognized by plugin) ([#9591](https://github.com/serverless/serverless/pull/9591)) ([aa45876](https://github.com/serverless/serverless/commit/aa4587604476314485a8094bdae04e0148b9e53c)) ([Mariusz Nowak](https://github.com/medikoo))
+
+### Maintenance Improvements
+
+- Reorganize and document service configuration dependencies ([#9591](https://github.com/serverless/serverless/pull/9591)) ([c86a76c](https://github.com/serverless/serverless/commit/c86a76cb60038765404c988da13dfc6ffde28fe6)) ([Mariusz Nowak](https://github.com/medikoo))
+- **Telemetry:** Optimise reported error location length:
+  - Remove eventual `/node_modules` prefix ([#9587](https://github.com/serverless/serverless/pull/9587)) ([f3ff6d2](https://github.com/serverless/serverless/commit/f3ff6d21758b61116c748746cefe8c1a3d6ab776)) ([Mariusz Nowak](https://github.com/medikoo))
+  - Replace repeated paths with `^` ([#9587](https://github.com/serverless/serverless/pull/9587)) ([f6a7d03](https://github.com/serverless/serverless/commit/f6a7d03b04bd13f91bc247e518a1ad12496ead8c)) ([Mariusz Nowak](https://github.com/medikoo))
+
+### [2.45.2](https://github.com/serverless/serverless/compare/v2.45.1...v2.45.2) (2021-06-09)
+
+### Bug Fixes
+
+- **Variables:**
+  - Skip unrecognized sources check with partial resolution ([#9579](https://github.com/serverless/serverless/pull/9579)) ([93b89fc](https://github.com/serverless/serverless/commit/93b89fcb51759d0fe938a40e7de76b6abd313efd)) ([Mariusz Nowak](https://github.com/medikoo))
+  - Ensure to report only unrecognized sources ([#9579](https://github.com/serverless/serverless/pull/9579)) ([98701f3](https://github.com/serverless/serverless/commit/98701f367907aa4c0ed61de7c3aeb4a7b7eac174)) ([Mariusz Nowak](https://github.com/medikoo))
+
+### [2.45.1](https://github.com/serverless/serverless/compare/v2.45.0...v2.45.1) (2021-06-08)
+
+### Bug Fixes
+
+- Fix `projectDir` pattern in config schema ([#9574](https://github.com/serverless/serverless/pull/9574)) ([8954b5f](https://github.com/serverless/serverless/commit/8954b5f9cc3e2431036ccb876c46fb8cc99dc0d9)) ([Mariusz Nowak](https://github.com/medikoo))
+
+## [2.45.0](https://github.com/serverless/serverless/compare/v2.44.0...v2.45.0) (2021-06-08)
+
+### Features
+
+- **Variables:** Allow to reference files in scope of a project directory ([#9561](https://github.com/serverless/serverless/pull/9561)) ([8dbb56e](https://github.com/serverless/serverless/commit/8dbb56ecbda2c6b8e8eaccbba7c7842ba8382847)) ([Mariusz Nowak](https://github.com/medikoo))
+- Introduce project directory setting, configurable via `projectDir` ([#9561](https://github.com/serverless/serverless/pull/9561)) ([d6e4b49](https://github.com/serverless/serverless/commit/d6e4b49ae28d5898d92b913a0d2c100bd29f4303)) ([Mariusz Nowak](https://github.com/medikoo))
+
+### Bug Fixes
+
+- **AWS API Gateway:** Don't create log group resource if access logs are disabled ([#9560](https://github.com/serverless/serverless/pull/9560)) ([a116dfe](https://github.com/serverless/serverless/commit/a116dfec22697dd0511623c6a1e6d2d829d4ba10)) ([Piotr Grzesik](https://github.com/pgrzesik))
+- **Templates:** Allow usage of `google-nodejs-typescript` template ([#9557](https://github.com/serverless/serverless/pull/9557)) ([accf5bd](https://github.com/serverless/serverless/commit/accf5bd082400f654eba5e7d322bcb205c9ae709)) ([Corentin Doue](https://github.com/CorentinDoue))
+
+### Maintenance Improvements
+
+- Upgrade `dotenv` to v10 ([#9569](https://github.com/serverless/serverless/pull/9569)) ([99d1697](https://github.com/serverless/serverless/commit/99d1697050ac2b2ca675794501c08230f2cc3f7b)) ([Mariusz Nowak](https://github.com/medikoo))
+
+## [2.44.0](https://github.com/serverless/serverless/compare/v2.43.1...v2.44.0) (2021-06-02)
+
+### Features
+
+- **CLI Onboarding:** Make it service setup specific:
+  - If not in service context, immediately go into project setup questions (skip "Do you want to create a new project" question) ([#9524](https://github.com/serverless/serverless/pull/9524)) ([d5e2baf](https://github.com/serverless/serverless/commit/d5e2baf714958c5718610659887f485f9bd161e4)) ([Piotr Grzesik](https://github.com/pgrzesik))
+  - Remove `tab-completion` from interactive flow ([#9531](https://github.com/serverless/serverless/pull/9531)) ([3bac0f3](https://github.com/serverless/serverless/commit/3bac0f37f0f23abed387f0952772e3cdf5d47320)) ([Piotr Grzesik](https://github.com/pgrzesik))
+
+### Bug Fixes
+
+- **Variables:**
+  - Unify error messaging for function resolvers ([#9545](https://github.com/serverless/serverless/pull/9545)) ([bb3b766](https://github.com/serverless/serverless/commit/bb3b766946311848c707abc0fc7e749393f4527c)) ([Mariusz Nowak](https://github.com/medikoo))
+  - Ensure to apply a resolution with a new resolver in case of a fallback to a local version ([#9544](https://github.com/serverless/serverless/pull/9544)) ([14a5275](https://github.com/serverless/serverless/commit/14a5275c0d6a127e211935b8b8f57a949e1ffad6)) ([Mariusz Nowak](https://github.com/medikoo))
+- **CLI:**
+  - Ensure to gently handle missing data from global installation in case of local fallback ([#9539](https://github.com/serverless/serverless/pull/9539)) ([1b90dfb](https://github.com/serverless/serverless/commit/1b90dfb0659dab3852ace330fd7c497321b80710)) ([Mariusz Nowak](https://github.com/medikoo))
+- Fix handling of numeric error codes coming from AWS SDK requests ([#9538](https://github.com/serverless/serverless/pull/9538)) ([f2cdbae](https://github.com/serverless/serverless/commit/f2cdbae1eb6d327935336a38deda099b8f5ffee2)) ([Mariusz Nowak](https://github.com/medikoo))
+
+### Maintenance Improvements
+
+- **Variables:**
+  - Cleanup handling of `variableSyntax` default ([#9544](https://github.com/serverless/serverless/pull/9544)) ([582d150](https://github.com/serverless/serverless/commit/582d150ceb01d3f597a30fcc82201ffa325c4617)) ([Mariusz Nowak](https://github.com/medikoo))
+  - Seclude resolution of sources from external plugins ([#9544](https://github.com/serverless/serverless/pull/9544)) ([6efc161](https://github.com/serverless/serverless/commit/6efc161e5f7892275c798f6003ea5ee557bf3b26)) ([Mariusz Nowak](https://github.com/medikoo))
+
+### [2.43.1](https://github.com/serverless/serverless/compare/v2.43.0...v2.43.1) (2021-05-25)
+
+### Bug Fixes
+
+- **AWS Local Invocation:** Fix invalid result handling ([#9507](https://github.com/serverless/serverless/pull/9507)) ([bbff029](https://github.com/serverless/serverless/commit/bbff0290db8a56cf599522c5ec0abc901359a0f9)) ([Mariusz Nowak](https://github.com/medikoo))
+- **Telemetry:** Ensure to pass proper config for local fallback error handler ([#9519](https://github.com/serverless/serverless/pull/9519)) ([9b2a111](https://github.com/serverless/serverless/commit/9b2a1114850914a4ac96b19c7fcb0bf031822ea4)) ([Piotr Grzesik](https://github.com/pgrzesik))
+- **Variables:** Ensure proper resolution of AWS-related variables in case of errors ([#9518](https://github.com/serverless/serverless/pull/9518)) ([ee66585](https://github.com/serverless/serverless/commit/ee66585fdcfc32d135ed0cdc6bad8d440c7e9e38)) ([Piotr Grzesik](https://github.com/pgrzesik))
+
+### Maintenance Improvements
+
+- Use `download` from `@serverless/utils` ([#9513](https://github.com/serverless/serverless/pull/9513)) ([716b312](https://github.com/serverless/serverless/commit/716b31216e4873bbb986c5a2a54fda708a591cd1)) ([Piotr Grzesik](https://github.com/pgrzesik))
+- **CLI Onboarding:** Use "Starter" not "Empty" for templates ([#9514](https://github.com/serverless/serverless/pull/9514)) ([2984adb](https://github.com/serverless/serverless/commit/2984adb0456f7d6e93b0c778a1c588ee20459928)) ([Piotr Grzesik](https://github.com/pgrzesik))
+- **Telemetry:** Improve AWS stack error codes ([#9510](https://github.com/serverless/serverless/issues/9510)) ([c265905](https://github.com/serverless/serverless/commit/c265905f518f8cbea170c5a2774670c60de0e36c)) ([Mariusz Nowak](https://github.com/medikoo))
+
+## [2.43.0](https://github.com/serverless/serverless/compare/v2.42.0...v2.43.0) (2021-05-20)
+
+### Features
+
+- **CLI Onboarding:** In `service` step, if possible propose a default project name ([#9503](https://github.com/serverless/serverless/pull/9503)) ([dee54ed](https://github.com/serverless/serverless/commit/dee54ed55c0a0697eefdde99d5ec8aee321ce041)) ([Piotr Grzesik](https://github.com/pgrzesik))
+
+### Bug Fixes
+
+- **AWS Deploy:** Fix stack errors processing ([#9505](https://github.com/serverless/serverless/pull/9505)) ([18a9b2b](https://github.com/serverless/serverless/commit/18a9b2b6f5734083de751cf182c6be61736be11f)) ([Mariusz Nowak](https://github.com/medikoo))
+- **AWS IAM:** Do not depend on default execution role when custom role provided ([29f0e9c](https://github.com/serverless/serverless/commit/29f0e9c840e4b1ae9949925bc5a2a9d2de742271)) ([Piotr Grzesik](https://github.com/pgrzesik))
+
+### Maintenance Improvements
+
+- Do not recognize YAML Exception as user error ([#9505](https://github.com/serverless/serverless/pull/9505)) ([db16df2](https://github.com/serverless/serverless/commit/db16df2faad9cc63eb8e98ce90829642707546fb)) ([Mariusz Nowak](https://github.com/medikoo))
+- Do not rely on `serverless.yamlParser` ([#9505](https://github.com/serverless/serverless/pull/9505)) ([aa8f7be](https://github.com/serverless/serverless/commit/aa8f7bec1caed4211adcb87ad0a73cd796f065d5)) ([Mariusz Nowak](https://github.com/medikoo))
+- Ensure codes for user errors ([#9505](https://github.com/serverless/serverless/pull/9505)) ([6adaa9f](https://github.com/serverless/serverless/commit/6adaa9f56ed6e9708065767be602f484d0091679)) ([Mariusz Nowak](https://github.com/medikoo))
+
+## [2.42.0](https://github.com/serverless/serverless/compare/v2.41.2...v2.42.0) (2021-05-19)
+
+### Features
+
+- **CLI Onboarding:**
+  - Switch to templates hosted at [`serverless/examples`](https://github.com/serverless/examples/) ([#9484](https://github.com/serverless/serverless/pull/9484)) ([e4ea50d](https://github.com/serverless/serverless/commit/e4ea50d401628cb22612196b7e9b50c4344dab8a)) ([Piotr Grzesik](https://github.com/pgrzesik))
+  - Support `--name` CLI option for `service` step ([#9471](https://github.com/serverless/serverless/pull/9471)) ([53575dc](https://github.com/serverless/serverless/commit/53575dc36017ded5ff60e5edf18fb7a9fd9d30e9)) ([Piotr Grzesik](https://github.com/pgrzesik))
+  - Support `template-path` CLI option for `service` step ([#9471](https://github.com/serverless/serverless/pull/9471)) ([98c9700](https://github.com/serverless/serverless/commit/98c9700bcda328552f04116a51549f66e3d7b026)) ([Piotr Grzesik](https://github.com/pgrzesik))
+  - Support `template` and `template-url` options for `service` step ([#9495](https://github.com/serverless/serverless/pull/9495)) ([f1a288c](https://github.com/serverless/serverless/commit/f1a288ce2c30e1377d8b411a90db3b1b2857d4fb)) ([Piotr Grzesik](https://github.com/pgrzesik))
+
+### Bug Fixes
+
+- **AWS API Gateway:** Fix schema for `apiKeys` and `permissionsBoundary` ([#9489](https://github.com/serverless/serverless/pull/9489)) ([5601025](https://github.com/serverless/serverless/commit/5601025dd8a4075cb463e2dcfb67d6c52984582a)) ([lyndoh](https://github.com/lyndoh))
+- **AWS Local Invocation:** Report invalid handler path meaningfully ([#9499](https://github.com/serverless/serverless/pull/9499)) ([a2297ee](https://github.com/serverless/serverless/commit/a2297ee916dd79463d4efcfd6f7fe1f8e0e50d87)) ([Mariusz Nowak](https://github.com/medikoo))
+- **Variables:**
+  - Fix reporting of variable resolution errors trigger by variable resolution made in JS function resolvers ([#9482](https://github.com/serverless/serverless/pull/9482)) ([f6b7cfa](https://github.com/serverless/serverless/commit/f6b7cfaaaff81b84011f0f6168a651979089e1c9)) ([Mariusz Nowak](https://github.com/medikoo))
+  - Ensure report user error as user error ([#9499](https://github.com/serverless/serverless/pull/9499)) ([a8f4aeb](https://github.com/serverless/serverless/commit/a8f4aebe5d482a491d86d3427b259db00674cc72)) ([Mariusz Nowak](https://github.com/medikoo))
+- Expose remote lambda invocation failure as user error (([#9499](https://github.com/serverless/serverless/pull/9499)) [8f3d4e4](https://github.com/serverless/serverless/commit/8f3d4e4bdb1df1e107c5113d013164a2396f0f64)) ([Mariusz Nowak](https://github.com/medikoo))
+- Expose template error with user error ([#9499](https://github.com/serverless/serverless/pull/9499)) ([07b60a6](https://github.com/serverless/serverless/commit/07b60a6bb42796e6f060730ce4bf22762942b0b8)) ([Mariusz Nowak](https://github.com/medikoo))
+- Construct user errors with `ServerlessError` ([#9499](https://github.com/serverless/serverless/pull/9499)) ([c563581](https://github.com/serverless/serverless/commit/c563581ac98764edf653c1a5337d1b7d2b61ea63)) ([Mariusz Nowak](https://github.com/medikoo))
+- Do not stumble on missing resource properties ([#9499](https://github.com/serverless/serverless/pull/9499)) ([f87aee2](https://github.com/serverless/serverless/commit/f87aee268dd19f9b90a7018032c77454d2084f12)) ([Mariusz Nowak](https://github.com/medikoo))
+
+### Maintenance Improvements
+
+- **Telemetry:**
+  - Report resource types for user configured resources at `resources.Resources` ([#9501](https://github.com/serverless/serverless/pull/9501)) ([8d0ff07](https://github.com/serverless/serverless/commit/8d0ff078f7f0b565c1d35af1319f76a407afeb4b)) ([Mariusz Nowak](https://github.com/medikoo))
+  - Normalize AWS request error codes ([#9499](https://github.com/serverless/serverless/pull/9499)) ([5a23931](https://github.com/serverless/serverless/commit/5a23931734ee80b80182008197c92985975f1646)) ([Mariusz Nowak](https://github.com/medikoo))
+  - Report error location for non-normative error codes ([#9499](https://github.com/serverless/serverless/pull/9499)) ([07d5b9c](https://github.com/serverless/serverless/commit/07d5b9c19e9f5365af322a4862b03ccdca05655c)) ([Mariusz Nowak](https://github.com/medikoo))
+  - Remove dead path error handling ([#9499](https://github.com/serverless/serverless/pull/9499)) ([91b10ed](https://github.com/serverless/serverless/commit/91b10ed208f2dee4b690df633f4275f658355044)) ([Mariusz Nowak](https://github.com/medikoo))
+  - Improve granularity of stack deployment error codes ([#9499](https://github.com/serverless/serverless/pull/9499)) ([a6f4dc3](https://github.com/serverless/serverless/commit/a6f4dc3b2be2aa9ba2255d57cf9a9d23eae02994)) ([Mariusz Nowak](https://github.com/medikoo))
+- **CLI Onboarding:** Add `history` and `stepHistory` to `context` ([#9481](https://github.com/serverless/serverless/pull/9481)) ([9eea885](https://github.com/serverless/serverless/commit/9eea885b390fc88bb62c1e2a5c3d108444139703)) ([Piotr Grzesik](https://github.com/pgrzesik))
+- Add `create-from-local-template` util ([#9471](https://github.com/serverless/serverless/pull/9471)) ([03011ba](https://github.com/serverless/serverless/commit/03011baf07d262a5b9702b34b75a997e3f525d28)) ([Piotr Grzesik](https://github.com/pgrzesik))
+- Ensure to propagate as is stack monitoring error ([#9499](https://github.com/serverless/serverless/pull/9499)) ([a46abe3](https://github.com/serverless/serverless/commit/a46abe3d56cd667ad436fbceb283dd9e0f747d7b)) ([Mariusz Nowak](https://github.com/medikoo))
+
+## [2.41.2](https://github.com/serverless/serverless/compare/v2.41.1...v2.41.2) (2021-05-13)
+
+### Bug Fixes
+
+- **CLI:**
+  - In error handler fallback to local version only if we're not in its context (fix infinite recursion issue which put `serverless` process on stall) ([#9472](https://github.com/serverless/serverless/pull/9472)) ([7047c34](https://github.com/serverless/serverless/commit/7047c349299ea829b0d43efedd191782dad10219)) ([Mariusz Nowak](https://github.com/medikoo))
+  - Ensure resolved CLI params are correct in local fallback ([#9472](https://github.com/serverless/serverless/pull/9472)) ([65a1f38](https://github.com/serverless/serverless/commit/65a1f3875cda7f06d3ab47f21362a630d7d0415f)) ([Mariusz Nowak](https://github.com/medikoo))
+- **Telemetry:** If global & local fallback versions are recent enough to report outcome, report with global ([#9472](https://github.com/serverless/serverless/pull/9472)) ([eeddf9f](https://github.com/serverless/serverless/commit/eeddf9f518612f6f7ef805eb3ed9b13fb3036114)) ([Mariusz Nowak](https://github.com/medikoo))
+
+### Templates
+
+- **Templates:** Add `google-nodejs-typescript` template ([#9445](https://github.com/serverless/serverless/issues/9445)) ([9cc05ad](https://github.com/serverless/serverless/commit/9cc05ad2f659709746d1df9811b95118c583db27)) ([Corentin Doue](https://github.com/CorentinDoue))
+
+### Maintenance Improvements
+
+- **CLI Onboarding:**
+  - Seclude from internal Framework logic ([#9410](https://github.com/serverless/serverless/pull/9410)) ([7864f4d](https://github.com/serverless/serverless/commit/7864f4d28d4c4ed8325e64c8dfca891845edf392)) ([Mariusz Nowak](https://github.com/medikoo))
+  - Integrate steps from dashboard plugin ([#9410](https://github.com/serverless/serverless/pull/9410)) ([105807a](https://github.com/serverless/serverless/commit/105807a674820f2d8501f3b8539c3725fceab215)) ([Mariusz Nowak](https://github.com/medikoo))
+  - Refactor to async/await ([#9410](https://github.com/serverless/serverless/pull/9410)) ([1060d14](https://github.com/serverless/serverless/commit/1060d1468ba587519df482e95a54bbc8d199cad8)) ([Mariusz Nowak](https://github.com/medikoo))
+  - Simplify tabcompletion support check ([#9410](https://github.com/serverless/serverless/pull/9410)) ([c13586e](https://github.com/serverless/serverless/commit/c13586ee23614da75d71f40ff24037b9aad46c2c)) ([Mariusz Nowak](https://github.com/medikoo))
+- **Telemetry:** Make `generatePayload` `serverless` independent ([#9410](https://github.com/serverless/serverless/pull/9410)) ([4f6a50a](https://github.com/serverless/serverless/commit/4f6a50a2e145e664405b00661d801b6ad094f418)) ([Mariusz Nowak](https://github.com/medikoo))
+- **CLI:** Rely internally on `@serverless/utils/log` ([#9410](https://github.com/serverless/serverless/pull/9410)) ([05588f7](https://github.com/serverless/serverless/commit/05588f77c0bbc900198ce458099ea2db066f3601)) ([Mariusz Nowak](https://github.com/medikoo))
+- Refactor `isNpmPackageWritable` to not depend on `serverless` ([b915cc4](https://github.com/serverless/serverless/commit/b915cc467183d146785466965abbe318c349f0c9)) ([Mariusz Nowak](https://github.com/medikoo))
+
+### [2.41.1](https://github.com/serverless/serverless/compare/v2.41.0...v2.41.1) (2021-05-11)
+
+### Bug Fixes
+
+- **CLI:** Correctly resolve version during local fallback ([#9463](https://github.com/serverless/serverless/pull/9463)) ([bbfe742](https://github.com/serverless/serverless/commit/bbfe742b2458f31254b11128b8ed506a47293abe)) ([Piotr Grzesik](https://github.com/pgrzesik))
+
+## [2.41.0](https://github.com/serverless/serverless/compare/v2.40.0...v2.41.0) (2021-05-11)
+
+### Features
+
+- **AWS API Gateway:** Support disabling default endpoint ([#9404](https://github.com/serverless/serverless/issues/9404)) ([ec90945](https://github.com/serverless/serverless/commit/ec909452b5167e05d892d2c44bc46b4ff7d7470a)) ([lyndoh](https://github.com/lyndoh))
+- **AWS Lambda:** Deprecate `nodejs12.x` as default runtime ([#9416](https://github.com/serverless/serverless/issues/9416)) ([9e558ee](https://github.com/serverless/serverless/commit/9e558eefd66e9dafcb16b3636b934d753ade001e)) ([Jaakko Lappalainen](https://github.com/jkklapp))
+
+### Bug Fixes
+
+- **AWS API Gateway:** Support `Fn::Split` for `vpcEndpointIds` schema ([#9455](https://github.com/serverless/serverless/pull/9455)) ([56f8587](https://github.com/serverless/serverless/commit/56f85874c6b9da44b8fbc326dfe3bce33bf8c41e)) ([Piotr Grzesik](https://github.com/pgrzesik))
+- **AWS Lambda:** Ensure that docker image is build and pushed only once ([#9446](https://github.com/serverless/serverless/pull/9446)) ([277f4e8](https://github.com/serverless/serverless/commit/277f4e8e9c53c0572981407eb45cecba050462a7)) ([Piotr Grzesik](https://github.com/pgrzesik))
+- **CLI:**
+  - Ensure to report only unrecognized sources as unrecognized ([#9449](https://github.com/serverless/serverless/pull/9449)) ([27e21e8](https://github.com/serverless/serverless/commit/27e21e8fca560732df3fa5c36c56682ef89b53c5)) ([Mariusz Nowak](https://github.com/medikoo))
+  - Fix local installation fallback ([#9454](https://github.com/serverless/serverless/pull/9454)) ([fa8c076](https://github.com/serverless/serverless/commit/fa8c076c564377ec632992a6a156bc4937ec08e1)) ([Mariusz Nowak](https://github.com/medikoo))
+- **Packaging:** Fix support of the artifact S3 uri with region ([#9411](https://github.com/serverless/serverless/issues/9411)) ([40e56fc](https://github.com/serverless/serverless/commit/40e56fc0e9f71f06068d7d4c30178db8b2260357)) ([Zach Whaley](https://github.com/zachwhaley))
+
+### Maintenance Improvements
+
+- **Telemetry:**
+  - Ensure telemetry only matches js stacktrace paths ([#9447](https://github.com/serverless/serverless/pull/9447)) ([7361e04](https://github.com/serverless/serverless/commit/7361e049608d40e4199c797abbad552ea831f5a5)) ([Piotr Grzesik](https://github.com/pgrzesik))
+  - For local fallback ensure to report locally used version ([#9454](https://github.com/serverless/serverless/pull/9454)) ([096ed96](https://github.com/serverless/serverless/commit/096ed9652bff399965c81c9aedb93b42c2b8caf5)) ([Mariusz Nowak](https://github.com/medikoo))
+  - Let old versions report telemetry old way ([#9454](https://github.com/serverless/serverless/pull/9454)) ([4d077d1](https://github.com/serverless/serverless/commit/4d077d1653fcc41e362587e5d13dfa8dd43d3bc3)) ([Mariusz Nowak](https://github.com/medikoo))
+
+## [2.40.0](https://github.com/serverless/serverless/compare/v2.39.2...v2.40.0) (2021-05-06)
+
+### Features
+
+- **AWS Lambda:** Add `ecr.scanOnPush` configuration option ([#9379](https://github.com/serverless/serverless/issues/9379)) ([078ec59](https://github.com/serverless/serverless/commit/078ec59058e1c37bd81388c7e81087b48fc2ba24)) ([Nicholas Wehr](https://github.com/wwwehr))
+
+### Bug Fixes
+
+- **CLI:** Do not validate command when falling back to old version ([#9437](https://github.com/serverless/serverless/pull/9437)) ([9624338](https://github.com/serverless/serverless/commit/962433864ff4f52bf178b7afc1b6e54e58e58702)) ([Mariusz Nowak](https://github.com/medikoo))
+
+### [2.39.2](https://github.com/serverless/serverless/compare/v2.39.1...v2.39.2) (2021-05-04)
+
+### Bug Fixes
+
+- **CLI:**
+  - Fix internal command resolution in case of a fallback to local version from older global version ([#9429](https://github.com/serverless/serverless/pull/9429)) ([b7a113d](https://github.com/serverless/serverless/commit/b7a113d48d634f89a91a31cd05b8d2e57f540c77)) ([Mariusz Nowak](https://github.com/medikoo))
+  - Ensure to support `disableDeprecations` setting when validating not supported options ([#9429](https://github.com/serverless/serverless/pull/9429)) ([da476ad](https://github.com/serverless/serverless/commit/da476ad7ac52b331ae47102e01a9270a18b40833)) ([Mariusz Nowak](https://github.com/medikoo))
+- **Telemetry:**
+  - Do not attempt to report unrecognized commands ([#9427](https://github.com/serverless/serverless/pull/9427)) ([2c2c77f](https://github.com/serverless/serverless/commit/2c2c77f90518e73921b0f4dd02767b5ad4476db4)) ([Piotr Grzesik](https://github.com/pgrzesik))
+  - Do not share telemetry cache folder with old versions ([#9429](https://github.com/serverless/serverless/pull/9429)) ([ae9442e](https://github.com/serverless/serverless/commit/ae9442e53b04648ff5b9c436ef86765d2ad9d872)) ([Mariusz Nowak](https://github.com/medikoo))
+- **AWS Deploy:** Fix changes detection when VPC with intrinsic CF functions is involved ([#9425](https://github.com/serverless/serverless/pull/9425)) ([2c7f024](https://github.com/serverless/serverless/commit/2c7f024a57dd70c0e05d6ab7f40e530c96f2351a)) ([Piotr Grzesik](https://github.com/pgrzesik))
+- Fix `provider.vpc` configuration schema ([#9425](https://github.com/serverless/serverless/pull/9)) ([7338358](https://github.com/serverless/serverless/commit/7338358126ac249374e341b7b19ce83582ecff1d)) ([Piotr Grzesik](https://github.com/pgrzesik))
+
+### [2.39.1](https://github.com/serverless/serverless/compare/v2.39.0...v2.39.1) (2021-05-03)
+
+### Bug Fixes
+
+- **AWS HTTP API:** Ensure to apply tags to stage ([#9407](https://github.com/serverless/serverless/issues/9407)) ([80511a4](https://github.com/serverless/serverless/commit/80511a4b17e77e22cf8b20d1ce50eef7506d4f7f)) ([Filip Golonka](https://github.com/filipgolonka))
+
+### Maintenance Improvements
+
+- **Telemetry:**
+  - Handle error locations not enclosed in parens ([#9419](https://github.com/serverless/serverless/pull/9419)) ([3ab0628](https://github.com/serverless/serverless/commit/3ab06282fdc9455f364fd73bd14761bae0c8d289)) ([Piotr Grzesik](https://github.com/pgrzesik))
+  - Properly resolve location when for only relative paths ([#9418](https://github.com/serverless/serverless/issues/9418)) ([3ccf6a3](https://github.com/serverless/serverless/commit/3ccf6a3af3de093fabfa33a966b7a0a922712845)) ([Piotr Grzesik](https://github.com/pgrzesik))
+  - Split stack lines properly on all OS-es ([#9419](https://github.com/serverless/serverless/pull/9419)) ([bdbf154](https://github.com/serverless/serverless/commit/bdbf154c97abde6ad2ff807dbea3ad1110ee5fec)) ([Piotr Grzesik](https://github.com/pgrzesik))
+
+## [2.39.0](https://github.com/serverless/serverless/compare/v2.38.0...v2.39.0) (2021-04-30)
+
+### Features
+
+- **AWS IAM:** Support `provider.iam.role.path` ([#9363](https://github.com/serverless/serverless/issues/9363)) ([c8adc0c](https://github.com/serverless/serverless/commit/c8adc0c796a6558c3fe1bc86e3647d3fe711a9ad)) ([Android3000](https://github.com/Android3000))
+- **Variables:** Expose variable resolver function to variable sources ([#9368](https://github.com/serverless/serverless/pull/9368)) ([2ff58b1](https://github.com/serverless/serverless/commit/2ff58b16bf3fe766685d5b6c30fd9a2bb6e22f0f)) ([Mariusz Nowak](https://github.com/medikoo))
+
+### Bug Fixes
+
+- **AWS API Gateway:** Ensure unique name for request validator ([#9382](https://github.com/serverless/serverless/pull/9382)) ([a05e88d](https://github.com/serverless/serverless/commit/a05e88d92e010ddfe019d5b5b873547b7d187d6d)) ([Piotr Grzesik](https://github.com/pgrzesik))
+- **AWS S3:** Fix parsing of the artifact S3 url ([#9380](https://github.com/serverless/serverless/issues/9380)) ([360925d](https://github.com/serverless/serverless/commit/360925d2e0cddb6fbbbb72ca47495aa71a43d1fc)) ([Stephen](https://github.com/bishtawi))
+- **CLI:** Ensure no general help is listed under interactive setup help ([#9406](https://github.com/serverless/serverless/pull/9406)) ([132c830](https://github.com/serverless/serverless/commit/132c830b0a86998efbae1b4984dc9cea85957d61)) ([Mariusz Nowak](https://github.com/medikoo))
+
+### Maintenance Improvements
+
+- **Telemetry:**
+  - Report failures via telemetry ([#9396](https://github.com/serverless/serverless/pull/9396)) ([5861d08](https://github.com/serverless/serverless/commit/5861d08768a06e2e88609d0785ce590d3f693683)) ([Piotr Grzesik](https://github.com/pgrzesik))
+  - Ensure that container commands do not trigger telemetry ([#9397](https://github.com/serverless/serverless/pull/9397)) ([85b9e53](https://github.com/serverless/serverless/commit/85b9e5319df48904664f966e988cc725116ce865)) ([Mariusz Nowak](https://github.com/medikoo))
+  - Add `commandDurationMs` to payload ([#9401](https://github.com/serverless/serverless/pull/9401)) ([d647125](https://github.com/serverless/serverless/commit/d647125ff5daa07972675fd28690d42746ab223b)) ([Piotr Grzesik](https://github.com/pgrzesik))
+  - Add `commandOptionNames` to payload ([#9387](https://github.com/serverless/serverless/pull/9387)) ([f5b2b9b](https://github.com/serverless/serverless/commit/f5b2b9be395c9c2d3de4c4f91f991276bc22dc33)) ([Piotr Grzesik](https://github.com/pgrzesik))
+- Ensure `code` to `ServerlessError` instances ([#9357](https://github.com/serverless/serverless/pull/9357)) ([822a7cf](https://github.com/serverless/serverless/commit/822a7cf9f527514b53fd8cfc5c172ec5dc53f4ce)) ([Piotr Grzesik](https://github.com/pgrzesik))
+
+### Templates
+
+- Update dependencies for `cloudflare` template ([#9373](https://github.com/serverless/serverless/issues/9373)) ([543423d](https://github.com/serverless/serverless/commit/543423d869ba35c6866506bb49a8642700214b3a)) ([YErii](https://github.com/YEriin))
+
+## [2.38.0](https://github.com/serverless/serverless/compare/v2.37.2...v2.38.0) (2021-04-23)
+
+### Features
+
+- **AWS CloudFormation:** Add default export names to outputs ([#9313](https://github.com/serverless/serverless/issues/9313)) ([7e139bb](https://github.com/serverless/serverless/commit/7e139bb0136e0d053f4f6f8cb2876480bb2a485e)) ([Joseph Cha](https://github.com/js-cha))
+
+### Bug Fixes
+
+- **AWS API Gateway:** Create one request validator and reuse ([#9319](https://github.com/serverless/serverless/issues/9319)) ([154351f](https://github.com/serverless/serverless/commit/154351f1a5925a745873895014ed31f03b2842b3)) ([Jacques](https://github.com/gambit66))
+- **Variables:** Fix unresolved sources notifications ([#9356](https://github.com/serverless/serverless/issues/9356)) ([53a7872](https://github.com/serverless/serverless/commit/53a7872f78f51938b409925e052d34f2dc85abbd)) ([Mariusz Nowak](https://github.com/medikoo))
+
 ### [2.37.2](https://github.com/serverless/serverless/compare/v2.37.1...v2.37.2) (2021-04-22)
 
 ### Bug Fixes
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index dcbefafe5e2..ba091cac71d 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -99,6 +99,10 @@ Log should be written only if deprecated functionality is used. If applicable (t
 
 2. Document introduced deprecation at `docs/deprecations.md` (new deprecation should be listed as **first** and follow the format of other documented deprecations)
 
+### Service configuration validation
+
+All newly introduced configuration properties should be covered by proper changes to configuration schema. For more details about configuration validation, please see [docs/configuration-validation](./docs/configuration-validation.md).
+
 # Testing
 
 See [test/README](test/README.md)
diff --git a/README.md b/README.md
index 4b472cde0a4..04fbb2a067e 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,4 @@
-⚡ **Serverless Inc. is hiring to build the next generation of serverless development tools, [join us!](https://www.serverless.com/company/jobs/)**
-
----
-
-[![Serverless Application Framework AWS Lambda API Gateway](https://s3.amazonaws.com/assets.github.serverless/readme-serverless-framework.gif)](http://serverless.com)
+[![Serverless Application Framework AWS Lambda API Gateway](https://s3.amazonaws.com/assets.github.serverless/readme-serverless-framework.gif)](https://serverless.com)
 
 [![serverless](http://public.serverless.com/badges/v3.svg)](http://www.serverless.com)
 [![Build Status](https://github.com/serverless/serverless/workflows/Integrate/badge.svg)](https://github.com/serverless/serverless/actions?query=workflow%3AIntegrate)
@@ -12,66 +8,60 @@
 [![Known Vulnerabilities](https://snyk.io/test/github/serverless/serverless/badge.svg)](https://snyk.io/test/github/serverless/serverless)
 [![license](https://img.shields.io/npm/l/serverless.svg)](https://www.npmjs.com/package/serverless)
 
-<p align="center">
-  <span>English</span> |
-  <a href="./README_CN.md">简体中文</a>
-</p>
-
-[Website](http://www.serverless.com) • [Docs](https://serverless.com/framework/docs/) • [Newsletter](https://serverless.com/subscribe/) • [Swag](https://teespring.com/stores/serverless) • [Gitter](https://gitter.im/serverless/serverless) • [Forum](http://forum.serverless.com) • [Meetups](https://www.meetup.com/pro/serverless/) • [Twitter](https://twitter.com/goserverless) • [We're Hiring](https://serverless.com/company/jobs/)
+[Website](http://www.serverless.com) • [Docs](https://serverless.com/framework/docs/) • [Community Slack](https://join.slack.com/t/serverless-contrib/shared_invite/zt-d5qzowja-pnOerTzAIZUrN18hWYUIHA) • [Forum](http://forum.serverless.com) • [Twitter](https://twitter.com/goserverless) • [Meetups](https://www.meetup.com/pro/serverless/) • [We're Hiring](https://serverless.com/company/jobs/) • [简体中文](./README_CN.md)
 
-**The Serverless Framework** – Build applications comprised of microservices that run in response to events, auto-scale for you, and only charge you when they run. This lowers the total cost of maintaining your apps, enabling you to build more logic, faster.
+**The Serverless Framework** – Build applications on AWS Lambda and other next-gen cloud services, that auto-scale and only charge you when they run. This lowers the total cost of running and operating your apps, enabling you to build more and manage less.
 
-The Framework uses new event-driven compute services, like AWS Lambda, Google Cloud Functions, and more. It's a command-line tool, providing scaffolding, workflow automation and best practices for developing and deploying your serverless architecture. It's also completely extensible via plugins.
+The Serverless Framework is a command-line tool that uses easy and approachable YAML syntax to deploy both your code and cloud infrastructure needed to make tons of serverless application use-cases. It's a multi-language framework that supports Node.js, Typescript, Python, Go, Java, and more. It's also completely extensible via over 1,000 plugins that can add more serverless use-cases and workflows to the Framework.
 
-Check out the [Serverless Framework Dashboard](https://app.serverless.com) for monitoring, troubleshooting, ci/cd and more features for serverless teams.
-
-Serverless is actively maintained by [Serverless Inc](https://www.serverless.com).
+Actively maintained by [Serverless Inc](https://www.serverless.com).
 
 ## Contents
 
-<img align="right" width="400" src="https://s3-us-west-2.amazonaws.com/assets.site.serverless.com/email/sls-getting-started.gif" />
-
 - [Quick Start](#quick-start)
 - [Examples](https://github.com/serverless/examples)
-- [Services](#services)
 - [Features](#features)
 - [Plugins](https://github.com/serverless/plugins)
 - [Contributing](#contributing)
 - [Community](#community)
-- [Consultants](#consultants)
 - [Licensing](#licensing)
 - [Previous Version 0.5.x](#v.5)
 
 ## <a name="quick-start"></a>Quick Start
 
-1. **Install via npm:**
+### Install Via NPM:
 
 ```bash
 npm install -g serverless
 ```
 
-2. **Set-up your [Provider Credentials](./docs/providers/aws/guide/credentials.md)**. [Watch the video on setting up credentials](https://youtu.be/VUKDRoUdMek)
+### Set Up Your AWS Account Credentials:
+
+The Serverless Framework deploys to your own AWS account. You'll need to enable Serverless Framework to deploy to your AWS account by giving it access. [Here is a guide to help you set up your credentials securely](https://www.serverless.com/framework/docs/providers/aws/guide/credentials)
 
-3. **Create a Service:**
+### Create A Service:
 
-You can create a new service or [install existing services](#how-to-install-a-service).
+A "Service" is the Framework's project or app concept. You can create one from scratch or select an existing template by running.
 
 ```bash
-# Create a new Serverless Service/Project
-serverless create --template aws-nodejs --path my-service
-# Change into the newly created directory
-cd my-service
+serverless
 ```
 
-4. **Deploy a Service:**
+Go through the onboarding flow and then navigate into the newly created directory.
+
+```bash
+cd my-new-service
+```
+
+### Deploy A Service:
 
 Use this when you have made changes to your Functions, Events or Resources in `serverless.yml` or you simply want to deploy all changes within your Service at the same time.
 
 ```bash
-serverless deploy -v
+serverless deploy
 ```
 
-5. **Deploy the Function:**
+### Deploy A Function:
 
 Use this to quickly upload and overwrite your AWS Lambda code on AWS, allowing you to develop faster.
 
@@ -79,7 +69,7 @@ Use this to quickly upload and overwrite your AWS Lambda code on AWS, allowing y
 serverless deploy function -f hello
 ```
 
-6. **Invoke the Function on AWS:**
+### Invoke The Function On AWS:
 
 Invokes an AWS Lambda Function on AWS and returns logs.
 
@@ -87,7 +77,7 @@ Invokes an AWS Lambda Function on AWS and returns logs.
 serverless invoke -f hello -l
 ```
 
-7. **Invoke the Function on your machine:**
+### Invoke The Function Locally:
 
 Invokes an AWS Lambda Function on your local machine and returns logs.
 
@@ -95,7 +85,7 @@ Invokes an AWS Lambda Function on your local machine and returns logs.
 serverless invoke local -f hello -l
 ```
 
-8. **Fetch the Function Logs:**
+### Stream Function Logs:
 
 Open up a separate tab in your console and stream all logs for a specific Function using this command.
 
@@ -103,7 +93,7 @@ Open up a separate tab in your console and stream all logs for a specific Functi
 serverless logs -f hello -t
 ```
 
-9. **Remove the Service:**
+### Remove The Service:
 
 Removes all Functions, Events and Resources from your AWS account.
 
@@ -111,46 +101,6 @@ Removes all Functions, Events and Resources from your AWS account.
 serverless remove
 ```
 
-### How to Install a Service:
-
-This is a convenience method to install a pre-made Serverless Service locally by downloading the Github repo and unzipping it. Services are listed below.
-
-```bash
-serverless install -u https://github.com/your-url-to-the-serverless-service
-```
-
-Check out the [Serverless Framework Guide](./docs/providers/aws/guide/README.md) for more information.
-
-## <a name="services"></a>Services (V1.0)
-
-The following are services you can instantly install and use by running `serverless install --url <service-github-url>`
-
-- [serverless-examples](https://github.com/serverless/examples)
-- [CRUD](https://github.com/pmuens/serverless-crud) - CRUD service, [Scala Port](https://github.com/jahangirmohammed/serverless-crud-scala)
-- [CRUD with FaunaDB](https://github.com/faunadb/serverless-crud) - CRUD service using FaunaDB
-- [CRUD with S3](https://github.com/tscanlin/serverless-s3-crud) - CRUD service using S3
-- [CRUD with Flask and SQLAlchemy](https://github.com/jetbridge/sls-flask) - Python [CRUD API service](https://blog.jetbridge.com/framework/) with Flask, SQLAlchemy and Swagger
-- [GraphQL Boilerplate](https://github.com/serverless/serverless-graphql) - GraphQL application Boilerplate service
-- [Authentication](https://github.com/laardee/serverless-authentication-boilerplate) - Authentication boilerplate service
-- [Mailer](https://github.com/eahefnawy/serverless-mailer) - Service for sending emails
-- [Kinesis streams](https://github.com/pmuens/serverless-kinesis-streams) - Service to showcase Kinesis stream support
-- [DynamoDB streams](https://github.com/pmuens/serverless-dynamodb-streams) - Service to showcase DynamoDB stream support
-- [Landingpage backend](https://github.com/pmuens/serverless-landingpage-backend) - Landingpage backend service to store E-Mail addresses
-- [Facebook Messenger Chatbot](https://github.com/pmuens/serverless-facebook-messenger-bot) - Chatbot for the Facebook Messenger platform
-- [Lambda chaining](https://github.com/pmuens/serverless-lambda-chaining) - Service which chains Lambdas through SNS
-- [Secured API](https://github.com/pmuens/serverless-secured-api) - Service which exposes an API key accessible API
-- [Authorizer](https://github.com/eahefnawy/serverless-authorizer) - Service that uses API Gateway custom authorizers
-- [Thumbnails](https://github.com/eahefnawy/serverless-thumbnails) - Service that takes an image url and returns a 100x100 thumbnail
-- [Boilerplate](https://github.com/eahefnawy/serverless-boilerplate) - Opinionated boilerplate
-- [ES6 + Jest](https://github.com/americansystems/serverless-es6-jest) - ES6 + Jest Boilerplate
-- [PHP](https://github.com/ZeroSharp/serverless-php) - Call a PHP function from your lambda
-- [Ruby](https://github.com/stewartlord/serverless-ruby) - Call a Ruby function from your lambda
-- [Slack App](https://github.com/johnagan/serverless-slack-app) - Slack App Boilerplate with OAuth and Bot actions
-- [Swift](https://github.com/choefele/swift-lambda-app) - Full-featured project template to develop Lambda functions in Swift
-- [Cloudwatch Alerts on Slack](https://github.com/dav009/serverless-aws-alarms-notifier) - Get AWS Cloudwatch alerts notifications on Slack
-
-**Note**: the `serverless install` command will only work on V1.0 or later.
-
 ## <a name="features"></a>Features
 
 - Supports Node.js, Python, Java, Go, C#, Ruby, Swift, Kotlin, PHP, Scala, & F#
@@ -173,34 +123,14 @@ Check out our [help wanted](https://github.com/serverless/serverless/labels/help
 
 ## <a name="community"></a>Community
 
-- [Email Updates](http://eepurl.com/b8dv4P)
-- [Serverless Forum](http://forum.serverless.com)
+- [Twitter](https://twitter.com/goserverless)
+- [Community Slack](https://join.slack.com/t/serverless-contrib/shared_invite/zt-d5qzowja-pnOerTzAIZUrN18hWYUIHA)
 - [Gitter Chatroom](https://gitter.im/serverless/serverless)
 - [Serverless Meetups](http://www.meetup.com/serverless/)
 - [Stackoverflow](http://stackoverflow.com/questions/tagged/serverless-framework)
 - [Facebook](https://www.facebook.com/serverless)
-- [Twitter](https://twitter.com/goserverless)
 - [Contact Us](mailto:hello@serverless.com)
 
-## <a name="consultants"></a>Consultants
-
-We recommend the following professional services organizations who are experts in serverless development:
-
-- [Serverless Guru](https://serverlessguru.com/)
-- [Antstack](https://www.antstack.io/)
-- [Theodo](https://www.theodo.co.uk) - full stack teams passionate about Serverless that also run the Serverless Transformation Newsletter & Blog.
-- [null](https://null.tc/) - maintains [Bref](https://bref.sh/) to create serverless PHP applications
-- [Nordcloud](https://nordcloud.com) - they created [several plugins](https://github.com/nordcloud?utf8=%E2%9C%93&q=serverless&type=&language=), sponsor [Serverless Days Helsinki](https://helsinki.serverlessdays.io/) and regularly host [Serverless Finland](https://www.meetup.com/Serverless-Finland/) Meetups.
-- [API talent](http://www.apitalent.co.nz) - who also run [Serverless-Auckland Meetup](http://www.meetup.com/Serverless-Auckland)
-- [EPX Labs](http://www.epxlabs.com/) - runs [Serverless NYC Meetup](https://www.meetup.com/Serverless-NYC/)
-- [Seraro](http://www.seraro.com/) - Who also runs Atlanta Serverless Meetup (https://www.meetup.com/Atlanta-CABI-Camp-Cloud-AI-Blockchain-IOT) and Delhi Serverless Meetup (https://www.meetup.com/Delhi-NCR-Serverless-Architecture-Meetup/)
-- [superluminar](https://superluminar.io) - runs serverlessdays Hamburg and Serverless Meetup Hamburg
-- [JetBridge](https://jetbridge.com) - cloud-native and serverless application development services.
-
-If you'd like to be featured here, [please contact us](mailto:hello@serverless.com).
-
----
-
 ## <a name="licensing"></a>Licensing
 
 Serverless is licensed under the [MIT License](./LICENSE.txt).
@@ -209,6 +139,4 @@ All files located in the node_modules and external directories are externally ma
 
 # <a name="v.5"></a>Previous Serverless Version 0.5.x
 
-You can find projects and plugins relating to version 0.5 [here](./0.5.x-RESOURCES.md). Note that these are not compatible with v1.0 but we are working diligently on updating them. [Guide on building v1.0 plugins](./docs/providers/aws/guide/plugins.md).
-
 You can read the v0.5.x documentation at [readme.io](https://serverless.readme.io/v0.5.0/docs).
diff --git a/bin/serverless.js b/bin/serverless.js
index c7404e6d86e..57c58f7e4ba 100755
--- a/bin/serverless.js
+++ b/bin/serverless.js
@@ -1,43 +1,113 @@
 #!/usr/bin/env node
 
+// WARNING: Do not use syntax not supported by old Node.js versions (v4 lowest)
+// It's to ensure that users running those versions, see properly the error message
+// (as constructed below) instead of the syntax error
+
 'use strict';
 
+// `EvalError` is used to not pollute global namespace but still have the value accessible globally
+// Can already be set, if we're in context of local fallback
+const isMainModule = !EvalError.$serverlessCommandStartTime;
+if (isMainModule) EvalError.$serverlessCommandStartTime = process.hrtime();
+
 const nodeVersion = Number(process.version.split('.')[0].slice(1));
+const minimumSupportedVersion = 12;
 
-if (nodeVersion < 10) {
+if (nodeVersion < minimumSupportedVersion) {
   const serverlessVersion = Number(require('../package.json').version.split('.')[0]);
-  process.stdout.write(
-    `Serverless: \x1b[91mInitialization error: Node.js v${nodeVersion} is not supported by ` +
-      `Serverless Framework v${serverlessVersion}. Please upgrade\x1b[39m\n`
+  process.stderr.write(
+    `\x1b[91mError: Serverless Framework v${serverlessVersion} does not support ` +
+      `Node.js v${nodeVersion}. Please upgrade Node.js to the latest ` +
+      `LTS version (v${minimumSupportedVersion} is a minimum supported version)\x1b[39m\n`
   );
   process.exit(1);
 }
 
-if (require('../lib/utils/isStandaloneExecutable')) {
-  require('../lib/utils/standalone-patch');
-  if (process.argv[2] === 'binary-postinstall' && process.argv.length === 3) {
-    require('../scripts/postinstall');
-    return;
+if (isMainModule) {
+  if (require('../lib/utils/is-standalone-executable')) {
+    require('../lib/utils/standalone-patch');
+    if (process.argv[2] === 'binary-postinstall' && process.argv.length === 3) {
+      require('../scripts/postinstall');
+      return;
+    }
   }
-}
 
-// CLI Triage
-(() => {
-  try {
-    const componentsV1 = require('@serverless/cli');
-    const componentsV2 = require('@serverless/components');
+  const path = require('path');
+  const localInstallationPath = require('../lib/cli/local-serverless-path');
 
-    // Serverless Components v1 CLI (deprecated)
-    if (componentsV1.runningComponents()) return () => componentsV1.runComponents();
+  if (localInstallationPath && localInstallationPath !== path.dirname(__dirname)) {
+    // Local fallback
+    const localServerlessBinPath = (() => {
+      try {
+        return require.resolve(path.resolve(localInstallationPath, 'bin/serverless'));
+      } catch (ignore) {
+        // Unrecognized "serverless" installation, continue with this one
+        return null;
+      }
+    })();
 
-    // Serverless Components CLI
-    if (componentsV2.runningComponents()) return () => componentsV2.runComponents();
-  } catch (error) {
-    if (process.env.SLS_DEBUG) {
-      require('../lib/classes/Error').logWarning(`CLI triage crashed with: ${error.stack}`);
+    if (localServerlessBinPath) {
+      EvalError.$serverlessInitInstallationVersion = require('../package').version;
+      const colorSupportLevel = require('supports-color').stdout.level;
+      let message = 'Running "serverless" from node_modules\n';
+      if (colorSupportLevel) {
+        message =
+          colorSupportLevel > 2 ? `\x1b[38;5;145m${message}\x1b[39m` : `\x1b[90m${message}\x1b[39m`;
+      }
+      process.stderr.write(message);
+      require(localServerlessBinPath);
+      return;
     }
   }
+}
 
-  // Serverless Framework CLI
-  return () => require('../scripts/serverless');
-})()();
+require('../lib/cli/triage')().then((cliName) => {
+  switch (cliName) {
+    case 'serverless':
+      require('../scripts/serverless');
+      return;
+    case 'serverless-tencent':
+      require('../lib/cli/run-serverless-tencent')().catch((error) => {
+        // Expose eventual resolution error as regular crash, and not unhandled rejection
+        process.nextTick(() => {
+          throw error;
+        });
+      });
+      return;
+    case '@serverless/components':
+      {
+        const chalk = require('chalk');
+        process.stdout.write(
+          `${[
+            'Serverless Components CLI is no longer bundled with Serverless Framework CLI',
+            '',
+            "To run it, ensure it's installed:",
+            chalk.bold('npm install -g @serverless/components'),
+            '',
+            'Then run:',
+            chalk.bold('components <command> <options>'),
+          ].join('\n')}\n`
+        );
+      }
+      return;
+    case '@serverless/cli':
+      {
+        const chalk = require('chalk');
+        process.stdout.write(
+          `${[
+            'Serverless Components CLI v1 is no longer bundled with Serverless Framework CLI',
+            '',
+            "To run it, ensure it's installed:",
+            chalk.bold('npm install -g @serverless/cli'),
+            '',
+            'Then run:',
+            chalk.bold('components-v1 <command> <options>'),
+          ].join('\n')}\n`
+        );
+      }
+      return;
+    default:
+      throw new Error(`Unrecognized CLI name "${cliName}"`);
+  }
+});
diff --git a/commands/doctor.js b/commands/doctor.js
new file mode 100644
index 00000000000..94c57bfc1fe
--- /dev/null
+++ b/commands/doctor.js
@@ -0,0 +1,19 @@
+'use strict';
+
+const fsp = require('fs').promises;
+const { writeText, log } = require('@serverless/utils/log');
+const healthStatusFilename = require('../lib/utils/health-status-filename');
+
+module.exports = async () => {
+  const healthStatus = await (async () => {
+    try {
+      return await fsp.readFile(healthStatusFilename);
+    } catch (error) {
+      if (error.code === 'ENOENT') return null;
+      throw error;
+    }
+  })();
+
+  if (healthStatus) writeText(healthStatus);
+  else log.notice('No deprecations were reported in the last command');
+};
diff --git a/commands/plugin-install.js b/commands/plugin-install.js
new file mode 100644
index 00000000000..d49e26e13f2
--- /dev/null
+++ b/commands/plugin-install.js
@@ -0,0 +1,141 @@
+'use strict';
+
+const spawn = require('child-process-ext/spawn');
+const fsp = require('fs').promises;
+const fse = require('fs-extra');
+const path = require('path');
+const _ = require('lodash');
+const isPlainObject = require('type/plain-object/is');
+const yaml = require('js-yaml');
+const cloudformationSchema = require('@serverless/utils/cloudformation-schema');
+const { log, progress, style } = require('@serverless/utils/log');
+const ServerlessError = require('../lib/serverless-error');
+const yamlAstParser = require('../lib/utils/yaml-ast-parser');
+const npmCommandDeferred = require('../lib/utils/npm-command-deferred');
+const {
+  getPluginInfo,
+  getServerlessFilePath,
+  validate,
+} = require('../lib/commands/plugin-management');
+
+const mainProgress = progress.get('main');
+
+module.exports = async ({ configuration, serviceDir, configurationFilename, options }) => {
+  const commandRunStartTime = Date.now();
+  validate({ serviceDir });
+
+  const pluginInfo = getPluginInfo(options.name);
+  const pluginName = pluginInfo.name;
+  const pluginVersion = pluginInfo.version || 'latest';
+  const configurationFilePath = getServerlessFilePath({ serviceDir, configurationFilename });
+
+  const context = { configuration, serviceDir, configurationFilePath, pluginName, pluginVersion };
+  mainProgress.notice(
+    `Installing plugin "${pluginName}${pluginVersion === 'latest' ? '' : `@${pluginVersion}`}"`,
+    { isMainEvent: true }
+  );
+  await installPlugin(context);
+  await addPluginToServerlessFile(context);
+
+  log.notice();
+  log.notice.success(
+    `Plugin "${pluginName}${
+      pluginVersion === 'latest' ? '' : `@${pluginVersion}`
+    }" installed  ${style.aside(`(${Math.floor((Date.now() - commandRunStartTime) / 1000)}s)`)}`
+  );
+};
+
+const installPlugin = async ({ serviceDir, pluginName, pluginVersion }) => {
+  const pluginFullName = `${pluginName}@${pluginVersion}`;
+  await npmInstall(pluginFullName, { serviceDir });
+};
+
+const addPluginToServerlessFile = async ({ configurationFilePath, pluginName }) => {
+  const fileExtension = path.extname(configurationFilePath);
+  if (fileExtension === '.js' || fileExtension === '.ts') {
+    requestManualUpdate(configurationFilePath);
+    return;
+  }
+
+  const checkIsArrayPluginsObject = (pluginsObject) =>
+    pluginsObject == null || Array.isArray(pluginsObject);
+  // pluginsObject type determined based on the value loaded during the serverless init.
+  if (fileExtension === '.json') {
+    const serverlessFileObj = await fse.readJson(configurationFilePath);
+    const newServerlessFileObj = serverlessFileObj;
+    const isArrayPluginsObject = checkIsArrayPluginsObject(newServerlessFileObj.plugins);
+    // null modules property is not supported
+    let plugins = isArrayPluginsObject
+      ? newServerlessFileObj.plugins || []
+      : newServerlessFileObj.plugins.modules;
+
+    if (plugins == null) {
+      throw new ServerlessError(
+        'plugins modules property must be present',
+        'PLUGINS_MODULES_MISSING'
+      );
+    }
+
+    plugins.push(pluginName);
+    plugins = _.sortedUniq(plugins);
+
+    if (isArrayPluginsObject) {
+      newServerlessFileObj.plugins = plugins;
+    } else {
+      newServerlessFileObj.plugins.modules = plugins;
+    }
+
+    await fse.writeJson(configurationFilePath, newServerlessFileObj);
+    return;
+  }
+
+  const serverlessFileObj = yaml.load(await fsp.readFile(configurationFilePath, 'utf8'), {
+    filename: configurationFilePath,
+    schema: cloudformationSchema,
+  });
+  if (serverlessFileObj.plugins != null) {
+    // Plugins section can be behind veriables, opt-out in such case
+    if (isPlainObject(serverlessFileObj.plugins)) {
+      if (
+        serverlessFileObj.plugins.modules != null &&
+        !Array.isArray(serverlessFileObj.plugins.modules)
+      ) {
+        requestManualUpdate(configurationFilePath);
+        return;
+      }
+    } else if (!Array.isArray(serverlessFileObj.plugins)) {
+      requestManualUpdate(configurationFilePath);
+      return;
+    }
+  }
+  await yamlAstParser.addNewArrayItem(
+    configurationFilePath,
+    checkIsArrayPluginsObject(serverlessFileObj.plugins) ? 'plugins' : 'plugins.modules',
+    pluginName
+  );
+};
+
+const npmInstall = async (name, { serviceDir }) => {
+  const { command, args } = await npmCommandDeferred;
+  try {
+    await spawn(command, [...args, 'install', '--save-dev', name], {
+      cwd: serviceDir,
+      stdio: 'pipe',
+      // To parse quotes used in module versions. E.g. 'serverless@"^1.60.0 || 2"'
+      // https://stackoverflow.com/a/48015470
+      shell: true,
+    });
+  } catch (error) {
+    log.error(String(error.stderrBuffer));
+    throw error;
+  }
+};
+
+const requestManualUpdate = (configurationFilePath) => {
+  log.notice();
+  log.notice.skip(
+    `Can't automatically add plugin into "${path.basename(
+      configurationFilePath
+    )}" file. Please add it manually.`
+  );
+};
diff --git a/commands/plugin-uninstall.js b/commands/plugin-uninstall.js
new file mode 100644
index 00000000000..1f47b60f10e
--- /dev/null
+++ b/commands/plugin-uninstall.js
@@ -0,0 +1,121 @@
+'use strict';
+
+const spawn = require('child-process-ext/spawn');
+const fsp = require('fs').promises;
+const fse = require('fs-extra');
+const path = require('path');
+const _ = require('lodash');
+const isPlainObject = require('type/plain-object/is');
+const yaml = require('js-yaml');
+const cloudformationSchema = require('@serverless/utils/cloudformation-schema');
+const { log, progress, style } = require('@serverless/utils/log');
+const yamlAstParser = require('../lib/utils/yaml-ast-parser');
+const npmCommandDeferred = require('../lib/utils/npm-command-deferred');
+const {
+  getPluginInfo,
+  getServerlessFilePath,
+  validate,
+} = require('../lib/commands/plugin-management');
+
+const mainProgress = progress.get('main');
+
+module.exports = async ({ configuration, serviceDir, configurationFilename, options }) => {
+  const commandRunStartTime = Date.now();
+  validate({ serviceDir });
+
+  const pluginInfo = getPluginInfo(options.name);
+  const pluginName = pluginInfo.name;
+  const configurationFilePath = getServerlessFilePath({ serviceDir, configurationFilename });
+
+  const context = { configuration, serviceDir, configurationFilePath, pluginName };
+  mainProgress.notice(`Uninstalling plugin "${pluginName}"`, { isMainEvent: true });
+  await uninstallPlugin(context);
+  await removePluginFromServerlessFile(context);
+
+  log.notice();
+  log.notice.success(
+    `Plugin "${pluginName}" uninstalled ${style.aside(
+      `(${Math.floor((Date.now() - commandRunStartTime) / 1000)}s)`
+    )}`
+  );
+};
+
+const uninstallPlugin = async ({ serviceDir, pluginName }) => {
+  await npmUninstall(pluginName, { serviceDir });
+};
+
+const removePluginFromServerlessFile = async ({ configurationFilePath, pluginName }) => {
+  const fileExtension = path.extname(configurationFilePath);
+  if (fileExtension === '.js' || fileExtension === '.ts') {
+    requestManualUpdate(configurationFilePath);
+    return;
+  }
+
+  if (fileExtension === '.json') {
+    const serverlessFileObj = await fse.readJson(configurationFilePath);
+    const isArrayPluginsObject = Array.isArray(serverlessFileObj.plugins);
+    const plugins = isArrayPluginsObject
+      ? serverlessFileObj.plugins
+      : serverlessFileObj.plugins && serverlessFileObj.plugins.modules;
+
+    if (plugins) {
+      _.pull(plugins, pluginName);
+      if (!plugins.length) {
+        if (isArrayPluginsObject) {
+          delete serverlessFileObj.plugins;
+        } else {
+          delete serverlessFileObj.plugins.modules;
+        }
+      }
+      await fse.writeJson(configurationFilePath, serverlessFileObj);
+    }
+    return;
+  }
+
+  const serverlessFileObj = yaml.load(await fsp.readFile(configurationFilePath, 'utf8'), {
+    filename: configurationFilePath,
+    schema: cloudformationSchema,
+  });
+  if (serverlessFileObj.plugins != null) {
+    // Plugins section can be behind veriables, opt-out in such case
+    if (isPlainObject(serverlessFileObj.plugins)) {
+      if (
+        serverlessFileObj.plugins.modules != null &&
+        !Array.isArray(serverlessFileObj.plugins.modules)
+      ) {
+        requestManualUpdate(configurationFilePath);
+        return;
+      }
+    } else if (!Array.isArray(serverlessFileObj.plugins)) {
+      requestManualUpdate(configurationFilePath);
+      return;
+    }
+  }
+  await yamlAstParser.removeExistingArrayItem(
+    configurationFilePath,
+    Array.isArray(serverlessFileObj.plugins) ? 'plugins' : 'plugins.modules',
+    pluginName
+  );
+};
+
+const npmUninstall = async (name, { serviceDir }) => {
+  const { command, args } = await npmCommandDeferred;
+  try {
+    await spawn(command, [...args, 'uninstall', '--save-dev', name], {
+      cwd: serviceDir,
+      stdio: 'pipe',
+    });
+  } catch (error) {
+    log.error(String(error.stderrBuffer));
+    throw error;
+  }
+};
+
+const requestManualUpdate = (configurationFilePath) => {
+  log.notice();
+  log.notice.skip(
+    `Can't automatically remove plugin from "${path.basename(
+      configurationFilePath
+    )}" file. Please make it manually.`
+  );
+};
diff --git a/commitlint.config.js b/commitlint.config.js
index 6975195c9dd..59fb85a7521 100644
--- a/commitlint.config.js
+++ b/commitlint.config.js
@@ -11,6 +11,7 @@ module.exports = {
       [
         '',
         'API',
+        'AWS ActiveMQ',
         'AWS ALB',
         'AWS Alexa',
         'AWS API Gateway',
@@ -25,10 +26,13 @@ module.exports = {
         'AWS Info',
         'AWS Invocation',
         'AWS IOT',
+        'AWS Kafka',
         'AWS Kinesis',
         'AWS Lambda',
+        'AWS Layers',
         'AWS Local Invocation',
         'AWS MSK',
+        'AWS RabbitMQ',
         'AWS S3',
         'AWS Schedule',
         'AWS SNS',
diff --git a/docs/README.md b/docs/README.md
index 730af3fd5dc..2cc0bf92d37 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -1,6 +1,6 @@
 <!--
 title: Serverless Framework Documentation
-menuText: Docs
+menuText: Overview
 layout: Doc
 menuItems:
   - {menuText: "Get Started", path: /framework/docs/getting-started/}
@@ -47,7 +47,7 @@ If you prefer to start on the CLI, use our [get started](https://serverless.com/
 
 **If you are an experienced user of the Serverless Framework**
 
-Our [Pro dashboard](https://serverless.com/pro/) allows you to import existing projects. Track performance, troubleshoot, configure CI/CD and deployment policies, and get end-to-end serverless application lifecycle management.
+Our [hosted dashboard](https://app.serverless.com/) allows you to import existing projects. Track performance, troubleshoot, configure CI/CD and deployment policies, and get end-to-end serverless application lifecycle management.
 [Get started](https://app.serverless.com) for free.
 
 Have questions? Visit our [Forum](https://forum.serverless.com/).
diff --git a/docs/anatomy.md b/docs/anatomy.md
deleted file mode 100644
index 04e34cb58b8..00000000000
--- a/docs/anatomy.md
+++ /dev/null
@@ -1,62 +0,0 @@
-# Anatomy - Overview of internals
-
-## `serverless` binary (front door for three distinct CLI programs)
-
-[`serverless` binary](https://github.com/serverless/serverless/blob/master/bin/serverless.js) serves as an entrance for three independent CLI programs. [Initial logic](https://github.com/serverless/serverless/blob/ce376e96b0bb15a06ade362134aee2b1848d6113/bin/serverless.js#L25-L38) decides which CLI is actually run in current working directory context. Possible options are listed below
-
-### 1. Serverless Framework CLI
-
-Documented at [serverless.com/framework/docs](https://www.serverless.com/framework/docs/) of which code is hosted in this repository.
-
-See [Anatomy of the Serverless Framework CLI](#anatomy-of-the-serverless-framework-cli)
-
-### 2. (old v1 of) Serverless Components CLI
-
-_Deprecated old version of Serverless Components_
-
-Documented at [serverless/components/blob/v1](https://github.com/serverless/components/blob/v1/README.md), with code hosted at [serverless/cli](https://github.com/serverless/cli)
-
-### 3. Serverless Components CLI
-
-Documented at [serverless.com/components](https://www.serverless.com/components/), with code hosted at [serverless/components](https://github.com/serverless/components)
-
-## Anatomy of the Serverless Framework CLI
-
-### Overview
-
-Core flow of a process is managed through internal lifecycle engine, for which, internal (core) and external (user-made) plugins register supported CLI commands attributing to them ordered lifecycle events, plus hooks (event listeners) which are invoked when given event is triggered.
-
-#### Code organization
-
-Internals are configured with following modules.
-
-_Note: that each of these modules are considered private, there should be no dependency on them in external packages. Organization of files and internal API is subject to constant changes_
-
-##### Core classes
-
-Located in [lib/classes](https://github.com/serverless/serverless/tree/master/lib/classes). Core machinery with lifecycle engine internals
-
-##### Internal plugins
-
-Located in [lib/plugins](https://github.com/serverless/serverless/tree/master/lib/plugins). Register and implement core CLI commands with its events and attaches hooks for registered events
-
-##### Utils
-
-Located in [lib/utils](https://github.com/serverless/serverless/tree/master/lib/utils). General utils to be used in either core classes or internal plugins
-
-### Flow of a CLI process
-
-1. Setup essentials related to general error handling and eventual debugging ([bin/serverless.js#L40-L56](https://github.com/serverless/serverless/blob/ce376e96b0bb15a06ade362134aee2b1848d6113/bin/serverless.js#L40-L56))
-1. Setup autocompletion (only if explicitly turned on) ([bin/serverless.js#L58-L61](https://github.com/serverless/serverless/blob/ce376e96b0bb15a06ade362134aee2b1848d6113/bin/serverless.js#L58-L61))
-1. Propagate eventual analytics requests which weren't successful in previous runs ([bin/serverless.js#L64-L66](https://github.com/serverless/serverless/blob/ce376e96b0bb15a06ade362134aee2b1848d6113/bin/serverless.js#L64-L66))
-1. Resolve location of eventual service configuration in current working directory ([lib/Serverless.js#L40-L42](https://github.com/serverless/serverless/blob/ce376e96b0bb15a06ade362134aee2b1848d6113/lib/Serverless.js#L40-L42))
-1. Parse CLI arguments ([lib/Serverless.js#L67](https://github.com/serverless/serverless/blob/ce376e96b0bb15a06ade362134aee2b1848d6113/lib/Serverless.js#L67))
-1. (If in service context) Read service configuration (just read, no normalization and variables resolution at this point) ([lib/classes/PluginManager.js#L60-L63](https://github.com/serverless/serverless/blob/master/lib/classes/PluginManager.js#L60-L63))
-1. Check whether there's a newer version of a Framework available, and notify user if there is ([Serverless.js#L79-L89](https://github.com/serverless/serverless/blob/ce376e96b0bb15a06ade362134aee2b1848d6113/lib/Serverless.js#L79-L89))
-1. (If in service context) Normalize service configuration by filling defaults and ensuring core structure (no variables resolution yet) ([lib/classes/Service.js#L38-L53](https://github.com/serverless/serverless/blob/master/lib/classes/Service.js#L38-L53))
-1. Load all plugins (internal and those installed by user). They configure supported CLI commands, register events for lifecycle engine, and attach hooks to events eventually triggered by lifecycle engine ([lib/classes/PluginManager.js#L107-L116](https://github.com/serverless/serverless/blob/ce376e96b0bb15a06ade362134aee2b1848d6113/lib/classes/PluginManager.js#L107-L116)
-1. If it's `sls --help` command, show help and abort ([lib/Serverless.js#L108-L110](https://github.com/serverless/serverless/blob/ce376e96b0bb15a06ade362134aee2b1848d6113/lib/Serverless.js#L108-L110)
-1. (If in service context) Populate all variables in service configuration ([lib/Serverless.js#L118-L125](https://github.com/serverless/serverless/blob/ce376e96b0bb15a06ade362134aee2b1848d6113/lib/Serverless.js#L118-L125))
-1. (if in service context) Validate service configuration ([lib/Serverless.js#L128](https://github.com/serverless/serverless/blob/ce376e96b0bb15a06ade362134aee2b1848d6113/lib/Serverless.js#L128)
-1. Run lifecycle engine (emit all events that were registered for invoked CLI command) ([lib/classes/PluginManager.js#L509-L511](https://github.com/serverless/serverless/blob/ce376e96b0bb15a06ade362134aee2b1848d6113/lib/classes/PluginManager.js#L509-L511))
-1. If execution ended with an error, log it in user friendly way ([lib/classes/Error.js#L68-L129](https://github.com/serverless/serverless/blob/ce376e96b0bb15a06ade362134aee2b1848d6113/lib/classes/Error.js#L68-L129))
diff --git a/docs/cn/getting-started.md b/docs/cn/getting-started.md
index d589e680aa0..836f5242f0c 100644
--- a/docs/cn/getting-started.md
+++ b/docs/cn/getting-started.md
@@ -60,7 +60,7 @@ $ choco upgrade serverless
 npm install -g serverless
 
 # 或者更新 serverless cli 到最新版本
-npm update -g serverless
+npm install -g serverless
 ```
 
 如果你的环境中还没有安装 Node 8 或者更高的版本，那么你需要首先安装 [Node.js](https://nodejs.org/zh-cn/download/)
diff --git a/docs/cn/providers/tencent/components/README.md b/docs/cn/providers/tencent/components/README.md
index 2cdd4617789..66aa1d17690 100644
--- a/docs/cn/providers/tencent/components/README.md
+++ b/docs/cn/providers/tencent/components/README.md
@@ -43,7 +43,7 @@ $ npm i -g serverless
 
 **确保你使用的是 Serverless Framework 1.49 及以上的版本**。更早的版本无法支持 Serverless Components Beta。
 
-之后，通过 `create --template-url` 命令安装一个 [Serverless Components 模板](./templates)，模板中会包含了 Componenets 及示例代码，可以让你更快的了解 Component。
+之后，通过 `create --template-url` 命令安装一个 [Serverless Components 模板](./templates)，模板中会包含了 Components 及示例代码，可以让你更快的了解 Component。
 
 以下是一些常用的用例模板：
 
diff --git a/docs/cn/providers/tencent/components/high-level-components/README.md b/docs/cn/providers/tencent/components/high-level-components/README.md
index 75dd317b29c..40bf3dca409 100644
--- a/docs/cn/providers/tencent/components/high-level-components/README.md
+++ b/docs/cn/providers/tencent/components/high-level-components/README.md
@@ -23,7 +23,7 @@ $ npm i -g serverless
 
 **确保你使用的是 Serverless Framework 1.49 及以上的版本**。更早的版本无法支持 Serverless Components Beta。
 
-之后，通过 `create --template-url` 命令安装一个 [Serverless Components 模板](./templates)，模板中会包含了 Componenets 及示例代码，可以让你更快的了解 Component。
+之后，通过 `create --template-url` 命令安装一个 [Serverless Components 模板](./templates)，模板中会包含了 Components 及示例代码，可以让你更快的了解 Component。
 
 以下是一些常用的用例模板：
 
diff --git a/docs/cn/providers/tencent/components/high-level-components/custom-domain-HTTPS.md b/docs/cn/providers/tencent/components/high-level-components/custom-domain-https.md
similarity index 99%
rename from docs/cn/providers/tencent/components/high-level-components/custom-domain-HTTPS.md
rename to docs/cn/providers/tencent/components/high-level-components/custom-domain-https.md
index 6228dd13609..4f7a1342162 100644
--- a/docs/cn/providers/tencent/components/high-level-components/custom-domain-HTTPS.md
+++ b/docs/cn/providers/tencent/components/high-level-components/custom-domain-https.md
@@ -158,7 +158,7 @@ $ sls --debug
   DEBUG ─ Deployment successful for the api named restApi in the ap-shanghai region.
   DEBUG ─ Start unbind all exist domain for service service-lqhc88sr
   DEBUG ─ Start bind custom domain for service service-lqhc88sr
-  DEBUG ─ Custom domain for service service-lqhc88sr created successfullly.
+  DEBUG ─ Custom domain for service service-lqhc88sr created successfully.
   DEBUG ─ Please add CNAME record service-lqhc88sr-1250000000.sh.apigw.tencentcs.com for www.example.com.
 
   restApi:
diff --git a/docs/cn/providers/tencent/components/high-level-components/PGSQL-template.md b/docs/cn/providers/tencent/components/high-level-components/pgsql-template.md
similarity index 100%
rename from docs/cn/providers/tencent/components/high-level-components/PGSQL-template.md
rename to docs/cn/providers/tencent/components/high-level-components/pgsql-template.md
diff --git a/docs/configuration-validation.md b/docs/configuration-validation.md
index 477cda032a6..b9da9afda91 100644
--- a/docs/configuration-validation.md
+++ b/docs/configuration-validation.md
@@ -8,12 +8,12 @@ layout: Doc
 
 The framework validates service configuration with the help of [AJV](https://ajv.js.org/) (JSON-schema validation engine).
 
-If you received a configuration warning it could mean that:
+If you were presented with configuration error (or a warning, depending on `configValidationMode` setting) it could mean that:
 
 - Service configuration is invalid and you need to correct an issue related to your serverless.yml
 - Configuration related to external plugin does not have an associated JSON Schema. In such cases, please report the issue with the plugin author and provide them the details on how to [extend validation schema](/framework/docs/providers/aws/guide/plugins/) in order to permanently correct the issue.
 - However unlikely, there may be a bug (or missing) schema configuration for the framework. If you believe this to be the case please report at [https://github.com/serverless/serverless/issues/new](https://github.com/serverless/serverless/issues/new?template=bug_report.md)
 
-**Note**: A configuration warning doesn't block framework commands in any way by default (e.g. `sls deploy` will still attempt to deploy the service). If you wish all deployments to be blocked if there is a configuarion warning, add `configValidationMode: error` to your serverless.yml, so the command is not processed further (it is likely to become a default setting in future)
+**Note**: In a warning mode (with `configValidationMode: warn` set in configuration) Framework commands are not blocked in any way, e.g. `sls deploy` will still attempt to deploy the service normally (still depending on the source of the warning, success of a deployment may vary)
 
 If you find this functionality problematic, you may also turn it off with `configValidationMode: off` setting.
diff --git a/docs/deprecations.md b/docs/deprecations.md
index 50bbe436e9f..4b46a2d87e4 100644
--- a/docs/deprecations.md
+++ b/docs/deprecations.md
@@ -6,9 +6,11 @@ layout: Doc
 
 # Serverless Framework Deprecations
 
-## How to disable specific deprecation logs
+## How to disable a specific deprecation
 
-To disable specific deprecations set `SLS_DEPRECATION_DISABLE` environment variable. Setting `SLS_DEPRECATION_DISABLE=*` will disable all deprecations. If you want to disable specific deprecations set `SLS_DEPRECATION_DISABLE=CODE1,CODE2`. Alternatively, you can also use `disabledDeprecations` in your `serverless.yml` in the following manner:
+To disable a deprecation, use the `SLS_DEPRECATION_DISABLE=CODE` environment variable. You can disable multiple deprecations via `SLS_DEPRECATION_DISABLE=CODE1,CODE2` or disable them all via `SLS_DEPRECATION_DISABLE=*`.
+
+Alternatively, you can set `disabledDeprecations` in `serverless.yml`:
 
 ```yml
 service: myService
@@ -17,19 +19,206 @@ disabledDeprecations:
   - '*' # To disable all deprecation messages
 ```
 
+## Notification mode
+
+By default, deprecations are logged after the command finalizes with a warning summary.
+
+This notification mode can be changed via the `SLS_DEPRECATION_NOTIFICATION_MODE=error` environment variable or via `serverless.yml`:
+
+```yaml
+deprecationNotificationMode: error
+```
+
+The `error` mode turns all deprecations into strict errors, the `warn` mode displays deprecations as they're discovered.
+
+Note:
+
+- The `serverless.yml` setting is ineffective for deprecations reported before the configuration is read.
+- `SLS_DEPRECATION_DISABLE` and `disabledDeprecations` remain respected, and no errors will be thrown for mentioned deprecation codes.
+
+<a name="VARIABLES_RESOLUTION_MODE"><div>&nbsp;</div></a>
+
+## Property `variablesResolutionMode`
+
+Deprecation code: `VARIABLES_RESOLUTION_MODE`
+
+Starting with v4.0.0, Serverless will no longer recognize `variablesResolutionMode`, as supported configuration property. Drop it to avoid validation errors
+
+Learn more about configuration validation here: http://slss.io/configuration-validation
+
+<a name="PROJECT_DIR"><div>&nbsp;</div></a>
+
+## Property `projectDir`
+
+Deprecation code: `PROJECT_DIR`
+
+Starting with v4.0.0, Serverless will no longer recognize `projectDir`, as supported configuration property. Drop it to avoid validation errors
+
+Learn more about configuration validation here: http://slss.io/configuration-validation
+
+<a name="CLI_OPTIONS_SCHEMA_V3"><div>&nbsp;</div></a>
+
+## CLI Options extensions, `type` requirement
+
+Deprecation code: `CLI_OPTIONS_SCHEMA_V3`
+
+Internal handling of CLI arguments was improved with type awareness for options. Now each option definition is expected have `type` defined in its settings.
+
+Possible values are `string`, `boolean` and `multiple`. Check [Defining options](/framework/docs/providers/aws/guide/plugins#defining-options) documentation for more info.
+
+If you rely on a plugin which does not set types (yet) please report the issue at its issue tracker.
+
+Starting with v4.0.0 any option extensions which does not have `type` defined will be communicated with a thrown error
+
+<a name="PROVIDER_IAM_SETTINGS_V3"><div>&nbsp;</div></a>
+
+## Grouping IAM settings under `provider.iam`
+
+Deprecation code: `PROVIDER_IAM_SETTINGS_v3`
+
+All IAM-related settings of _provider_ including `iamRoleStatements`, `iamManagedPolicies`, `role` and `cfnRole` are also now supported at `iam` property. Refer to the [IAM Guide](/framework/docs/providers/aws/guide/iam.md).
+
+- `provider.role` -> `provider.iam.role`
+- `provider.rolePermissionsBoundary` -> `provider.iam.role.permissionsBoundary`
+- `provider.iamRoleStatements` -> `provider.iam.role.statements`
+- `provider.iamManagedPolicies` -> `provider.iam.role.managedPolicies`
+- `provider.cfnRole` -> `provider.iam.deploymentRole`
+
+In addition `iam.role.permissionBoundary` can also be set at `iam.role.permissionsBoundary` (which matches CloudFormation property name).
+
+Starting with v4.0.0 old versions of settings will no longer be supported
+
+<a name="CONFIG_VALIDATION_MODE_DEFAULT_V3"><div>&nbsp;</div></a>
+
+## `configValidationMode: error` will be new default
+
+Deprecation code: `CONFIG_VALIDATION_MODE_DEFAULT_V3`
+
+Starting with v4.0.0, Serverless will throw on configuration errors by default. This is changing from the previous default, `configValidationMode: warn`
+
+Learn more about configuration validation here: http://slss.io/configuration-validation
+
+<a name="PACKAGE_PATTERNS"><div>&nbsp;</div></a>
+
+## New way to define packaging patterns
+
+Deprecation code: `PACKAGE_PATTERNS`
+
+Support for `package.include` and `package.exclude` will be removed with v4.0.0. Instead please use `package.patterns` with which both _include_ and _exclude_ (prefixed with `!`) rules can be configured.
+
+Check [Packaging Patterns](/framework/docs/providers/aws/guide/packaging/#patterns) documentation for more info.
+
+<a name="CLI_DEPLOY_FUNCTION_OPTION_V3"><div>&nbsp;</div></a>
+
+## CLI `--function`/`-f` option for `deploy` command
+
+Deprecation code: `CLI_DEPLOY_FUNCTION_OPTION_V3`
+
+Starting with `v4.0.0`, `--function` or `-f` option for `deploy` command will no longer be supported. In order to deploy a single function, please use `deploy function` command instead.
+
+<a name="LAMBDA_HASHING_VERSION_PROPERTY"><div>&nbsp;</div></a>
+
+## Property `provider.lambdaHashingVersion`
+
+Deprecation code: `LAMBDA_HASHING_VERSION_PROPERTY`
+
+Lambda version hashes were improved with a better algorithm (that fixed determinism issues), which is used by default, starting with v3.0.0.
+
+If you previously opted-in to use new algorithm by setting `provider.lambdaHashingVersion` to `20201221`, you can safely remove that property from your configuration to silence the deprecation.
+
+The old `20200924` algorithm is deprecated and it is recommended to migrate to the new version. In order to do that, you can follow the guide in [Functions Docs](./providers/aws/guide/functions.md#lambda-hashing-algorithm-migration).
+
+<a name="AwS_EVENT_BRIDGE_CUSTOM_RESOURCE_LEGACY_OPT_IN"><div>&nbsp;</div></a>
+
+## AWS EventBridge lambda event triggers based on Custom Resources
+
+Deprecation code: `AWS_EVENT_BRIDGE_CUSTOM_RESOURCE_LEGACY_OPT_IN`
+
+Support for provisioning AWS EventBridge resources without native CloudFormation resources is deprecated and will no longer be maintained. If you want to upgrade to native CloudFormation, remove "eventBridge.useCloudFormation" setting from your configuration. If you are currently using "eventBridge.useCloudFormation" set to `true` to enable native CloudFormation, you can safely remove this setting from your configuration.
+
+Note that to migrate away from the legacy behavior, you will need to remove (or comment) EventBridge triggers, deploy, re-add them and re-deploy in order to migrate from the legacy behavior.
+
+<a name="AWS_HTTP_API_USE_PROVIDER_TAGS_PROPERTY"><div>&nbsp;</div></a>
+
+## Ineffective property `provider.httpApi.useProviderTags`
+
+Deprecation code: `AWS_HTTP_API_USE_PROVIDER_TAGS_PROPERTY`
+
+Starting with "v3.0.0", property `provider.httpApi.useProviderTags` is no longer effective as provider tags are applied to Http Api Gateway by default. You can safely remove this property from your configuration.
+
+<a name="S3_TRANSFER_ACCELERATION_ON_EXISTING_BUCKET"><div>&nbsp;</div></a>
+
+## Attempt to enable S3 Transfer Acceleration on provided S3 buckets
+
+Deprecation code: `S3_TRANSFER_ACCELERATION_ON_EXISTING_BUCKET`
+
+Starting with "v3.0.0", attempt to enable S3 Transfer Acceleration on user provided bucket will result in error instead of a warning. To ensure seamless upgrade, please stop using "--aws-s3-accelerate" flag.
+
+<a name="DUPLICATE_PLUGIN_DEFINITION"><div>&nbsp;</div></a>
+
+## Duplicate plugin definition in configuration
+
+Deprecation code: `DUPLICATE_PLUGIN_DEFINITION`
+
+Starting with "v3.0.0", duplicate plugin definition will result in an error instead of a warning. To ensure seamless upgrade, please remove duplicate plugins from your configuration.
+
+<a name="CLI_VERBOSE_OPTION_ALIAS"><div>&nbsp;</div></a>
+
+## CLI `-v` alias for `--verbose` option
+
+Deprecation code: `CLI_VERBOSE_OPTION_ALIAS`
+
+Starting with `v3.0.0`, `-v` will no longer be supported as alias for `--verbose` option. Please use `--verbose` flag instead.
+
+<a name="AWS_API_GATEWAY_DEFAULT_IDENTITY_SOURCE"><div>&nbsp;</div></a>
+
+## Default `identitySource` for `http.authorizer`
+
+Deprecation code: `AWS_API_GATEWAY_DEFAULT_IDENTITY_SOURCE`
+
+Starting with v3.0.0, `functions[].events[].http.authorizer.identitySource` will no longer be set to "method.request.header.Authorization" by default for authorizers of "request" type with caching disabled ("resultTtlInSeconds" set to "0"). If you want to keep this setting, please set it explicitly in your configuration. If you do not want this to be set, please set it explicitly to "null".
+
+<a name="DISABLE_DEFAULT_OUTPUT_EXPORT_NAMES"><div>&nbsp;</div></a>
+
+## Disable default Output Export names
+
+Deprecation code: `DISABLE_DEFAULT_OUTPUT_EXPORT_NAMES`
+
+Starting with `v3.0.0`, it will not be possible to disable default export names for outputs. To hide this deprecation message and ensure seamless upgrade, please remove this flag.
+
+<a name="CLI_DEPLOY_FUNCTION_OPTION"><div>&nbsp;</div></a>
+
+## CLI `--function`/`-f` option for `deploy` command
+
+Deprecation code: `CLI_DEPLOY_FUNCTION_OPTION`
+
+_Note: We've resigned from this deprecation in the context of v2 (it'll be re-added in the context of v3). We continue to advise using `deploy function -f` command instead of `deploy -f`._
+
+Starting with `v3.0.0`, `--function` or `-f` option for `deploy` command will be removed. In order to deploy a single function, please use `deploy function` command instead.
+
+<a name="CHANGE_OF_DEFAULT_RUNTIME_TO_NODEJS14X"><div>&nbsp;</div></a>
+
+## Change of default runtime to `nodejs14.x`
+
+Deprecation code: `CHANGE_OF_DEFAULT_RUNTIME_TO_NODEJS14X`
+
+Starting with `v3.0.0`, the default runtime will change from `nodejs12.x` to `nodejs14.x`. In order to hide the deprecation message and ensure seamless upgrade, please set the runtime explicitly.
+
 <a name="AWS_API_GATEWAY_NON_APPLICABLE_SETTINGS"><div>&nbsp;</div></a>
 
 ## AWS API Gateway non-applicable settings configured
 
 Deprecation code: `AWS_API_GATEWAY_NON_APPLICABLE_SETTINGS`
 
-When external API Gateway resource is used and imported via `provider.apiGateway.restApiId` setting, both `provider.logs.restApi` and `provider.tracing.apiGateway` will be ignored. These settings are applicable only if API Gateway resource is provisioned by Serverless Framework.
+When external API Gateway resource is used and imported via `provider.apiGateway.restApiId` setting, both `provider.logs.restApi` and `provider.tracing.apiGateway` are ignored. In v3, an error will be thrown if these options are defined. Indeed, these settings are applicable only if API Gateway resource is provisioned by Serverless Framework.
 
-<a name="CLI_OPTIONS_SCHEMA'"><div>&nbsp;</div></a>
+<a name="CLI_OPTIONS_SCHEMA"><div>&nbsp;</div></a>
 
 ## CLI Options extensions, `type` requirement
 
-Deprecation code: `CLI_OPTIONS_SCHEMA'`
+Deprecation code: `CLI_OPTIONS_SCHEMA`
+
+_Note: We've resigned from this deprecation in the context of v2 (it'll be re-added in the context of v3). We continue to advise upgrade so schema for CLI options is provided._
 
 Internal handling of CLI arguments was improved with type awareness for options. Now each option definition is expected have `type` defined in its settings.
 
@@ -45,7 +234,11 @@ Starting with v3.0.0 any option extensions which does not have `type` defined wi
 
 Deprecation code: `NEW_PACKAGE_PATTERNS`
 
-Please use `package.patterns`. `package.include` and `package.exclude` will be removed with v3.0.0
+_Note: We've resigned from this deprecation in the context of v2 (it'll be re-added in the context of v3). We continue to advise upgrade of services, so they do not rely on `package.include` and `package.exclude` settings._
+
+Support for `package.include` and `package.exclude` will be removed with v3.0.0. Instead please use `package.patterns` with which both _include_ and _exclude_ (prefixed with `!`) rules can be configured.
+
+Check [Packaging Patterns](/framework/docs/providers/aws/guide/packaging/#patterns) documentation for more info.
 
 <a name="UNSUPPORTED_CLI_OPTIONS"><div>&nbsp;</div></a>
 
@@ -53,15 +246,24 @@ Please use `package.patterns`. `package.include` and `package.exclude` will be r
 
 Deprecation code: `UNSUPPORTED_CLI_OPTIONS`
 
-So far Framework ignored any not recognized CLI options as passed with a CLI command. Still such handling
-is error prone, as due to e.g. accidental typos, important information may not be passed to the command and lead to unwanted results.
+Framework was upgraded with extensive CLI options validation and that required dropping support for _free form_ CLI options (keeping that in will make not possible to reliably detect accidental typos in option names).
 
-Starting with v3.0.0, Serverless will report unrecognized options with a thrown error.
+For _free form_ process configuration options it is advised to rely on environment variables instead, as e.g.:
+
+```yaml
+provider:
+  stackName: ${env:STACK_NAME, 'T001'}
+```
+
+```bash
+STACK_NAME=test sls deploy
+```
 
-_Note: If you've used such options to aid dynamic resolution of service configuration (passing custom values to `${opt:..}` resolvers)._
-_We suggest to rely on environment variables instead. Setup of environment variables is also way more
+_Note that setup of environment variables is way more
 convenient since we've added support for [`.env`](/framework/docs/environment-variables#support-for-env-files) files._
 
+Starting with v3.0.0, Serverless will report unrecognized options with a thrown error.
+
 <a name="CLI_OPTIONS_BEFORE_COMMAND"><div>&nbsp;</div></a>
 
 ## CLI command options should follow command
@@ -74,10 +276,12 @@ Ensure to always format CLI command as `sls [command..] [options...]`
 
 <a name="CONFIG_VALIDATION_MODE_DEFAULT"><div>&nbsp;</div></a>
 
-## `configValidationMode: error` will be new default`
+## `configValidationMode: error` will be new default
 
 Deprecation code: `CONFIG_VALIDATION_MODE_DEFAULT`
 
+_Note: We've resigned from this deprecation in the context of v2 (it'll be re-added in the context of v3). We continue to advise configuring services with `configValidationMode: error` setting._
+
 Starting with v3.0.0, Serverless will throw on configuration errors by default. This is changing from the previous default, `configValidationMode: warn`
 
 Learn more about configuration validation here: http://slss.io/configuration-validation
@@ -96,10 +300,12 @@ Starting with v3.0.0, `http.request.schema` property will be replaced by `http.r
 
 Deprecation code: `AWS_EVENT_BRIDGE_CUSTOM_RESOURCE`
 
-Starting with v3.0.0 AWS EventBridge lambda event triggers and all associated EventBridge resources will be deployed using native CloudFormation resources instead of a custom resource that used a lambda to deploy them via the AWS SDK/API.
+Starting with v3.0.0, AWS EventBridge lambda event triggers and all associated EventBridge resources will be, by default, deployed using native CloudFormation resources instead of a custom resource that used a lambda to deploy them via the AWS SDK/API.
 
 Adapt to this behavior now by setting `provider.eventBridge.useCloudFormation: true`.
 
+If you want to keep using the old deployment method for your AWS EventBridge resources, set `provider.eventBridge.useCloudFormation: false` instead.
+
 <a name="NEW_VARIABLES_RESOLVER"><div>&nbsp;</div></a>
 
 ## New variables resolver
@@ -118,7 +324,7 @@ It's recommended to expose all errors that eventually new resolver may report (t
 
 Deprecation code: `AWS_HTTP_API_USE_PROVIDER_TAGS`
 
-Starting with v3.0.0, `provider.tags` will be applied to Http Api Gateway by default
+Starting with v3.0.0, `provider.tags` will be applied to HTTP API Gateway stages by default
 Set `provider.httpApi.useProviderTags` to `true` to adapt to the new behavior now.
 
 <a name="MISSING_COMMANDS_OR_OPTIONS_AT_CONSTRUCTION"><div>&nbsp;</div></a>
@@ -182,9 +388,9 @@ Starting from v3.0.0 configuration data will not be resolved internally, and if
 
 Deprecation code: `VARIABLES_ERROR_ON_UNRESOLVED`
 
-Starting with v3.0.0, references to variables that cannot be resolved will result in an error being thrown.
+_Note: Starting with v3.0.0, Serverless Framework will switch exclusively to a new variables resolver. If you see this deprecation please upgrade to latest v2 release of Serverless Framework, as that will provide a more accurate insight on planned changes._
 
-Adapt to this behaviour now by adding `unresolvedVariablesNotificationMode: error` to service configuration.
+In context of v2 you may adapt old variables resolver so errors on unresolved variables are thrown by adding `unresolvedVariablesNotificationMode: error` to service configuration.
 
 <a name="PROVIDER_IAM_SETTINGS"><div>&nbsp;</div></a>
 
@@ -192,7 +398,9 @@ Adapt to this behaviour now by adding `unresolvedVariablesNotificationMode: erro
 
 Deprecation code: `PROVIDER_IAM_SETTINGS`
 
-Staring with v3.0.0, all IAM-related settings of _provider_ including `iamRoleStatements`, `iamManagedPolicies`, `role` and `cfnRole` will be grouped under `iam` property. Refer to the[IAM Guide](/framework/docs/providers/aws/guide/iam.md).
+_Note: Originally, support for the legacy IAM settings format was scheduled to be dropped in v3. However, it's no longer the case. If you see this deprecation notice please upgrade to the latest version of Serverless Framework v2._
+
+All IAM-related settings of _provider_ including `iamRoleStatements`, `iamManagedPolicies`, `role` and `cfnRole` are also now supported at `iam` property. Refer to the [IAM Guide](/framework/docs/providers/aws/guide/iam.md).
 
 - `provider.role` -> `provider.iam.role`
 - `provider.rolePermissionsBoundary` -> `provider.iam.role.permissionsBoundary`
@@ -200,8 +408,7 @@ Staring with v3.0.0, all IAM-related settings of _provider_ including `iamRoleSt
 - `provider.iamManagedPolicies` -> `provider.iam.role.managedPolicies`
 - `provider.cfnRole` -> `provider.iam.deploymentRole`
 
-In addition, a prior update had documented the new Permissions Boundary property as `iam.role.permissionBoundary`. This
-has now been deprecated in favor of `iam.role.permissionsBoundary` to match the CloudFormation property.
+In addition `iam.role.permissionBoundary` can also be set at `iam.role.permissionsBoundary` (which matches CloudFormation property name).
 
 <a name="AWS_API_GATEWAY_SPECIFIC_KEYS"><div>&nbsp;</div></a>
 
@@ -227,9 +434,11 @@ Org, app, service, stage, and region are required to resolve variables when logg
 
 Deprecation code: `LAMBDA_HASHING_VERSION_V2`
 
-Resolution of lambda version hashes was improved with better (fixed deterministism issues) algorithm, which will be used starting with v3.0.0
+Lambda version hashes were improved with a better algorithm (that fixed determinism issues). It will be used by default starting with v3.0.0.
+
+You can adapt your services to use it now by setting `provider.lambdaHashingVersion` to `20201221`.
 
-You can adapt your services to use it now, by setting `provider.lambdaHashingVersion` to `20201221`.
+While not recommended, you can keep using the old hashing algorithm by setting `provider.lambdaHashingVersion` to `20200924`. That will silence the deprecation and allow to upgrade to v3.
 
 **Notice:** If you apply this on already deployed service without any changes to lambda code, you might encounter an error similar to the one below:
 
@@ -239,7 +448,7 @@ You can adapt your services to use it now, by setting `provider.lambdaHashingVer
   An error occurred: FooLambdaVersion3IV5NZ3sE5T2UFimCOai2Tc6eCaW7yIYOP786U0Oc - A version for this Lambda function exists ( 11 ). Modify the function to create a new version..
 ```
 
-It is an expected behavior. AWS complains here that received a different hash for very same lambda configuration. To workaround that, you need to modify your function(s) code and try to redeploy it again. One common approach is to modify an utility function that is used by all/most of your Lambda functions.
+It is an expected behavior. AWS complains here that received a different hash for very same lambda configuration. To workaround that, you need to modify your function(s) code and try to redeploy it again. One common approach is to modify an utility function that is used by all/most of your Lambda functions. There's also a semi-automated migration available and described in [V3 Upgrade docs](./guides/upgrading-v3.md#lambda-hashing-algorithm).
 
 <a name="LOAD_VARIABLES_FROM_ENV_FILES"><div>&nbsp;</div></a>
 
@@ -305,6 +514,8 @@ Please use `provider.kmsKeyArn` and `functions[].kmsKeyArn`. `service.awsKmsKeyA
 
 Deprecation code: `RESOURCES_EXTENSIONS_REFERENCE_TO_NONEXISTENT_RESOURCE`
 
+_Note: This deprecation was replaced with a thrown error (adding a deprecation here, was a logical error). Please upgrade to latest version of the Framework_
+
 Starting with v3.0.0, extensions to nonexistent resources in `resources.extensions` will throw an error instead of passing silently.
 
 <a name="DISABLE_LOCAL_INSTALLATION_FALLBACK_SETTING"><div>&nbsp;</div></a>
@@ -357,7 +568,7 @@ Deprecation code: `AWS_FUNCTION_DESTINATIONS_ASYNC_CONFIG`
 
 Deprecation code: `AWS_HTTP_API_VERSION`
 
-Default HTTP API Payload version will be switched to 2.0 with next major release (For more details see [payload format documentation](https://docs.aws.amazon.com/apigateway/latest/developerguide/http-api-develop-integrations-lambda.html#http-api-develop-integrations-lambda.proxy-format))
+Default HTTP API Payload version will be switched to 2.0 with v3 (For more details see [payload format documentation](https://docs.aws.amazon.com/apigateway/latest/developerguide/http-api-develop-integrations-lambda.html#http-api-develop-integrations-lambda.proxy-format)).
 
 Configure `httpApi.payload` explicitly to ensure seamless migration.
 
@@ -367,9 +578,9 @@ Configure `httpApi.payload` explicitly to ensure seamless migration.
 
 Deprecation code: `OUTDATED_NODEJS`
 
-Support for Node.js v6 and v8 will be dropped with v2.0.0 release
+Support for Node.js v8 was dropped with v2 release, while support for Node.js v10 will be dropped with v3 release
 
-Ensure to rely on at least Node.js v10 (It's recommended to use LTS version, as listed at https://nodejs.org/en/)
+Ensure to rely on at least Node.js v12 (It's recommended to use LTS version, as listed at https://nodejs.org/en/)
 
 <a name="AWS_ALB_ALLOW_UNAUTHENTICATED"><div>&nbsp;</div></a>
 
diff --git a/docs/environment-variables.md b/docs/environment-variables.md
index c390b68cd7e..c375a1b706d 100644
--- a/docs/environment-variables.md
+++ b/docs/environment-variables.md
@@ -6,12 +6,31 @@ layout: Doc
 
 # Resolution of environment variables
 
-With `useDotenv: true` set in your `serverless.yml` file, framework automatically loads environment variables from `.env` files with the help of [dotenv](https://www.npmjs.com/package/dotenv). In addition, `.env` files are excluded from the package when `useDotenv` is set in order to avoid uploading sensitive data as a part of package by mistake. Starting with next major version, `.env` files will be loaded by default and `useDotenv` setting will be ignored.
+To automatically load environment variables from `.env` files (with the help of the [dotenv](https://www.npmjs.com/package/dotenv) package), set `useDotenv: true` in `serverless.yml`:
+
+```yaml
+useDotenv: true
+```
+
+With that option enabled, `.env` files will also be excluded from the package in order to avoid uploading sensitive data as a part of a package by mistake.
 
 ## Support for `.env` files
 
 The framework looks for `.env` and `.env.{stage}` files in service directory and then tries to load them using `dotenv`. If `.env.{stage}` is found, `.env` will not be loaded. If stage is not explicitly defined, it defaults to `dev`.
 
+### Variable expansion
+
+It is possible to define environment variables as a combination of existing ones:
+
+```env
+BASE_URL=my.api.com
+PROTOCOL=https
+
+URL=$PROTOCOL/$BASE_URL
+```
+
+> This is supported through [dotenv-expand](https://github.com/motdotla/dotenv-expand)
+
 ### Differences against `serverless-dotenv-plugin`
 
 There are a few differences between above functionality and [serverless-dotenv-plugin](https://github.com/colynb/serverless-dotenv-plugin):
diff --git a/docs/getting-started.md b/docs/getting-started.md
index 0b599e83d78..2b6a2eb47c9 100644
--- a/docs/getting-started.md
+++ b/docs/getting-started.md
@@ -4,7 +4,6 @@ menuText: Get Started
 layout: Doc
 menuOrder: 0
 menuItems:
-  - {menuText: AWS Guide, path: /framework/docs/providers/aws/guide/quick-start}
   - {menuText: Azure Functions Guide, path: /framework/docs/providers/azure/guide/quick-start}
   - {menuText: Apache OpenWhisk Guide, path: /framework/docs/providers/openwhisk/guide/quick-start}
   - {menuText: Google Functions Guide, path: /framework/docs/providers/google/guide/quick-start}
@@ -19,11 +18,23 @@ menuItems:
 
 # Get started with Serverless Framework Open Source & AWS
 
-Getting started with Serverless Framework’s Open Source CLI and AWS takes only a few minutes. Install as a standalone binary, or with npm.
+Getting started with Serverless Framework’s Open Source CLI and AWS only takes a few minutes.
 
-## Install as a standalone binary
+## Installation
 
-### MacOS/Linux
+Install the serverless CLI via NPM:
+
+```bash
+npm install -g serverless
+```
+
+_Note: If you don’t already have Node on your machine, [install it first](https://nodejs.org/). We suggest using the latest LTS version of NodeJS._
+
+If you don't want to install Node or NPM, you can install a standalone binary.
+
+### Install as a standalone binary
+
+#### MacOS/Linux
 
 To install the latest version, run this command in your terminal:
 
@@ -31,15 +42,15 @@ To install the latest version, run this command in your terminal:
 curl -o- -L https://slss.io/install | bash
 ```
 
-To install an specific version you may set a VERSION variable, for example:
+To install a specific version, you may set a VERSION variable, for example:
 
 ```bash
-curl -o- -L https://slss.io/install | VERSION=2.21.1 bash
+curl -o- -L https://slss.io/install | VERSION=2.72.2 bash
 ```
 
-Then open another terminal window to run `serverless` program.
+Then, open another terminal window to run the `serverless` program.
 
-### Windows
+#### Windows
 
 Install with [Chocolatey](https://chocolatey.org/):
 
@@ -47,58 +58,111 @@ Install with [Chocolatey](https://chocolatey.org/):
 choco install serverless
 ```
 
-### via npm
-
-_Note: If you don’t already have [Node](https://nodejs.org/en/download/package-manager/) on your machine, you’ll need to install it first. We suggest using the latest LTS version of NodeJS._
+## Upgrade
 
-Install the serverless CLI:
+If `serverless` was installed via NPM, upgrade it via:
 
 ```bash
 npm install -g serverless
+
+# You can also specify a major version:
+npm install -g serverless@2
+```
+
+If you installed `serverless` as a standalone binary, read the following section instead.
+
+### Standalone binary
+
+On MacOS/Linux, run:
+
+```bash
+serverless upgrade
+
+# You can also restrict the upgrade to the latest v2 version:
+curl -o- -L https://slss.io/install | VERSION=2.72.2 bash
+```
+
+On Windows, run:
+
+```bash
+choco upgrade serverless
 ```
 
-## Initial setup
+## Getting started
 
-Run below command and follow the prompts
+Run the command below and follow the prompts:
 
 ```bash
+# Create a new serverless project
 serverless
+
+# Move into the newly created directory
+cd your-service-name
 ```
 
-_Note: Users in China are presented with setup centered around chinese [Tencent](https://intl.cloud.tencent.com/) provider. If you're based in China and prefer to be presented with steps as outside of China ensure `SERVERLESS_PLATFORM_VENDOR=aws` in your environment_
+The `serverless` command will guide you to create a new project, [configure your AWS credentials](https://serverless.com/framework/docs/providers/aws/guide/credentials/), and optionally set up a free [Serverless Dashboard](https://www.serverless.com/monitoring) account to monitor, troubleshoot, and test your new service.
 
-## Upgrade
+_Note: Users in China are presented with a setup centered around the chinese [Tencent](https://intl.cloud.tencent.com/) provider. If you are based in China and prefer to use AWS, set the following environment variable: `SERVERLESS_PLATFORM_VENDOR=aws`._
+
+The newly created project should contain a `serverless.yml` file. This file defines everything that should be deployed to AWS: functions, events, resources and more. You can learn more about this in the [Core Concepts documentation](./providers/aws/guide/intro.md).
 
-### MacOS/Linux
+If the templates proposed by the `serverless` command do not fit your needs, you can also explore the [project examples from Serverless Inc. and our community](https://www.serverless.com/examples/). You can install any example with the `create` command:
+
+```sh
+# replace folder-name below with the folder name of the example you want to use
+$ serverless create \
+  -u https://github.com/serverless/examples/tree/master/folder-name \
+  -n my-project
+```
+
+### Deploying
+
+If you haven't done so already within the `serverless` command, you can deploy the project at any time by running:
 
 ```bash
-serverless upgrade
+serverless deploy
 ```
 
-### Windows
+The deployed functions, resources and URLs will be displayed in the command output.
+
+### Invoking function
+
+If you deployed an API, query its URL to trigger the associated Lambda function. You can find that URL in the `serverless deploy` output, or retrieve it later via `serverless info`.
+
+If you deployed a function that isn't exposed via a URL, you can invoke it via:
 
 ```bash
-choco upgrade serverless
+serverless invoke -f hello
+
+# Invoke and display logs:
+serverless invoke -f hello --log
 ```
 
-### via npm
+### Fetching function logs
+
+All logs generated by a function's invocation are automatically stored in AWS CloudWatch. Retrieve those logs in the CLI via:
 
 ```bash
-npm update -g serverless
+serverless logs -f hello
+
+# Tail logs
+serverless logs -f hello --tail
 ```
 
-## Set up your free Pro account
+### Monitoring
 
-Learn more about [Serverless Framework Pro](https://serverless.com/pro/) and [sign up for free](https://app.serverless.com).
+You can monitor and debug Lambda functions and APIs via the [Serverless Dashboard](https://www.serverless.com/monitoring).
 
-Once you’ve signed up for Pro, login to your Pro dashboard from the CLI:
+To set up Serverless Dashboard, [create a free account](https://www.serverless.com/monitoring) and run the following command in your project:
 
 ```bash
-serverless login
+serverless
 ```
 
-You can either add a new service in your dashboard, or with the CLI, using the command:
+## Remove your service
+
+To delete your service, run `serverless remove`. This will delete all the AWS resources created by your project and ensure that you don't incur any unexpected charges. It will also remove the service from Serverless Dashboard.
 
 ```bash
-serverless
+serverless remove
 ```
diff --git a/docs/guides/access-roles.md b/docs/guides/access-roles.md
deleted file mode 100644
index 8cf986404da..00000000000
--- a/docs/guides/access-roles.md
+++ /dev/null
@@ -1,45 +0,0 @@
-<!--
-title: Serverless Dashboard - Access Roles
-menuText: Access Roles
-menuOrder: 2
-layout: Doc
--->
-
-<!-- DOCS-SITE-LINK:START automatically generated  -->
-
-### [Read this on the main serverless docs site](https://www.serverless.com/framework/docs/guides/access-roles/)
-
-<!-- DOCS-SITE-LINK:END -->
-
-> This document page is related to the deprecated dashboard. We advise using the updated dashboard at app.serverless.com and using the new [Providers feature to manage AWS connections](https://www.serverless.com/framework/docs/guides/providers/) for any new orgs created.
-
-# Access Roles
-
-You can use the Serverless Framework Dashboard to set up an AWS Access Role to help you secure your service deployments on AWS by enabling the Serverless Framework to issue temporary AWS Access Keys to deploy your services to AWS.
-
-If an Access Role is not configured, the Serverless Framework service will use AWS Access Keys stored in [environment variables](https://serverless.com/framework/docs/providers/aws/guide/credentials/) or [AWS Profiles](https://serverless.com/framework/docs/providers/aws/guide/credentials/) to deploy your service.
-
-With AWS Access Roles the AWS Access Keys are generated by Serverless Framework on every command and the credentials expire after one hour. The Serverless Framework leverages AWS Security Token Service and the AssumeRole API to automate creating and usage of temporary credentials, so your developers can stay productive and work securely without doing this manually.
-
-If you do not use the Serverless Framework Dashboard to set up an AWS Access Role, then you will need to configure your Serverless Framework open source CLI to use the AWS Access Keys stored in [environment variables](https://serverless.com/framework/docs/providers/aws/guide/credentials/) or [AWS Profiles](https://serverless.com/framework/docs/providers/aws/guide/credentials/).
-
-## Link your AWS Account
-
-1. Open the [Dashboard](https://app.serverless.com/)
-2. Once logged in, click "**profiles**" near the top of the page.
-3. Navigate to the profile you would like to configure with the AWS Access Role.
-4. In the **AWS account** tab, click **connect aws** button.
-5. Follow the instructions on AWS which will take you through creating an IAM Role for the Serverless Framework.
-6. Once the IAM Role is created, your profile will be automatically updated.
-
-## Use the generated AWS Access Keys in your service
-
-You don't have to do anything in your `serverless.yml` file. When you run `sls deploy` the Serverless Framework will identify the deployment profile associated with the application or stage and it will generate the AWS Access Keys using the associated AWS Access Role automatically.
-
-## Deploy using AWS Access Roles
-
-That’s it! You are now ready to deploy using your AWS Access Roles.
-
-```
-serverless deploy
-```
diff --git a/docs/guides/cicd/README.md b/docs/guides/cicd/README.md
index 1e1bd699b38..2bd22320870 100644
--- a/docs/guides/cicd/README.md
+++ b/docs/guides/cicd/README.md
@@ -1,7 +1,7 @@
 <!--
 title: Serverless Dashboard - CI/CD
 menuText: CI/CD
-menuOrder: 3
+menuOrder: 4
 layout: Doc
 -->
 
diff --git a/docs/guides/cicd/best-practices.md b/docs/guides/cicd/best-practices.md
index ced610f3ed7..440ded90ca9 100644
--- a/docs/guides/cicd/best-practices.md
+++ b/docs/guides/cicd/best-practices.md
@@ -13,7 +13,7 @@ layout: Doc
 
 # Serverless CI/CD Best Practices
 
-Serverless Framework Pro provides a lot of capabilities out of the box to help you manage and deploy
+Serverless Framework provides a lot of capabilities out of the box to help you manage and deploy
 your services. As your teams grow and the number of services grow, it can be difficult to know
 the best way to organize your services for scale.
 
diff --git a/docs/guides/cicd/custom-scripts.md b/docs/guides/cicd/custom-scripts.md
index 06ffe7680ac..d0ceaf7e577 100644
--- a/docs/guides/cicd/custom-scripts.md
+++ b/docs/guides/cicd/custom-scripts.md
@@ -13,7 +13,7 @@ layout: Doc
 
 # Custom scripts
 
-Serverless Framework Pro runs three primary operations on your repository when you have CI/CD configured: (1) install NPM packages via `npm install`, (2) run tests, if present, with `npm test`, and (3) deploy your service using `sls deploy`. You can run custom scripts before or after each of these steps if you need to customize the pipeline further.
+Serverless Framework runs three primary operations on your repository when you have CI/CD configured: (1) install NPM packages via `npm install`, (2) run tests, if present, with `npm test`, and (3) deploy your service using `sls deploy`. You can run custom scripts before or after each of these steps if you need to customize the pipeline further.
 
 To run custom scripts before & after NPM install and running tests, use the lifecycle hooks built into `scripts` of your `package.json` file. The `preinstall`, `postinstall`, `pretest`, and `posttest`, scripts are run automatically at each of these steps.
 
@@ -85,7 +85,7 @@ plugins:
 custom:
   scripts:
     hooks:
-      ‘before:deploy:deploy': <your script>
+      'before:deploy:deploy': <your script>
 ```
 
 **After serverless deploy**
@@ -98,7 +98,7 @@ plugins:
 custom:
   scripts:
     hooks:
-      ‘deploy:finalize’: <your script>
+      'deploy:finalize': <your script>
 ```
 
 ## Additional lifecycle hooks
diff --git a/docs/guides/cicd/faq.md b/docs/guides/cicd/faq.md
index f9903827997..62cd5574048 100644
--- a/docs/guides/cicd/faq.md
+++ b/docs/guides/cicd/faq.md
@@ -13,7 +13,7 @@ layout: Doc
 
 # Frequently Asked Questions
 
-# Is there a free tier?
+## Is there a free tier?
 
 Yes, up to 1 concurrent build with the Free tier. No credit card required, just sign up.
 
@@ -45,10 +45,6 @@ Yes! Serverless CI/CD is designed around the Serverless Framework to provide a s
 Anything you can deploy with the Serverless Framework you can deploy with Serverless CI/CD. The Serverless Framework is
 extensible with Plugins , so it works with a broad range of services.
 
-## Is Serverless CI/CD also available for Serverless Framework Pro Enterprise tier?
-
-Yes, Serverless CI/CD works with the Serverless Framework Pro Enterprise tier and it is available for self-hosting.
-
 ## Are all runtimes supported?
 
 Only the most popular runtimes, Node and Python, are currently supported. These two runtimes account for about 90% of
diff --git a/docs/guides/cicd/notifications.md b/docs/guides/cicd/notifications.md
index 7e6e1c75174..4c36a72569b 100644
--- a/docs/guides/cicd/notifications.md
+++ b/docs/guides/cicd/notifications.md
@@ -13,7 +13,7 @@ layout: Doc
 
 # Notifications
 
-Serverless Framework Pro has integrated Slack, email, SNS and webhook notifications for CI/CD status updates.
+Serverless Framework has integrated Slack, email, SNS and webhook notifications for CI/CD status updates.
 
 Notifications for CI/CD events are not setup by default, so you will not get notified of deployments starting,
 completing of failing. These notifications must be added manually.
diff --git a/docs/guides/cicd/preview-deployments.md b/docs/guides/cicd/preview-deployments.md
index aa7898a2278..e63f37e8885 100644
--- a/docs/guides/cicd/preview-deployments.md
+++ b/docs/guides/cicd/preview-deployments.md
@@ -37,7 +37,7 @@ Branch names may also include characters such as `/` which are invalid character
 
 ## Automatically deleting preview deployments (recommended)
 
-The recommended method for deleting preview service instances is to select "Destroy stage and resources when branch is deleted". If the changes in the PR are accepted then they will be merged and then the branch is deleted. If the changes are rejected the branch is also deleted. Whenever the branch is deleted, Serverless Framework Pro will automatically run `sls remove` on this service instance.
+The recommended method for deleting preview service instances is to select "Destroy stage and resources when branch is deleted". If the changes in the PR are accepted then they will be merged and then the branch is deleted. If the changes are rejected the branch is also deleted. Whenever the branch is deleted, Serverless Framework will automatically run `sls remove` on this service instance.
 
 ## Manually deleting preview deployments
 
diff --git a/docs/guides/cicd/running-in-your-own-cicd.md b/docs/guides/cicd/running-in-your-own-cicd.md
index ad245764192..17100de8bd5 100644
--- a/docs/guides/cicd/running-in-your-own-cicd.md
+++ b/docs/guides/cicd/running-in-your-own-cicd.md
@@ -48,7 +48,7 @@ Follow these steps to create an access token:
 5. Provide a name and press “Create”
 6. You will be presented with the access key on the new page.
 
-**Note**: The access token has permission to the tenant; however, it is associated with your account. If your account is deleted, then the access token will be revoked too.
+**Note**: The access token has permission to the org; however, it is associated with your account. If your account is deleted, then the access token will be revoked too.
 
 ### Configure environment variables
 
diff --git a/docs/guides/dashboard.md b/docs/guides/dashboard.md
index 2a208201cba..c8befead0dc 100644
--- a/docs/guides/dashboard.md
+++ b/docs/guides/dashboard.md
@@ -1,5 +1,5 @@
 <!--
-title: Serverless - Dashboard
+title: Serverless Dashboard
 menuText: Dashboard
 menuOrder: 1
 layout: Doc
@@ -15,7 +15,7 @@ layout: Doc
 
 The [Serverless Framework Dashboard](https://app.serverless.com/) is a SaaS solution that augments the Serverless Framework open source CLI to provide a powerful, unified experience to develop, deploy, test, secure and monitor your serverless applications.
 
-The Serverless Framework free tier gives developers full access to all features included in the Serverless Framework Dashboard, but is limited to 1,000,000 function invocations per month. If you are interested in expanding your usage of the Serverless Framework beyond the free tier [contact us](https://serverless.com/enterprise/contact/) for details re available plans and pricing.
+The Serverless Framework free tier gives developers full access to all features included in the Serverless Framework Dashboard, but is limited to 100,000 function invocations per month. If you are interested in expanding your usage of the Serverless Framework beyond the free tier [contact us](https://www.serverless.com/sales) for details re available plans and pricing.
 
 ## Minimum Version Requirements
 
@@ -29,13 +29,13 @@ Currently, the Serverless Framework Dashboard supports the following providers,
 - Runtimes: Node.js, Python
 - Regions: us-east-1, us-east-2, us-west-1, us-west-2, eu-central-1, eu-west-1, eu-west-2, eu-west-3, ap-northeast-1, ap-south-1, ap-southeast-1, ap-southeast-2, sa-east-1, ca-central-1
 
-Need unsupported providers, runtimes or regions? [Let us know](https://serverless.com/enterprise/) what you need. We are working hard to quickly expand our supported runtimes and regions.
+Need unsupported providers, runtimes or regions? [Let us know](https://www.serverless.com/sales) what you need. We are working hard to quickly expand our supported runtimes and regions.
 
-# Installing
+## Installing
 
 To get started with the Serverless Framework Dashboard, follow the [Getting Started with the Serverless Framework and AWS](/framework/docs/getting-started/) guide. When you run the `serverless` command, you will be asked if you would like to enable dashboard features.
 
-# Enabling the Dashboard on existing Serverless Framework services
+## Enabling the Dashboard on existing Serverless Framework services
 
 If you have an existing Serverless Framework service, it is incredibly easy to enable the Serverless Framework Dashboard features. Just follow the [Getting Started with the Serverless Framework and AWS](/framework/docs/getting-started/) guide to install update the Serverless Framework to the latest release.
 
diff --git a/docs/guides/monitoring/README.md b/docs/guides/monitoring/README.md
index 031f150a553..099eeb20e4d 100644
--- a/docs/guides/monitoring/README.md
+++ b/docs/guides/monitoring/README.md
@@ -19,9 +19,9 @@ Serverless Monitoring help you monitor, develop and optimize your serverless app
 
 Monitoring is enabled by default when you deploy a Service using the Serverless Framework CLI.
 
-### Configuration
+## Configuration
 
-Serverless Framework, when configured to connect to the Serverless Framework Pro Dashboard, will automatically collect three pieces of diagnostics:
+Serverless Framework, when configured to connect to the dashboard, will automatically collect three pieces of diagnostics:
 
 - Lambda Log Collection
 - AWS Spans
@@ -29,13 +29,13 @@ Serverless Framework, when configured to connect to the Serverless Framework Pro
 
 **Lambda Log Collection**
 
-Serverless Framework Pro will enable log collection by adding a CloudWatch Logs Subscription to send logs that match a particular pattern to our infrastructure for processing. This is used for generating metrics and alerts.
+Serverless Framework will enable log collection by adding a CloudWatch Logs Subscription to send logs that match a particular pattern to our infrastructure for processing. This is used for generating metrics and alerts.grep
 
 When deploying, Serverless Framework will also create an IAM role in your account that allows the Serverless Framework backend to call FilterLogEvents on the CloudWatch Log Groups that are created in the Service being deployed. This is used to display the CloudWatch logs error details views alongside the stack trace.
 
 If you have an existing CloudWatch Logs Subscription on your Log Group, please see the section on [pull-based log ingestion](#pull-based-log-ingestion).
 
-# If you wish to disable log collection, set the following options:
+## Disabling log collection
 
 If you wish to disable log collection, set the following option:
 
@@ -49,7 +49,7 @@ custom:
 
 **AWS Spans**
 
-Serverless Framework Pro will instrument the use of the AWS SDK to show use of AWS services by your Lambda function. This information provides
+Serverless Framework will instrument the use of the AWS SDK to show use of AWS services by your Lambda function. This information provides
 a valuable visualization of what is happening inside your lambda function, including how long calls to services like DynamoDB, S3 and others are taking.
 
 If you wish to disable AWS Span collection, set fhe following option:
@@ -64,7 +64,7 @@ custom:
 
 **HTTP(s) Spans**
 
-Serverless Framework Pro will instrument the use of HTTP(s) by your Lambda function. Much like the AWS Spans, HTTP(s) spans will provide a
+Serverless Framework will instrument the use of HTTP(s) by your Lambda function. Much like the AWS Spans, HTTP(s) spans will provide a
 visualization of the external communication that your function is invoking, including the duration of those sessions.
 
 If you wish to disable Http Span collection, set fhe following option:
@@ -104,7 +104,7 @@ package:
     - dist/*.js.map
 ```
 
-## Capturing non-fatal errors
+### Capturing non-fatal errors
 
 Your lambda function may throw an exception, but your function handles it in order to respond to the requestor without throwing the error. One very common example is functions tied to HTTP endpoints. Those usually should still return JSON, even if there is an error since the API Gateway integration will fail rather than returning a meaningful error.
 
@@ -132,13 +132,13 @@ module.exports.hello = async (event, context) => {
 
 [Full Python Documentation](../sdk/python.md#capture_exception)
 
-## AWS SDK spans
+### AWS SDK spans
 
 Serverless automatically instruments `aws-sdk` and `boto3`(`botocore` specifically) in NodeJS and
 Python. Calls(service & operation. eg: S3 putItem) to the SDK are show in the invocation detail
 in the dashboard.
 
-## HTTP spans
+### HTTP spans
 
 Serverless also instruments your lambdas to report the spans for HTTP & HTTPS requests. In NodeJS
 the `http` and `https` modules are instrumented, so any library built upon those will be captured.
@@ -150,7 +150,7 @@ provides more insight into the request.
 
 [Configuration docs](../sdk/#advanced-span-configuration)
 
-## Custom function spans
+### Custom function spans
 
 You can also instrument your own spans for services not covered by AWS SDK & HTTP span
 instrumentation such as databases.
@@ -170,13 +170,13 @@ module.exports.handler = async (event, context) => {
 
 [Full Python Documentation](../sdk/python.md#span)
 
-## Pull-based log ingestion
+### Pull-based log ingestion
 
-The default monitoring path for the Serverless Framework Pro involves setting up a Subscription Filter on your CloudWatch Log Group to send selected logs to the Serverless Framework Pro ingestion system.
+The default monitoring path for the Serverless Framework involves setting up a Subscription Filter on your CloudWatch Log Group to send selected logs to the Serverless Framework ingestion system.
 
-AWS currently has a hard limit of one Subscription Filter per Log Group. If you try to deploy with the Serverless Framework Pro plugin, you'll get an error saying the resource limit was exceeded.
+AWS currently has a hard limit of one Subscription Filter per Log Group. If you try to deploy with the Serverless Framework plugin, you'll get an error saying the resource limit was exceeded.
 
-If you want to keep your existing Subscription while still adding Serverless Framework Pro support, you can enable pull-based log ingestion using the following syntax in your `serverless.yml`:
+If you want to keep your existing Subscription while still adding Serverless Framework support, you can enable pull-based log ingestion using the following syntax in your `serverless.yml`:
 
 ```yaml
 custom:
@@ -184,6 +184,6 @@ custom:
     logIngestMode: pull
 ```
 
-With pull-based ingestion, the Serverless Framework Pro infrastructure will periodically request logs from your CloudWatch Log Group and send them into our system.
+With pull-based ingestion, the Serverless Framework infrastructure will periodically request logs from your CloudWatch Log Group and send them into our system.
 
-Please note that using the pull-based log ingestion method will result in delays in ingesting your logs. This delay is usually between 30 and 120 seconds. As such, we recommend only using the pull-based log ingestion method in a development environment or when testing the features of Serverless Framework Pro.
+Please note that using the pull-based log ingestion method will result in delays in ingesting your logs. This delay is usually between 30 and 120 seconds. As such, we recommend only using the pull-based log ingestion method in a development environment or when testing the features of Serverless Framework.
diff --git a/docs/guides/output-variables.md b/docs/guides/output-variables.md
index 5bdd7c9132c..debf1bce168 100644
--- a/docs/guides/output-variables.md
+++ b/docs/guides/output-variables.md
@@ -67,7 +67,14 @@ Outputs can also be accessed on the CLI. You can use this at development time to
 
 ### List outputs
 
-`sls output list [--org <org>] [--app <app>] [--service <service>] [--stage <stage>] [--region <region>]`
+```
+sls output list
+  [--org <org>]
+  [--app <app>]
+  [--service <service>]
+  [--stage <stage>]
+  [--region <region>]
+```
 
 If you are in a working directory with a `serverless.yml` then the outputs will be listed for the org, app, and service specified in the serverless.yml file.
 
@@ -75,7 +82,15 @@ If you are not in a working directory, without a `serverless.yml`, or if you wan
 
 ### Get an output
 
-`sls output get --name <name> [--org <org>] [--app <app>] [--service <service>] [--stage <stage>] [--region region]`
+```
+sls output get
+  --name <name>
+  [--org <org>]
+  [--app <app>]
+  [--service <service>]
+  [--stage <stage>]
+  [--region region]
+```
 
 Individual outputs can also be accessed from the CLI using the `output get` sub-command. This command requires the `--name <name>` flag to identify the output name.
 
diff --git a/docs/guides/parameters.md b/docs/guides/parameters.md
index cf6226a68ba..71ea90975d9 100644
--- a/docs/guides/parameters.md
+++ b/docs/guides/parameters.md
@@ -1,7 +1,7 @@
 <!--
-title: Serverless Dashboard - Parameters
+title: Serverless Framework - Parameters
 menuText: Parameters
-menuOrder: 6
+menuOrder: 2
 layout: Doc
 -->
 
@@ -13,44 +13,116 @@ layout: Doc
 
 # Parameters
 
-The Serverless Framework Dashboard enables you to create and manage parameters, helping you to configure and secure your services by securely storing parameters used by your Serverless Framework services. The [Serverless Framework Dashboard](https://app.serverless.com/) provides an interface to store and encrypt parameters and manage access to those parameters from your services. The Serverless Framework loads the parameters when the service is deployed.
+Parameters can be defined in `serverless.yml` or in [Serverless Dashboard](https://www.serverless.com/secrets). They can be used for example to:
 
-All parameters are treated as sensitive values, therefore they are always encrypted at rest, and only decrypted during deployment or to load them in the dashboard.
+- adapt the configuration based on the stage
+- store secrets securely
+- share configuration values between team members
 
-## Managing parameter using the dashboard
+## Stage parameters
 
-Parameters can be added to either services or instances.
+Parameters can be defined **for each stage** in `serverless.yml` under the `params` key:
 
-To manage parameters on the service, go to the **apps** section of the dashboard, and select **settings** under the **...** menu.
+```yaml
+params:
+  prod:
+    domain: myapp.com
+  dev:
+    domain: preview.myapp.com
+```
 
-To manage parameters on the instance, go to the **app** section of the dashboard, select the instance, and go to the **params** tab.
+Use the `default` key to define parameters that apply to all stages by default:
 
-### Inheritance and overriding
+```yaml
+params:
+  default:
+    domain: ${sls:stage}.preview.myapp.com
+  prod:
+    domain: myapp.com
+  dev:
+    domain: preview.myapp.com
+```
 
-Parameters set on instances take precedence over parameters set on services when deploying. If a parameter with the same key is set on both the instance and the service, then the value set on the instance will be used. If a parameter is set on the service, but not the instance, then the value set on the service will be used.
+Parameters can then be used via the `${param:XXX}` variables:
 
-This enables you to treat the parameters on services as defaults. This is especially useful in development when you may deploy instances to ephemeral stages (e.g. "feature-x"). In development the instance might not have any new parameters, therefore it will default to the parameters set on the service. However, in other stages, like "prod", or "staging", you may override the service-level parameters with instance-level parameters to use values unique to that stage.
+```yaml
+provider:
+  environment:
+    APP_DOMAIN: ${param:domain}
+```
 
-## Using a Parameter in serverless.yml
+The variable will be resolved based on the current stage.
 
-In your `serverless.yml` file add the variable `${param:<key>}` anywhere you would like to use the parameter. The `<key>` references the parameter key configured in the profile.
+## Serverless Dashboard parameters
 
-When you run `serverless deploy` the parameter values will be obtained, decrypted and used to replace the variables in the `serverless.yml` for the deployment.
+[Serverless Dashboard](https://www.serverless.com/secrets) lets you create and manage parameters, which is perfect for storing secrets securely or sharing configuration values across team members.
 
-## Use parameters from the command line
+On top of that, Dashboard parameters can be stored on the service (applies to all stages) or on a specific instance (applies to a specific stage).
 
-Parameters can also be accessed on the CLI. You can use this at development time to look up the parameters without opening the dashboard, or in your CI/CD pipeline to use the parameters in custom scripts.
+Dashboard parameters are treated as sensitive values, they are always encrypted at rest, and only decrypted during deployment or to view them in the dashboard.
 
-### List parameters
+Just like any other parameter, they can be used in `serverless.yml` via the `${param:XXX}` variables:
 
-`sls param list [--org <org>] [--app <app>] [--service <service>] [--stage <stage>] [--region <region>]`
+```yaml
+provider:
+  environment:
+    STRIPE_SECRET_KEY: ${param:stripeSecret}
+```
 
-If you are in a working directory with a `serverless.yml` then the parameters will be listed for the org, app, and service specified in the `serverless.yml` file.
+### Creating Serverless Dashboard parameters
 
-If you are not in a working directory, without a `serverless.yml`, or if you want to access parameters from another org, app, service, stage, or region, you can pass in the optional flags.
+Parameters can be created in the [Dashboard](https://app.serverless.com/) at the service level (applies to all stages) or instance level (stage-specific).
 
-### Get a parameter
+To manage parameters on a service, go to the **apps** section of the dashboard, and select **settings** under the **...** menu.
 
-`sls param get --name <name> [--org <org>] [--app <app>] [--service <service>] [--stage <stage>] [--region <region>]`
+To manage parameters on an instance, go to the **app** section of the dashboard, select the instance, and go to the **params** tab.
+
+### Retrieving parameters from the command line
+
+Dashboard parameters can also be accessed on the CLI. You can use this at development time to look up the parameters without opening the dashboard, or in your CI/CD pipeline to use the parameters in custom scripts.
+
+#### List parameters
+
+If you are in a directory with a `serverless.yml`, the parameters will be listed for the org, app, and service specified in the `serverless.yml` file:
+
+```bash
+serverless param list [--stage <stage>]
+```
+
+If you are in a directory without a `serverless.yml`, or if you want to access parameters from another org, app, service, stage, or region, you can pass in the optional flags:
+
+```bash
+serverless param list
+  [--org <org>]
+  [--app <app>]
+  [--service <service>]
+  [--stage <stage>]
+  [--region <region>]
+```
+
+#### Get a parameter
 
 Individual parameters can also be accessed from the CLI using the `param get` sub-command. This command requires the `--name <name>` flag to identify the parameter name. Like the `sls param list`, you can optionally specify a different org, app, service, stage, ore region using flags.
+
+```bash
+serverless param get --name <name>
+  [--org <org>]
+  [--app <app>]
+  [--service <service>]
+  [--stage <stage>]
+  [--region <region>]
+```
+
+## Inheritance and overriding
+
+Parameters can be defined in `serverless.yml` per stage, as well as in Serverless Dashboard on the service or the instance (stage). Here is the priority used to resolve a `${param:XXX}` variable:
+
+- First, look in `params.<stage>` in `serverless.yml`
+- If not found, then look in the instance's parameters in the Dashboard
+- If not found, then look in `params.default` in `serverless.yml`
+- If not found, then look in the service's parameters in the Dashboard
+- If not found, throw an error, or use the fallback value if one was provided: `${param:XXX, 'default value'}`
+
+This gives you flexibility to mix `serverless.yml` parameters as well as secure Serverless Dashboard parameters.
+
+This is especially useful in development when deploying to ephemeral stages (e.g. "feature-x"). The stage might not have any parameter, therefore it will default to the parameters set on the service. However, in other stages, like "prod", or "staging", you may override the service-level parameters with stage-level parameters to use values unique to that stage.
diff --git a/docs/guides/plugins/README.md b/docs/guides/plugins/README.md
new file mode 100644
index 00000000000..1b4265101c5
--- /dev/null
+++ b/docs/guides/plugins/README.md
@@ -0,0 +1,87 @@
+<!--
+title: Serverless Framework - Plugins
+menuText: Plugins
+menuOrder: 3
+description: How to install plugins to customize the Serverless Framework
+layout: Doc
+-->
+
+<!-- DOCS-SITE-LINK:START automatically generated  -->
+
+### [Read this on the main serverless docs site](https://www.serverless.com/framework/docs/guides/plugins)
+
+<!-- DOCS-SITE-LINK:END -->
+
+# Plugins
+
+A plugin is custom JavaScript code that extends the Serverless Framework with new features.
+
+If you or your organization have a specific workflow, install a pre-written plugin or write one to customize the Framework to your needs.
+
+Since the Serverless Framework is a group of "core" plugins, custom plugins are written exactly the same way as core plugins. Learn more about [creating a custom plugin](creating-plugins.md).
+
+Explore existing plugins in the [Serverless Framework Plugins repository](https://www.serverless.com/plugins).
+
+## Installing plugins
+
+Plugins are installed per service. They are not applied globally.
+
+To install a plugin, run the following command in a service directory:
+
+```
+serverless plugin install -n custom-serverless-plugin
+```
+
+This command will install the plugin via NPM and register it in `serverless.yml`.
+
+You can also install the plugin manually via NPM:
+
+```
+npm install --save custom-serverless-plugin
+```
+
+and then register it in `serverless.yml` in the `plugins` section:
+
+```yml
+# serverless.yml file
+
+plugins:
+  - custom-serverless-plugin
+```
+
+Some plugins require extra configuration. The `custom` section in `serverless.yml` is where you can add extra configuration for plugins (the plugin's documentation will tell you if you need to add anything there):
+
+```yml
+plugins:
+  - custom-serverless-plugin
+
+custom:
+  customkey: customvalue
+```
+
+Note for plugin authors: read [Extending the configuration](custom-configuration.md) to learn how to enhance `serverless.yml` with configuration validation.
+
+## Service local plugin
+
+If you are working on a plugin, or have a plugin that is just designed for one project, it can be loaded from local files:
+
+```yml
+plugins:
+  - ./local-directory/custom-serverless-plugin
+```
+
+The path must start with `./` and is relative to the root of your service.
+
+## Load Order
+
+Keep in mind that the order you define your plugins matters. Serverless loads all the core plugins, and then the custom plugins in the order you've defined them.
+
+```yml
+# serverless.yml
+
+plugins:
+  - plugin1
+  - plugin2
+```
+
+In this case `plugin1` is loaded before `plugin2`.
diff --git a/docs/guides/plugins/cli-output.md b/docs/guides/plugins/cli-output.md
new file mode 100644
index 00000000000..d7f32ac00f3
--- /dev/null
+++ b/docs/guides/plugins/cli-output.md
@@ -0,0 +1,263 @@
+<!--
+title: Serverless Framework - Plugins - CLI output
+menuText: CLI output
+menuOrder: 2
+description: How to write to the CLI output in Serverless Framework plugins.
+layout: Doc
+-->
+
+<!-- DOCS-SITE-LINK:START automatically generated  -->
+
+### [Read this on the main serverless docs site](https://www.serverless.com/framework/docs/guides/plugins/cli-output)
+
+<!-- DOCS-SITE-LINK:END -->
+
+# CLI output in plugins
+
+Plugins can integrate and extend the CLI output of the Serverless Framework in different ways.
+
+## Writing to the output
+
+In Serverless Framework v2, plugins could write to the CLI output via `serverless.cli.log()`:
+
+```js
+// This approach is deprecated:
+serverless.cli.log('Message');
+```
+
+The method above is deprecated. It should no longer be used in Serverless Framework v3.
+
+Instead, plugins can log messages to the CLI output via a standard `log` interface:
+
+```js
+class MyPlugin {
+  constructor(serverless, cliOptions, { log }) {
+    log.error('Error');
+    log.warning('Warning');
+    log.notice('Message');
+    log.info('Verbose message'); // --verbose log
+    log.debug('Debug message'); // --debug log
+  }
+}
+```
+
+Some aliases exist to make log levels more explicit:
+
+```js
+log('Here is a message');
+// is an alias to:
+log.notice('Here is a message');
+
+log.verbose('Here is a verbose message'); // displayed with --verbose
+// is an alias to:
+log.info('Here is a verbose message'); // displayed with --verbose
+```
+
+To write a formatted "success" message, use the following helper:
+
+```js
+log.success('The task executed with success');
+```
+
+Log methods also support the printf format:
+
+```js
+log.warning('Here is a %s log', 'formatted');
+```
+
+**Best practices:**
+
+- **Keep the default CLI output minimal.**
+- Log most information to the `--verbose` output.
+- Warnings should be used exceptionally. Consider whether the plugin should instead throw an exception, log a `--verbose` message or trigger a deprecation (see below).
+- Before using `log.error()`, consider [throwing an exception](#errors): exceptions are automatically caught by the Serverless Framework and formatted with details.
+- Debugging logs should be logged to the `--debug` level. Debug logs can be namespaced following the [`debug` convention](https://github.com/visionmedia/debug#usage) via `log.get('my-namespace').debug('Debug message')`. Such logs can then be filtered in the CLI output via `--debug=plugin-name:my-namespace`.
+
+**By default, logs are written to `stderr`**, which displays in terminals (humans cannot tell the difference). This is intentional: plugins can safely log extra messages to any command, even commands meant to be piped or parsed by another program. Read the next section to learn more.
+
+### Writing command output to `stdout`
+
+By default, plugins should write messages to `stderr` via the `log` object. To write command output to `stdout` instead, use `writeText()`:
+
+```js
+class MyPlugin {
+  constructor(serverless, cliOptions, { writeText }) {
+    writeText('Command output');
+    writeText(['Here is a', 'multi-line output']);
+  }
+}
+```
+
+**Best practices:**
+
+- `stdout` output is usually meant to be piped to/parsed by another program.
+- Plugins should only write to `stdout` in commands they define (to avoid breaking the output of other commands).
+- The only content written to `stdout` should be the main output of the command.
+
+Take, for example, the `serverless invoke` command:
+
+- Its output is the result of the Lambda invocation: by writing that result (and only that) to `stdout`, it allows any script to parse the result of the Lambda invocation.
+- All other messages should be written to `stderr`: such logs are useful to humans, for example configuration warnings, upgrade notifications, Lambda logs… Since they are written to `stderr`, they do not break the parsable output of `stdout`.
+
+**If unsure, write to `stderr`** (with the `log` object) instead of `stdout`. Why: human users will not see any difference, but the door will stay open to write a parsable output later in the future.
+
+### Colors and formatting
+
+To format and color text output, use the [chalk](https://github.com/chalk/chalk) package. For example:
+
+```js
+log.notice(chalk.gray('Here is a message'));
+```
+
+**Best practices:**
+
+- Write primary information in **white**, secondary information in **gray**.
+  - Primary information is the direct outcome of a command (e.g. deployment result of the `deploy` command, or result of the `invoke` command). Secondary information is everything else.
+- Plugins should generally not use any other color, nor introduce any other custom formatting. Output formatting is meant to be minimalistic.
+- Plugins should use built-in formats documented in this page: success messages (`log.success()`), interactive progress…
+
+The "Serverless red" color (`#fd5750`) is used to grab the user's attention:
+
+- It should be used minimally, and maximum once per command.
+- It should be used only to grab attention to the command's most important information.
+
+## Errors
+
+The Serverless Framework differentiates between 2 errors:
+
+- user errors (wrong input, invalid configuration, etc.)
+- programmer errors (aka bugs)
+
+To throw a **user error** and have it properly formatted, use Serverless' error class:
+
+```js
+throw new serverless.classes.Error('Invalid configuration in X');
+```
+
+All other errors are considered programmer errors by default (and are properly formatted in the CLI output as well).
+
+**Best practices:**
+
+- If an error should stop the execution of the command, use `throw`.
+- If an error should _not_ stop the execution of the command (which should be exceptional), log it via `log.error()`.
+  - For example any execution error in `serverless-offline` should not stop the local server.
+
+## Interactive progress
+
+Plugins can create an interactive progress:
+
+```js
+class MyPlugin {
+  constructor(serverless, cliOptions, { progress }) {
+    const myProgress = progress.create({
+      message: 'Doing extra work in my-plugin',
+    });
+    // ...
+    myProgress.update('Almost finished');
+    // ...
+    myProgress.remove();
+  }
+}
+```
+
+In case of parallel processing (for example compiling multiple files in parallel), it is possible to create multiple progress items if that is useful to users.
+
+**Best practices:**
+
+- Create a progress for tasks that usually take **more than 2 seconds**. Below that threshold, plugins can operate silently and log to `--verbose` only.
+- Users should know which plugin is working from the progress message:
+  - Bad: "Compiling"
+  - Bad: "[Webpack] Compiling" (avoid prefixes)
+  - Good: "Compiling with webpack"
+- Displaying multiple progresses should be exceptional, and limited to 3-4 progresses at a time. It is better to keep the output minimal than too noisy.
+
+Note that it is possible to give a unique name to a progress. That name can be used to retrieve the progress without having to pass the instance around:
+
+```js
+// Progress without any name:
+const myProgress = progress.create({
+  message: 'Doing extra work in my-plugin',
+});
+
+// Progress with a unique name
+progress.create({
+  message: 'Doing extra work in my-plugin',
+  name: 'my-plugin-progress', // Try to make the name unique across all plugins
+});
+// elsewhere...
+progress.get('my-plugin-progress').update('Almost finished');
+// elsewhere...
+progress.get('my-plugin-progress').remove();
+```
+
+## Service information
+
+Plugins can add their own sections to the "Service information", i.e. the information displayed after `serverless deploy` or in `serverless info`.
+
+To add a single item:
+
+```js
+serverless.addServiceOutputSection('my section', 'content');
+```
+
+The example above will be displayed as:
+
+```
+$ serverless info
+functions:
+  ...
+my section: content
+```
+
+To add a multi-line section:
+
+```js
+serverless.addServiceOutputSection('my section', ['line 1', 'line 2']);
+```
+
+The example above will be displayed as:
+
+```
+$ serverless info
+functions:
+  ...
+my section:
+  line 1
+  line 2
+```
+
+## Deprecations
+
+Plugins can signal deprecated features to users via `logDeprecation()`:
+
+```js
+serverless.logDeprecation(
+  'DEPRECATION_CODE',
+  'Feature X of my-plugin is deprecated. Please use Y instead.'
+);
+```
+
+These deprecations will integrate with the deprecation system of the Serverless Framework.
+
+**Best practices:**
+
+- Prefix the deprecation code with the plugin name, for example: `OFFLINE_XXX`.
+- Make the message actionable for users: if a feature is deprecated, what should users use instead? Feel free to add links if necessary.
+
+## Retrieving the I/O API
+
+As shown in the examples above, the I/O API is injected in the constructor of plugins:
+
+```js
+class MyPlugin {
+  constructor(serverless, cliOptions, { writeText, log, progress }) {
+    // ...
+  }
+}
+```
+
+However, it is also possible to retrieve it from any JavaScript file by requiring the `@serverless/utils` package:
+
+```js
+const { writeText, log, progress } = require('@serverless/utils/log');
+```
diff --git a/docs/guides/plugins/creating-plugins.md b/docs/guides/plugins/creating-plugins.md
new file mode 100644
index 00000000000..94b1e6565c8
--- /dev/null
+++ b/docs/guides/plugins/creating-plugins.md
@@ -0,0 +1,189 @@
+<!--
+title: Serverless Framework - Creating plugins
+menuText: Creating plugins
+menuOrder: 1
+description: How to create custom plugins to customize the Serverless Framework
+layout: Doc
+-->
+
+<!-- DOCS-SITE-LINK:START automatically generated  -->
+
+### [Read this on the main serverless docs site](https://www.serverless.com/framework/docs/guides/plugins/creating-plugins)
+
+<!-- DOCS-SITE-LINK:END -->
+
+# Creating custom plugins
+
+Creating a custom plugin lets you:
+
+- [Hook into _lifecycle events_ to add new logic](#lifecycle-events)
+- [Define new CLI commands](custom-commands.md)
+- [Define new variable sources](custom-variables.md)
+- [Extend the `serverless.yml` syntax](custom-configuration.md)
+- [Write extra information to the CLI output](cli-output.md)
+- Add support for new cloud providers
+
+## Creating a plugin
+
+The simplest way to create a Serverless Framework plugin is to write a JavaScript file:
+
+```javascript
+'use strict';
+
+class MyPlugin {
+  constructor() {
+    // The plugin is loaded
+  }
+}
+
+module.exports = MyPlugin;
+```
+
+The plugin can then be loaded in `serverless.yml` via a local path:
+
+```yaml
+# serverless.yml
+service: app
+
+functions:
+  # ...
+
+plugins:
+  - ./my-plugin.js
+```
+
+### Distributing a plugin via NPM
+
+Plugins can also be published to NPM and later installed in separate projects.
+
+To correctly configure the plugin's NPM package, set the `main` property to point to your plugin file in `package.json`:
+
+```json
+{
+  "main": "my-plugin.js"
+}
+```
+
+It is also a good practice to add `serverless` to the `peerDependencies` section. That ensures that your plugin runs only with the Serverless Framework versions it supports.
+
+```json
+{
+  ...
+  "peerDependencies": {
+    "serverless": "^2.60 || 3"
+  }
+}
+```
+
+Once the plugin is published on NPM, follow the documentation on [Installing plugins](README.md) to use the custom plugin.
+
+## Lifecycle events
+
+Lifecycle events are events that fire sequentially during a CLI command.
+
+Additionally, for each event an additional `before` and `after` event is created. For example:
+
+- `before:package:package`
+- `package:package`
+- `after:package:package`
+- `before:deploy:deploy`
+- `deploy:deploy`
+- `after:deploy:deploy`
+
+The `initialize` event is shared across all CLI commands and runs when the CLI starts.
+
+Plugins can "hook" into existing lifecycle events to add behavior to commands like `deploy`, `package`, etc. via the `hooks` helper:
+
+```javascript
+'use strict';
+
+class MyPlugin {
+  constructor() {
+    this.hooks = {
+      'initialize': () => this.init(),
+      'before:deploy:deploy': () => this.beforeDeploy(),
+      'after:deploy:deploy': () => this.afterDeploy(),
+    };
+  }
+
+  init() {
+    // Initialization
+  }
+
+  beforeDeploy() {
+    // Before deploy
+  }
+
+  afterDeploy() {
+    // After deploy
+  }
+}
+
+module.exports = MyPlugin;
+```
+
+Plugins can also create their own commands (with their own lifecycle events): read the [Custom commands documentation](custom-commands.md).
+
+## Serverless instance
+
+The `serverless` parameter provides access to the service configuration at runtime:
+
+```javascript
+'use strict';
+
+class MyPlugin {
+  constructor(serverless) {
+    this.serverless = serverless;
+    this.hooks = {
+      initialize: () => this.init(),
+    };
+  }
+
+  init() {
+    console.log('Serverless instance: ', this.serverless);
+
+    // `serverless.service` contains the (resolved) serverless.yml config
+    const service = this.serverless.service;
+    console.log('Provider name: ', service.provider.name);
+    console.log('Functions: ', service.functions);
+  }
+}
+
+module.exports = MyPlugin;
+```
+
+**Note:** configuration values are only resolved _after_ plugins are initialized. Do not try to read configuration in the plugin constructor, as variables aren't resolved yet. Read configuration in lifecycle events only.
+
+## CLI options
+
+The `options` parameter provides access to the CLI options provided to the command:
+
+```javascript
+class MyPlugin {
+  constructor(serverless, options) {
+    // Log if a --verbose option was passed:
+    console.log(options.verbose);
+  }
+}
+```
+
+## Provider-specific plugins
+
+Plugins can be provider specific, which means that run only with a specific provider.
+
+**Note:** Binding a plugin to a provider is optional. Serverless will always consider your plugin if you don't specify a `provider`.
+
+To bind to a specific provider, retrieve it and set the `this.provider` property in the plugin constructor:
+
+```javascript
+class MyPlugin {
+  constructor(serverless, options) {
+    // bind to a specific provider
+    this.provider = serverless.getProvider('providerX');
+
+    // ...
+  }
+}
+```
+
+The plugin will now only be executed when the service's provider matches the given provider.
diff --git a/docs/guides/plugins/custom-commands.md b/docs/guides/plugins/custom-commands.md
new file mode 100644
index 00000000000..76f5b17f1d5
--- /dev/null
+++ b/docs/guides/plugins/custom-commands.md
@@ -0,0 +1,125 @@
+<!--
+title: Serverless Framework - Plugins - Custom commands
+menuText: Custom commands
+menuOrder: 3
+description: How to create custom Serverless Framework commands via a plugin
+layout: Doc
+-->
+
+<!-- DOCS-SITE-LINK:START automatically generated  -->
+
+### [Read this on the main serverless docs site](https://www.serverless.com/framework/docs/guides/plugins/custom-commands)
+
+<!-- DOCS-SITE-LINK:END -->
+
+# Custom commands
+
+Serverless Framework plugins can define custom CLI commands.
+
+These commands can then be called by users, for example: `serverless my-command`.
+
+```javascript
+class MyPlugin {
+  constructor() {
+    this.commands = {
+      'my-command': {
+        lifecycleEvents: ['resources', 'functions'],
+      },
+    };
+  }
+}
+
+module.exports = MyPlugin;
+```
+
+A CLI _Command_ that can be called by a user, e.g. `serverless foo`. A Command has no logic, but simply defines the CLI configuration (e.g. command, parameters) and the _Lifecycle Events_ for the command. Every command defines its own lifecycle events.
+
+## Lifecycle events
+
+By default, a command has no logic. Use _lifecycle event hooks_ to add logic when the command runs:
+
+```javascript
+class MyPlugin {
+  constructor() {
+    this.commands = {
+      'my-command': {
+        lifecycleEvents: ['run'],
+      },
+    };
+
+    this.hooks = {
+      'my-command:run': () => {
+        // Do something
+      },
+    };
+  }
+}
+```
+
+For each event, an additional `before` and `after` event is created:
+
+```js
+this.hooks = {
+  'before:my-command:run': () => {
+    // Before my command runs
+  },
+  'my-command:run': () => {
+    // My command runs
+  },
+  'after:my-command:run': () => {
+    // After
+  },
+};
+```
+
+Note that a command can define multiple events: these will be called sequentially.
+
+## Command options
+
+Commands can have CLI options:
+
+- either passed with a double dash (`--`): `serverless my-command --function functionName`.
+- or as a shortcut with a single dash (`-`): `serverless my-command -f functionName`.
+
+Options can be specified in the command definition. The value of the CLI option can be retrieved via the `options` parameter of the plugin:
+
+```javascript
+class MyPlugin {
+  constructor(serverless, options) {
+    this.options = options;
+
+    this.commands = {
+      'my-command': {
+        // The 'usage' property is used to display the 'serverless --help' output
+        usage: 'This is my new custom command!',
+        lifecycleEvents: ['run'],
+        options: {
+          // Define the '--function' option with the '-f' shortcut
+          function: {
+            usage: 'Specify the function you want to handle (e.g. "--function myFunction")',
+            shortcut: 'f',
+            required: true,
+            type: 'string', // Possible values: 'string', 'boolean', 'multiple'
+          },
+        },
+      },
+    };
+
+    this.hooks = {
+      'my-command:run': () => this.run(),
+    };
+  }
+
+  run() {
+    console.log('The option was: ', this.options.function);
+  }
+}
+```
+
+If an option is not required, a `default` property can be set in the option definition.
+
+## Command naming
+
+Command names must be unique across all plugins. For example instead of defining a custom `deploy` command, name it `my-company-deploy` instead.
+
+If a plugin defines a command name that conflicts with Serverless Framework core or another plugin, the CLI will exit with an error.
diff --git a/docs/guides/plugins/custom-configuration.md b/docs/guides/plugins/custom-configuration.md
new file mode 100644
index 00000000000..3f1cf75133a
--- /dev/null
+++ b/docs/guides/plugins/custom-configuration.md
@@ -0,0 +1,345 @@
+<!--
+title: Serverless Framework - Plugins - Extending the configuration
+menuText: Extending the configuration
+menuOrder: 5
+description: How to extend the serverless.yml syntax with custom configuration via a plugin
+layout: Doc
+-->
+
+<!-- DOCS-SITE-LINK:START automatically generated  -->
+
+### [Read this on the main serverless docs site](https://www.serverless.com/framework/docs/guides/plugins/custom-configuration)
+
+<!-- DOCS-SITE-LINK:END -->
+
+# Extending the configuration
+
+Plugin can extend the `serverless.yml` syntax with custom configuration:
+
+```yaml
+service: app
+provider:
+  name: aws
+
+# ...
+
+my-plugin:
+  my-plugin-config: foo
+```
+
+To do so, plugins must define schema validation (see below), and can retrieve configuration values via `serverless.service`:
+
+```js
+class MyPlugin {
+  constructor(serverless) {
+    this.serverless = serverless;
+    this.hooks = {
+      'before:deploy': () => this.beforeDeploy(),
+    };
+  }
+
+  beforeDeploy() {
+    // `service` contains the (resolved) serverless.yml config
+    const service = this.serverless.service;
+    console.log('Provider name: ', service.provider.name);
+    console.log('Functions: ', service.functions);
+    console.log('Custom plugin config: ', service['my-plugin']['my-plugin-config']);
+  }
+}
+
+module.exports = MyPlugin;
+```
+
+**Note:** configuration values are only resolved _after_ plugins are initialized. Do not try to read configuration in the plugin constructor, as variables aren't resolved yet. Read configuration in lifecycle events only.
+
+## Validating the configuration
+
+Any additional configuration defined by plugins in `serverless.yml` must come with validation rules.
+
+Serverless Framework uses JSON schema validation backed by [the AJV library](https://github.com/ajv-validator/ajv). You can extend [the base schema](/lib/configSchema/index.js) in plugins via:
+
+- `defineTopLevelProperty`
+- `defineCustomProperties`
+- `defineFunctionEvent`
+- `defineFunctionEventProperties`
+- `defineFunctionProperties`
+- `defineProvider`
+
+Use the following map to know which helper suits your needs:
+
+```yml
+custom:
+  my-plugin:
+    customProperty: foobar # <-- use defineCustomProperties
+
+my-plugin: # <-- use defineTopLevelProperty
+  customProperty: foobar
+
+provider:
+  name: new-provider # <-- use defineProvider
+  my-plugin:
+    customProperty: foobar
+
+functions:
+  someFunc:
+    handler: handler.main
+    customProperty: foobar # <-- use defineFunctionProperties
+    events:
+      - yourPluginEvent: # <-- use defineFunctionEvent
+          customProperty: foobar
+      - http:
+          customProperty: foobar # <-- use defineFunctionEventProperties
+```
+
+We'll walk though those helpers. You may also want to check out examples from [helpers tests](tests/fixtures/configSchemaExtensions/test-plugin.js)
+
+### Top-level properties via `defineTopLevelProperty`
+
+If your plugin requires additional top-level properties (like `provider`, `custom`, `service`...), you can use the `defineTopLevelProperty` helper to add their definition. For example:
+
+```yml
+# serverless.yml
+service: my-service
+
+myPlugin:
+  someProperty: foobar
+```
+
+Add validation for the `myPlugin:` section:
+
+```javascript
+class MyPlugin {
+  constructor(serverless) {
+    // For reference on JSON schema, see https://github.com/ajv-validator/ajv
+    serverless.configSchemaHandler.defineTopLevelProperty('myPlugin', {
+      type: 'object',
+      properties: {
+        someProperty: { type: 'string' },
+      },
+      required: ['someProperty'],
+    });
+  }
+}
+```
+
+This way, if the user sets `someProperty` by mistake to `false`, the Framework would display an error:
+
+```
+Configuration error: yourPlugin.someProperty should be string
+```
+
+### Properties in `custom` via `defineCustomProperties`
+
+If your plugin depends on properties defined in the `custom:` section, you can use the `defineCustomProperties` helper. For example:
+
+```yml
+# serverless.yml
+
+custom:
+  myCustomProperty: foobar
+```
+
+Add validation for the `myCustomProperty` property:
+
+```javascript
+class MyPlugin {
+  constructor(serverless) {
+    // For reference on JSON schema, see https://github.com/ajv-validator/ajv
+    serverless.configSchemaHandler.defineCustomProperties({
+      type: 'object',
+      properties: {
+        myCustomProperty: { type: 'string' },
+      },
+      required: ['myCustomProperty'],
+    });
+  }
+}
+```
+
+This way, if the user sets `myCustomProperty` by mistake to `false`, the Framework would display an error:
+
+```
+Configuration error: custom.myCustomProperty should be string
+```
+
+### Function properties via `defineFunctionProperties`
+
+If your plugin adds new properties to functions, you can use the `defineFunctionProperties` helper. For example:
+
+```yml
+# serverless.yml
+
+functions:
+  foo:
+    handler: handler.main
+    someCustomProperty: my-property-value
+```
+
+Add validation for the `someCustomProperty` property:
+
+```javascript
+class MyPlugin {
+  constructor(serverless) {
+    // For reference on JSON schema, see https://github.com/ajv-validator/ajv
+    serverless.configSchemaHandler.defineFunctionProperties('providerName', {
+      properties: {
+        someCustomProperty: { type: 'string' },
+        anotherProperty: { type: 'number' },
+      },
+      required: ['someCustomProperty'],
+    });
+  }
+}
+```
+
+This way, if the user sets `anotherProperty` by mistake to `hello`, the Framework would display an error:
+
+```
+Configuration error at 'functions.foo.anotherProperty': should be number
+```
+
+### Function events via `defineFunctionEvent`
+
+If your plugin adds support to a new function event, you can use the `defineFunctionEvent` helper. For example:
+
+```yml
+# serverless.yml
+
+functions:
+  someFunc:
+    handler: handler.main
+    events:
+      - myPluginEvent:
+          someProp: hello
+          anotherProp: 1
+```
+
+Add validation for the `myPluginEvent` event:
+
+```javascript
+class MyPlugin {
+  constructor(serverless) {
+    // For reference on JSON schema, see https://github.com/ajv-validator/ajv
+    serverless.configSchemaHandler.defineFunctionEvent('providerName', 'myPluginEvent', {
+      type: 'object',
+      properties: {
+        someProp: { type: 'string' },
+        anotherProp: { type: 'number' },
+      },
+      required: ['someProp'],
+      additionalProperties: false,
+    });
+  }
+}
+```
+
+This way, if the user sets `anotherProp` by mistake to `some-string`, the Framework would display an error:
+
+```
+Configuration error: functions.someFunc.events[0].myPluginEvent.anotherProp should be number
+```
+
+### Function event properties via `defineFunctionEventProperties`
+
+If your plugin adds new properties to a function event, you can use the `defineFunctionEventProperties` helper. For example:
+
+```yml
+# serverless.yml
+
+functions:
+  foo:
+    handler: handler.main
+    events:
+      - http:
+          path: '/quote'
+          method: GET
+          documentation: Get a quote
+```
+
+In the example above, the plugin adds a new `documentation` property on `http` events for `aws`. To validate that properties:
+
+```javascript
+class MyPlugin {
+  constructor(serverless) {
+    // For reference on JSON schema, see https://github.com/ajv-validator/ajv
+    serverless.configSchemaHandler.defineFunctionEventProperties('aws', 'http', {
+      properties: {
+        documentation: { type: 'string' },
+      },
+      required: ['documentation'],
+    });
+  }
+}
+```
+
+This way, if the user sets `documentation` by mistake to `false`, the Framework would display an error:
+
+```
+Configuration error: functions.foo.events[0].http.documentation should be a string
+```
+
+### New provider via `defineProvider`
+
+If your plugin provides support for a new provider, register it via `defineProvider`:
+
+```javascript
+class MyPlugin {
+  constructor(serverless) {
+    // For reference on JSON schema, see https://github.com/ajv-validator/ajv
+    serverless.configSchemaHandler.defineProvider('newProvider', {
+      // Eventual reusable schema definitions (will be put to top level "definitions" object)
+      definitions: {
+        // ...
+      },
+
+      // Top level "provider" properties
+      provider: {
+        properties: {
+          stage: { type: 'string' },
+          remoteFunctionData: { type: 'null' },
+        },
+      },
+
+      // Function level properties
+      function: {
+        properties: { handler: { type: 'string' } },
+      },
+
+      // Function events definitions (can be defined here or via `defineFunctionEvent` helper)
+      functionEvents: {
+        someEvent: {
+          name: 'someEvent',
+          schema: {
+            type: 'object',
+            properties: {
+              someRequiredStringProp: { type: 'string' },
+              someNumberProp: { type: 'number' },
+            },
+            required: ['someRequiredStringProp'],
+            additionalProperties: false,
+          },
+        },
+      },
+
+      // Definition for eventual top level "resources" section
+      resources: {
+        type: 'object',
+        properties: {
+          // ...
+        },
+      },
+
+      // Definition for eventual top level "layers" section
+      layers: {
+        type: 'object',
+        additionalProperties: {
+          type: 'object',
+          properties: {
+            // ...
+          },
+        },
+      },
+    });
+  }
+}
+```
diff --git a/docs/guides/plugins/custom-variables.md b/docs/guides/plugins/custom-variables.md
new file mode 100644
index 00000000000..a7233ad81d7
--- /dev/null
+++ b/docs/guides/plugins/custom-variables.md
@@ -0,0 +1,128 @@
+<!--
+title: Serverless Framework - Plugins - Custom variables
+menuText: Custom variables
+menuOrder: 4
+description: How to create custom Serverless Framework variables via a plugin
+layout: Doc
+-->
+
+<!-- DOCS-SITE-LINK:START automatically generated  -->
+
+### [Read this on the main serverless docs site](https://www.serverless.com/framework/docs/guides/plugins/custom-variables)
+
+<!-- DOCS-SITE-LINK:END -->
+
+# Custom variables
+
+Plugins can register custom variables sources, for example `${foo:some-variable}`.
+
+Custom sources can be registered via `configurationVariablesSources` as an object with a `resolve` function:
+
+```javascript
+'use strict';
+
+class MyPlugin {
+  constructor() {
+    this.configurationVariablesSources = {
+      foo: {
+        async resolve({ address }) {
+          // `address` contains the name of the variable to resolve:
+          // In `${foo:some-variable}`, address will contain `some-variable`.
+
+          // Resolver is expected to return an object with the value in the `value` property:
+          return {
+            //
+            value: `Resolving variable ${address}`,
+          };
+        },
+      },
+    };
+  }
+}
+
+module.exports = MyPlugin;
+```
+
+The variable source defined above (registered via a plugin) can be used as follows:
+
+```yaml
+service: test
+# ...
+
+custom:
+  value1: ${foo:bar}
+
+plugins:
+  - ./my-plugin
+```
+
+The configuration will be resolved into the following:
+
+```yaml
+service: test
+# ...
+
+custom:
+  value1: Resolving variable bar
+
+plugins:
+  - ./my-plugin
+```
+
+## Variable parameters
+
+Variable sources can support advanced use cases via parameters:
+
+```yaml
+service: test
+# ...
+
+custom:
+  value1: ${foo(one, two):bar}
+```
+
+Parameters can be retrieved in the `params` argument:
+
+```javascript
+class MyPlugin {
+  constructor() {
+    this.configurationVariablesSources = {
+      foo: {
+        async resolve({ address, params }) {
+          return {
+            // In the example below, ${foo(one, two):bar} will
+            // resolve to "one,two"
+            value: (params || []).join(','),
+          };
+        },
+      },
+    };
+  }
+}
+```
+
+## Resolving variables, configuration values and options
+
+It is possible to retrieve other variables, configuration values and CLI options in the variable resolver:
+
+```javascript
+class MyPlugin {
+  constructor() {
+    this.configurationVariablesSources = {
+      foo: {
+        async resolve({ resolveVariable, options }) {
+          // `options` is CLI options
+          // `resolveVariable` resolves other variables (for example here: `${sls:stage}`)
+          const stage = await resolveVariable('sls:stage');
+          // To retrieve a configuration value from serverless.yml, use the `self:xxx` variable source, for example:
+          // await resolveVariable('self:provider.region')
+
+          return {
+            value: `The stage is ${stage}`,
+          };
+        },
+      },
+    };
+  }
+}
+```
diff --git a/docs/guides/profiles.md b/docs/guides/profiles.md
deleted file mode 100644
index 87415feff1e..00000000000
--- a/docs/guides/profiles.md
+++ /dev/null
@@ -1,82 +0,0 @@
-<!--
-title: Serverless Dashboard - Profiles
-menuText: Profiles
-menuOrder: 7
-layout: Doc
--->
-
-<!-- DOCS-SITE-LINK:START automatically generated  -->
-
-### [Read this on the main serverless docs site](https://www.serverless.com/framework/docs/guides/profiles/)
-
-<!-- DOCS-SITE-LINK:END -->
-
-> This is a deprecated feature of the dashboard. Please look at our documentaion for [Providers](https://www.serverless.com/framework/docs/guides/providers/) and
-> [Parameters](https://www.serverless.com/framework/docs/guides/parameters/) which replaces the use of deployment profiles for setting up AWS connections and parameters.
-
-# Deployment Profiles
-
-Deployment Profiles enable each stage of your Serverless application to use a unique set of [Safeguards](./safeguards.md), [Parameters](./parameters.md) and [Access Roles](./access-roles.md).
-
-## Deprecation and Migration from Deployment Profile
-
-Prior to the January 11th, 2021 release, deployment profiles supported setting AWS Access Role ARNs and managing parameters. Support for using AWS Access Roles for deployments has moved from deployment profiles to Providers. Support for managing Parameters has moved from deployment profiles to services and instances.
-
-**Deployment profiles will be deprecated on February 28th, 2021**. Migration from deployment profiles to providers and parameters will be automatic; however, there are two required action items to use the new features.
-
-### Action Items
-
-- You **MUST** upgrade to use the Enterprise Plugin version 4.4.1 or higher.
-- You **MUST** relink your AWS Account via the providers UI by no later than February 28th, 2021.
-
-### Automatic Migration
-
-Parameters and Providers were migrated automatically from deployment profiles on January 31st, 2021.
-
-The automatic migration replaced deployment profiles with providers by performing the following:
-
-- **A new provider will be created for each deployment profile using the same AWS Access Role ARN**. If the deployment profile doesn’t contain an AWS Access Role ARN, it will be skipped.
-- **A provider will be added to each service for the corresponding default stage in the app**. The provider will be the provider corresponding to the deployment profile which was associated with the default stage of the parent app. For example, if `app1` has `service1` and the _`default`_ stage of `app1` links to the `dev` deployment profile, then the `dev` provider will be added to `service1`. This is repeated for all services in all apps.
-- **A provider will be added to each instance for the corresponding stage in the app**. The provider will be the provider corresponding to the deployment profile which was associated with the stage of the instance. For example, if `app1` has `service1` and `app1` has a stage `prod` linked to the `prod` deployment profile, then the `prod` provider will be added to the `service1` instances deployed to the `prod` stage.
-- **Parameters from the deployment profile associated with the default stage in the app will be copied to the service**.
-- **Parameters from the deployment profile associated with a stage in an app will be copied to the instance**.
-
-## Use Deployment Profiles
-
-Deployment profiles are managed in the [Serverless Framework Dashboard](https://app.serverless.com). When you run `serverless deploy`, the CLI obtains the Safeguard policies, Parameters, and the generated AWS Credentials.
-
-### Creating a new Deployment Profile
-
-Create a new deployment profile by navigating to **profiles** in the [Serverless Framework Dashboard](https://app.serverless.com) and click **add**.
-
-#### name
-
-This is a user-readable name for the deployment profile. Most often it has a name that maps to a stage (e.g. “dev”, “prod”), or in larger organizations the line of business or environment (e.g. “apac-banking-prod”). This name will uniquely identify the deployment profile when associating it with a stage in an application.
-
-#### description
-
-The description helps provide additional context when listing the deployment profiles.
-
-#### access roles, parameters and safeguards
-
-Access Roles, Parameters and Safeguards have individual configuration guides:
-
-- [access roles](./access-roles.md#link-your-aws-account)
-- [safeguard policies](./safeguards.md#configuring-policies)
-- [parameters](./parameters.md)
-
-### Add a deployment profile to your application and stage
-
-Create a new stage by navigating to **applications** in the [Serverless Framework Dashboard](https://app.serverless.com).
-
-1. Expand the application and click into the **stages** tab.
-2. Click **add stage** in the tab
-3. Provide the **name** and select the **deployment profile**.
-
-You can also set the **default deployment profile** field in the application. You can use this to set the deployment profile on all services in that application. When deploying to a stage which hasn't be defined in the dashboard, then the default deployment profile will be used.
-
-### Using a Deployment Profile to deploy
-
-When you run `serverless deploy` Serverless Framework will obtain the AWS Access Key, Parameter and Safeguards associated with the deployment profile configured for that application and stage based on the values for `app` and `stage` in your `serverless.yml` file.
-
-The Serverless Framework will first try to match the current stage from `serverless.yml` with a stage configured on that application in the dashboard. If they match, it will use the deployment profile associated with that stage. If the stages do not match, then the default deployment profile from that application will be used.
diff --git a/docs/guides/providers.md b/docs/guides/providers.md
index ce5e30c2aac..fbf99775fa3 100644
--- a/docs/guides/providers.md
+++ b/docs/guides/providers.md
@@ -27,11 +27,11 @@ There are many benefits to using providers over managing accounts manually:
 - No need to share credentials out of band (e.g. sending slack messages)
 - Some providers, like AWS Access Roles, provide an additional layer of security as credentials are generated per deployment and have a short TTL.
 
-# Adding providers in the dashboard
+## Adding providers in the dashboard
 
 To use providers you must add the providers to your organization and then link the provider to a service. Optionally you can link the provider to an instance instead if you need to use different providers for different stages or regions.
 
-## Adding providers to your organization
+### Adding providers to your organization
 
 To add a provider to your organization go the **org** section of the [dashboard](https://app.serverless.com). Under the **providers** tab, click **add** and follow the instructions.
 
@@ -39,25 +39,25 @@ You’ll be able to select the provider, like AWS, Stripe, and Twilio, name the
 
 It is recommended that you deploy your Serverless Framework apps to different accounts for each stage. To accomplish this we recommend adding a `dev` and `prod` provider to decouple the prod environment from all other environments.
 
-## Setting a default organization provider
+### Setting a default organization provider
 
 A Provider at the organization level can also be designated as the default provider for the organization. This provider will be used in any deployments where the service or instance do not have a provider set.
 
 To set the organizatwion default, go to the **orgs** section of the dashboard, and select the **providers** tab, under the **...** menu of the provider select **set as default**.
 
-## Adding a provider to a service
+### Adding a provider to a service
 
 Adding the providers to the organization alone will not be sufficient, you must also link that provider with the service.
 
 To add a provider to a service, go to the **apps** section of the dashboard, and select **settings** under the **...** menu of the service for which you would like to use providers. On the service settings page navigate to the **providers** tab. From there you can click **add provider** which will allow you to add the providers from the organization into your service.
 
-## Adding a provider to an instance
+### Adding a provider to an instance
 
 If your service is deployed to the same account for each stage and region, then you do not need to configure providers per instance. However, if you have multiple providers, like one for each stages or regions, then you can add a provider to each instance.
 
 To add a provider to an instance, navigate to the instance details page for that service instance, go to the **providers** tab, from the **add providers** dropdown you can add any provider from the organization into the instance.
 
-## Inheritance and overriding
+### Inheritance and overriding
 
 If you are deploying a traditional Serverless Framework app, an instance of the service is created for that stage and region. If you are using a Component-based service, then an instance is created for each stage of the service.
 
@@ -65,7 +65,7 @@ Serverless Framework, on deployment, will use the provider associate with the In
 
 The organization default provider enables you to deploy using that organization default provider without needing to set a provider at the service or instance level. Similarly, setting a provider at the service level enables you to create new instances and deploy right away without needing to set a provider on the instance.
 
-### Different accounts per stage
+#### Different accounts per stage
 
 This inheritance model is useful for deploying to different accounts for each stage. For example, if you have a `dev` and `prod` account, then you can setup providers to deploy to `dev` by default, and use the `prod` account for only the `prod` instances.
 
@@ -73,7 +73,7 @@ To accomplish this, you can add the `dev` provider to the service, and then add
 
 If you deploy to a new stage, like `int`, it will then use the `dev` provider from the service.
 
-### Preview account for CI/CD preview deployments
+#### Preview account for CI/CD preview deployments
 
 If you are using the Serverless CI/CD service or any 3rd party CI/CD service, you may be deploying to unique stages to isolate the preview deployments from PRs from all other deployments.
 
@@ -81,8 +81,126 @@ To accomplish this, you can create two providers, `preview`, and `prod`, for two
 
 Now if you deploy to a preview stage, like `feature-x` it will automatically use the provider from the service, `preview`. If you merge your changes and deploy them to the `prod` stage, it will automatically use the `prod` provider as it is associated with that stage.
 
-# Using providers in serverless.yml
+## Using providers in serverless.yml
 
 To use providers with serverless.yml you do not need to do anything. Upon deployment the Serverless Framework will retrieve the necessary credentials from the provider associate with the instance or service, and it will use those credentials to deploy.
 
 If the providers are not found, then the Serverless Framework will look for credentials locally.
+
+## Using a Custom IAM Role and Policy
+
+Creating a provider with an IAM Role and default policy using the provided Cloud Formation template is the easiest and most secure way to enable Serverless Framework to deploy from CI/CD, monitor your services, and deploy a range of resources to your AWS account using short-lived credentials. However, advanced IAM users may want to create a custom IAM Role and Policy with more restrictive permissions.
+
+Please be aware that this policy is used to _provision_ your Serverless applications to your AWS account(s). The lambda function will also require a role, which is created by the Serverless Framework during deployments, hence why `iam:CreateRole` is required.
+
+Using a custom policy provides additional control and granularity, but it will require your organization to manage and maintain the policy and role to ensure it provides both minimal and sufficient access for Serverless Framework deployments to work correctly.
+
+Below is a sample IAM Policy you can use to get started. This policy works with the Serverless Framework dashboard to enable all the functionality, and deploy a basic Node.js Lambda function.
+
+If you are create a custom IAM Role with this policy, you will need to add a Trust relationship to the AWS Account with ID 377024778620 (arn:aws:iam::377024778620:root) in order for the Serverless Framework to Assume the Role with the provided policy.
+
+**Sample IAM Policy**
+
+```
+{
+    "Version": "2012-10-17",
+    "Statement": [
+        {
+            "Effect": "Allow",
+            "Action": [
+                "lambda:CreateFunction",
+                "logs:DeleteSubscriptionFilter",
+                "s3:CreateBucket",
+                "iam:CreateRole",
+                "lambda:GetFunctionConfiguration",
+                "cloudformation:DescribeStackResource",
+                "iam:PutRolePolicy",
+                "s3:GetObject*",
+                "cloudformation:DescribeStackEvents",
+                "s3:DeleteBucketWebsite",
+                "logs:GetLogEvents",
+                "cloudformation:UpdateStack",
+                "lambda:ListLayerVersions",
+                "lambda:ListLayers",
+                "lambda:DeleteFunction",
+                "events:RemoveTargets",
+                "logs:FilterLogEvents",
+                "lambda:GetAlias",
+                "s3:DeleteObject",
+                "s3:ListBucket",
+                "apigateway:GET",
+                "cloudformation:ListStackResources",
+                "iam:GetRole",
+                "events:DescribeRule",
+                "lambda:ListFunctions",
+                "lambda:InvokeFunction",
+                "lambda:GetEventSourceMapping",
+                "lambda:ListAliases",
+                "iam:DeleteRole",
+                "iam:UpdateAssumeRolePolicy",
+                "s3:DeleteBucketPolicy",
+                "logs:CreateLogGroup",
+                "cloudformation:DescribeStacks",
+                "lambda:UpdateFunctionCode",
+                "s3:PutObject",
+                "cloudformation:DeleteStack",
+                "lambda:ListEventSourceMappings",
+                "lambda:PublishVersion",
+                "logs:PutSubscriptionFilter",
+                "apigateway:POST",
+                "cloudformation:ValidateTemplate",
+                "lambda:ListVersionsByFunction",
+                "lambda:GetLayerVersion",
+                "s3:DeleteObjectVersion",
+                "events:PutRule",
+                "lambda:GetAccountSettings",
+                "lambda:GetLayerVersionPolicy",
+                "s3:PutEncryptionConfiguration",
+                "apigateway:DELETE",
+                "iam:PassRole",
+                "lambda:ListTags",
+                "iam:DeleteRolePolicy",
+                "apigateway:PATCH",
+                "s3:DeleteBucket",
+                "logs:DescribeLogGroups",
+                "logs:DeleteLogGroup",
+                "apigateway:PUT",
+                "lambda:GetFunction",
+                "lambda:UpdateFunctionConfiguration",
+                "events:PutTargets",
+                "lambda:AddPermission",
+                "cloudformation:CreateStack",
+                "s3:PutBucketPolicy",
+                "sts:GetCallerIdentity",
+                "lambda:RemovePermission",
+                "s3:GetBucketLocation",
+                "lambda:GetPolicy"
+            ],
+            "Resource": "*"
+        }
+    ]
+}
+```
+
+## Migration from Deployment Profile
+
+Prior to the January 11th, 2021 release, deployment profiles supported setting AWS Access Role ARNs and managing parameters. Support for using AWS Access Roles for deployments has moved from deployment profiles to Providers. Support for managing Parameters has moved from deployment profiles to services and instances.
+
+**Deployment profiles will be deprecated on February 28th, 2021**. Migration from deployment profiles to providers and parameters will be automatic; however, there are two required action items to use the new features.
+
+### Action Items
+
+- You **MUST** upgrade to use the Enterprise Plugin version 4.4.1 or higher.
+- You **MUST** relink your AWS Account via the providers UI by no later than February 28th, 2021.
+
+### Automatic Migration
+
+Parameters and Providers were migrated automatically from deployment profiles on January 31st, 2021.
+
+The automatic migration replaced deployment profiles with providers by performing the following:
+
+- **A new provider will be created for each deployment profile using the same AWS Access Role ARN**. If the deployment profile doesn’t contain an AWS Access Role ARN, it will be skipped.
+- **A provider will be added to each service for the corresponding default stage in the app**. The provider will be the provider corresponding to the deployment profile which was associated with the default stage of the parent app. For example, if `app1` has `service1` and the _`default`_ stage of `app1` links to the `dev` deployment profile, then the `dev` provider will be added to `service1`. This is repeated for all services in all apps.
+- **A provider will be added to each instance for the corresponding stage in the app**. The provider will be the provider corresponding to the deployment profile which was associated with the stage of the instance. For example, if `app1` has `service1` and `app1` has a stage `prod` linked to the `prod` deployment profile, then the `prod` provider will be added to the `service1` instances deployed to the `prod` stage.
+- **Parameters from the deployment profile associated with the default stage in the app will be copied to the service**.
+- **Parameters from the deployment profile associated with a stage in an app will be copied to the instance**.
diff --git a/docs/guides/safeguards.md b/docs/guides/safeguards.md
deleted file mode 100644
index d0a733e657a..00000000000
--- a/docs/guides/safeguards.md
+++ /dev/null
@@ -1,22 +0,0 @@
-<!--
-title: Serverless Dashboard - Safeguards
-menuText: Safeguards
-menuOrder: 9
-layout: Doc
--->
-
-<!-- DOCS-SITE-LINK:START automatically generated  -->
-
-### [Read this on the main serverless docs site](https://www.serverless.com/framework/docs/guides/safeguards/)
-
-<!-- DOCS-SITE-LINK:END -->
-
-# Safeguards
-
-**Safeguards** is a policy-as-code framework for Serverless Framework which enables you to inspect your serverless.yml file, and the generated Cloud Formation templates, for compliance with security, operational, and organizational, best practices.
-
-Safeguards was a feature of the Serverless Framework Pro dashboard and available under the legacy team tier. On August 1st, 2020, it was open sourced and made available free-of-charge as a stand-alone Serverless Framework Plugin free of charge.
-
-You can find the new plugin at [serverless/safeguards-plugin](https://github.com/serverless/safeguards-plugin/).
-
-You can easily migrate your safeguard policies from the SF Pro dashboard to the `@serverless/safegurds-plugin` by following the [Migration from Serverless Framework Pro guide](https://github.com/serverless/safeguards-plugin/#migrating-from-serverless-framework-pro).
diff --git a/docs/guides/sdk/nodejs.md b/docs/guides/sdk/nodejs.md
index 5e29d32d59d..3996fe996a0 100644
--- a/docs/guides/sdk/nodejs.md
+++ b/docs/guides/sdk/nodejs.md
@@ -10,7 +10,9 @@ layout: Doc
 
 <!-- DOCS-SITE-LINK:END -->
 
-# `captureError`
+# Node.js SDK
+
+## `captureError`
 
 Your lambda function may throw an exception, but your function handles it in order to respond to
 the requester without throwing the error. One very common example is functions tied to HTTP
@@ -59,7 +61,7 @@ module.exports.hello = async (event) => {
 };
 ```
 
-# `span`
+## `span`
 
 While the `serverless_sdk` automatically instruments AWS SDK and HTTP spans, you may be interested
 in capturing span data for functions that do numerical computation or functions making database
@@ -79,7 +81,7 @@ module.exports.handler = async (event, context) => {
 };
 ```
 
-Example from context with an sync function:
+Example from context with a sync function:
 
 ```javascript
 module.exports.handler = async (event, context) => {
@@ -102,7 +104,7 @@ module.exports.handler = async (event, context) => {
 };
 ```
 
-# `tagEvent`
+## `tagEvent`
 
 Busy applications can invoke hundreds of thousands of requests per minute! At these rates, finding specific invocations can be like
 searching for a needle in a haystack. We've felt this pain, which is why we've introduced tagged events.
@@ -129,7 +131,7 @@ module.exports.hello = async (event, context) => {
 };
 ```
 
-# Automatic route instrumentation with application middleware
+## Automatic route instrumentation with application middleware
 
 Faced with practical considerations (a big one being CloudFormation stack resource limit), developers often reach for a single function solution with routing being handled by the application layer. This is usually accomplished either by leveraging plugins that extend popular application frameworks to play nicely with the Lambda runtime (e.g. [serverless-express](https://serverless.com/plugins/serverless-express/)), using a purpose-built one (like [lambda-api](https://github.com/jeremydaly/lambda-api)), or even rolling their own (via [lambda-router](https://github.com/trek10inc/lambda-router)).
 
@@ -141,7 +143,7 @@ If your application is using a custom-built router, you can still work around th
 
 Once set, invocations can be explored and inspected by endpoint in the Dashboard.
 
-# `setEndpoint`
+## `setEndpoint`
 
 Allows the application to explicitly set the routed endpoint for an invocation. Like the other SDK methods, `setEndpoint` is available on either the context object: `context.serverlessSdk`, or can be imported manually from the base directory: `const { setEndpoint } = require('./serverless_sdk')`. Example usage:
 
diff --git a/docs/guides/sdk/python.md b/docs/guides/sdk/python.md
index 2915cdeaf1f..e070e230983 100644
--- a/docs/guides/sdk/python.md
+++ b/docs/guides/sdk/python.md
@@ -10,7 +10,9 @@ layout: Doc
 
 <!-- DOCS-SITE-LINK:END -->
 
-# `capture_exception`
+# Python SDK
+
+## `capture_exception`
 
 Your lambda function may throw an exception, but your function handles it in order to respond to
 the requester without throwing the error. One very common example is functions tied to HTTP
@@ -55,7 +57,7 @@ def hello(event, context):
     }
 ```
 
-# `span`
+## `span`
 
 While the `serverless_sdk` automatically instruments AWS SDK and HTTP spans, you may be interested
 in capturing span data for functions that do numerical computation or functions making database
@@ -80,7 +82,7 @@ def handler(event, context):
 
 It also works as an async context manager for use with `async with`.
 
-# `tag_event`
+## `tag_event`
 
 Busy applications can invoke hundreds of thousands of requests per minute! At these rates, finding specific invocations can be like
 searching for a needle in a haystack. We've felt this pain, which is why we've introduced tagged events.
@@ -107,7 +109,7 @@ def hello(event, context):
     }
 ```
 
-# Automatic route instrumentation with application middleware
+## Automatic route instrumentation with application middleware
 
 Faced with practical considerations (a big one being CloudFormation stack resource limit), developers often reach for a single function solution with routing being handled by the application layer. This is typically accomplished by leveraging the [serverless-wsgi](https://github.com/logandk/serverless-wsgi) plugin to deploy existing WSGI applications (Flask/Django/Pyramid etc). Rolling your own custom router is another option as well.
 
@@ -119,7 +121,7 @@ If your application is using a custom-built router, you can still work around th
 
 Once set, invocations can be explored and inspected by endpoint in the Dashboard.
 
-# `set_endpoint`
+## `set_endpoint`
 
 Allows the application to explicitly set the routed endpoint for an invocation. Like the other SDK methods, `setEndpoint` is available on either the context object: `context.serverless_sdk`.
 
diff --git a/docs/guides/upgrading-v3.md b/docs/guides/upgrading-v3.md
new file mode 100644
index 00000000000..d2be60d54fd
--- /dev/null
+++ b/docs/guides/upgrading-v3.md
@@ -0,0 +1,326 @@
+<!--
+title: Serverless Framework - Upgrading to v3
+menuText: Upgrading to v3
+menuOrder: 12
+layout: Doc
+-->
+
+<!-- DOCS-SITE-LINK:START automatically generated  -->
+
+### [Read this on the main serverless docs site](https://www.serverless.com/framework/docs/guides/upgrading-v3/)
+
+<!-- DOCS-SITE-LINK:END -->
+
+# Upgrading to Serverless Framework v3
+
+Serverless Framework v3 contains a few breaking changes that may impact some projects.
+
+This guide helps users upgrade from Serverless Framework v2 to v3.
+
+## Am I impacted by breaking changes?
+
+Serverless Framework v2 signals any deprecated feature via a deprecation warning. The simplest way to upgrade to v3 is to:
+
+1. [Upgrade Serverless Framework](../getting-started.md#upgrade) to the latest v2 version
+2. Run `serverless` commands in the project to see if there are any deprecation warnings
+
+Projects that do not have any deprecations can be immediately upgraded to v3. Projects that have deprecation warnings should first solve these deprecations, then upgrade to v3.
+
+## What about plugins?
+
+We have worked with the most popular plugins to make sure they support Serverless Framework v3. As long as a project has no deprecations, it can be safely upgraded to v3.
+
+That being said, some plugins need to be updated to be installable with v3. In most cases, it is a matter of allowing the plugin to be installed with Serverless Framework v3 in `package.json` (updating the `peerDependencies` requirement). Feel free to open an issue or pull request in the GitHub repository of the plugin.
+
+## Upgrading to v3
+
+First, [upgrade to the latest v2 version](../getting-started.md#upgrade) and make sure that you do not get any deprecation warning when running `serverless` commands.
+
+Then, to upgrade to Serverless Framework v3, run:
+
+```bash
+npm install -g serverless
+```
+
+If you [installed `serverless` as a standalone binary](../getting-started.md#install-as-a-standalone-binary), run the following command instead:
+
+- MacOS/Linux standalone binary: `serverless upgrade --major`
+- Windows: `choco upgrade serverless`
+
+## Update `frameworkVersion` setting for v3
+
+In all projects that you want to upgrade to Serverless Framework v3, you need to make sure that `frameworkVersion` specified in project configuration allows v3 version. You can achieve it by setting it in the following manner:
+
+```yml
+frameworkVersion: '3'
+```
+
+## Using v2 and v3 in different projects
+
+It is possible to use v3 in some projects and v2 in other projects. To achieve that, install the Serverless Framework locally via NPM (`npm i --save-dev serverless`).
+
+There are 2 scenarios:
+
+- Using v3 globally, and v2 in specific projects.
+
+  This is the simplest. Upgrade the global version to v3, and install v2 in specific projects (via NPM). The `serverless` command will automatically run the correct version (v3 can run v2).
+
+- Using v2 globally, and v3 in specific projects.
+
+  To achieve that, install v3 in specific projects (via NPM). Then, use `serverless` for v2 projects, and `npx serverless` for v3 projects.
+
+## Breaking changes
+
+You will find below a complete list of all breaking changes. All those breaking changes were signaled via deprecation messages in Serverless Framework v2.
+
+### CLI commands and options
+
+The `serverless` CLI no longer runs on Node v10 because [that version is obsolete](https://endoflife.date/nodejs): upgrade to v12 or greater to run `serverless` on your machine.
+
+The `serverless` CLI used to accept free-form CLI options. This feature was deprecated and has been removed. The main reason is that this prevented us from detecting typos in options, which sometimes created unexpected situations and overall a bad user experience. [Learn more about this change](../deprecations.md#handling-of-unrecognized-cli-options).
+
+Additionally, all CLI options must now be passed at the end of the commands:
+
+```bash
+# Will no longer work in v3:
+serverless --verbose deploy
+
+# Correct syntax:
+serverless deploy --verbose
+```
+
+This change makes the CLI much more robust at detecting arguments from options and their values.
+
+On that note, the `-v` option is no longer recognized (it was ambiguous with `--version`): use the full `--verbose` option instead.
+
+When the `serverless` CLI is installed globally and locally (in the project’s `node_modules`), the local version will always be used. It is no longer possible to disable that behavior ([learn more](../deprecations.md#support-for-enablelocalinstallationfallback-setting-is-to-be-removed)).
+
+Finally, the `serverless studio` command has been removed: that feature was deprecated and is no longer available.
+
+### Service configuration
+
+The default Lambda runtime has changed from NodeJS 12 to NodeJS 14, given this is now the default runtime recommended by AWS.
+
+Additionally, the `nodejs10.x`, `python2.7`, `ruby2.5` and `dotnetcore2.1` runtimes [are no longer supported and accepted by AWS Lambda](https://docs.aws.amazon.com/lambda/latest/dg/runtime-support-policy.html). As such, these runtimes will no longer be accepted in v3.
+
+In `serverless.yml`, the `service` key no longer accepts a YAML object ([learn more](../deprecations.md#service-property-object-notation)).
+
+```yaml
+# Deprecated in v2, removed in v3:
+service:
+    name: my-service
+
+# Correct syntax:
+service: my-service
+```
+
+All options that used to be defined inside the `service` key have been moved to other sections (mentioned below in that document). This change clears up confusion that existed between the `service` and `provider` sections.
+
+### API Gateway
+
+When configuring API Gateway, some configuration options have moved to a dedicated sub-section of `provider`. That will help clear up confusion with similar `httpApi` settings.
+
+```yaml
+provider:
+  # Deprecated in v2, removed in v3:
+  apiKeys: ...
+  resourcePolicy: ...
+  usagePlan: ...
+
+  # Correct syntax:
+  apiGateway:
+    apiKeys: ...
+    resourcePolicy: ...
+    usagePlan: ...
+```
+
+The `schema` option on HTTP events has also been renamed to `schemas`. That change allowed us to support much more schema validation features:
+
+```yaml
+functions:
+  hello:
+    handler: hello.handler
+    events:
+      - http:
+          ...
+          request:
+            # Deprecated in v2, removed in v3:
+            schema: ...
+            # Correct syntax:
+            schemas: ...
+```
+
+Learn more about [schema changes](../deprecations.md#aws-api-gateway-schemas).
+
+When an external API Gateway is used and imported via `provider.apiGateway.restApiId`, both `provider.logs.restApi` and `provider.tracing.apiGateway` options are ignored. In v3, an error will be thrown if these options are defined. Indeed, these settings are applicable only if the API Gateway is provisioned by Serverless Framework.
+
+The CloudFormation tags defined in `provider.tags` will now be correctly applied to HTTP APIs stages ([learn more](../deprecations.md#http-api-provider-tags)).
+
+Starting with v3, AWS's recommended behavior for API Gateway authorizers will become the default: `functions[].events[].http.authorizer.identitySource` will no longer be set to `method.request.header.Authorization` by default when caching is disabled (i.e. for authorizers of type "request" with `resultTtlInSeconds` set to "0") ([learn more](../deprecations.md#default-identitysource-for-httpauthorizer)).
+
+### CloudFront
+
+Some CloudFront `behavior` options where deprecated by AWS: ForwardedValues, MinTTL, MaxTTL and DefaultTTL. These options have been removed. Use the new ["cache policy" feature](../providers/aws/events/cloudfront.md#cache-policy-configuration) instead ([learn more](../deprecations.md#cloudfront-event-behaviorforwardedvalues-property)).
+
+### EventBridge
+
+By default, all EventBridge resources (including Lambda triggers) will now be deployed using native CloudFormation resources, instead of a custom resource ([learn more](../deprecations.md#aws-eventbridge-lambda-event-triggers)). The change has the benefit of relying on native AWS features now, which will be more stable and future-proof.
+
+Since this is a hard breaking change for Serverless Framework v2 users, it is possible to keep the legacy behavior (based on custom resources) by using this flag:
+
+```yaml
+provider:
+  eventBridge:
+    useCloudFormation: false
+```
+
+With this flag, v2 users can upgrade to v3 without breaking change. Note that `useCloudFormation: false` will be deprecated eventually, and will not be supported in the future.
+
+### KMS
+
+When configuring KMS keys, some configuration options have moved ([learn more](../deprecations.md#awskmskeyarn-references)):
+
+```yaml
+# Deprecated in v2, removed in v3:
+service:
+  awsKmsKeyArn: ...
+functions:
+  hello:
+    awsKmsKeyArn: ...
+
+# Correct syntax:
+provider:
+  kmsKeyArn: ...
+functions:
+  hello:
+    kmsKeyArn: ...
+```
+
+That allowed us to make the KMS configuration consistent with all other AWS resources: these are now configured in the `provider` section.
+
+### Alexa skill
+
+`alexaSkill` events now require an `appId` ([learn more](../deprecations.md#support-for-alexaskill-event-without-appid-is-to-be-removed)). That change was required to implement a more stable deployment, as well as to deploy more restricted IAM permissions.
+
+### Lambda Hashing Algorithm
+
+By default, Lambda version hashes will now be generated using an improved algorithm (fixes determinism issues). As it is a breaking change that requires more manual effort during migration, it is still possible (but not recommended) to keep using the old algorithm by using the following configuration:
+
+```
+provider:
+  lambdaHashingVersion: 20200924
+```
+
+However, we highly encourage an upgrade to the new algorithm. To upgrade, you must redeploy your service with code or configuration change in all functions. You can do it by following the guide below:
+
+**NOTE**: Please keep in mind that these changes require two deployments with manual configuration adjustment between them. It also creates two additional versions and temporarily overrides descriptions of your functions. Migration will need to be done separately for each of your environments/stages.
+
+1. Run `sls deploy` with additional `--enforce-hash-update` flag: that flag will override the description for Lambda functions, which will force the creation of new versions.
+2. Set `provider.lambdaHashingVersion` to `20201221` in your configuration: your service will now always deploy with the new Lambda version hashes (which is the new defualt in v3).
+3. Run `sls deploy`, this time without additional `--enforce-hash-update` flag: that will restore the original descriptions on all Lambda functions.
+
+Now your whole service is fully migrated to the new Lambda Hashing Algorithm.
+
+If you do not want to temporarily override descriptions of your functions or would like to avoid creating unnecessary versions of your functions, you might want to use one of the following approaches:
+
+- Ensure that code for all your functions will change during deployment, set `provider.lambdaHashingVersion: 20201221` in your configuration, and run `sls deploy`. Due to the fact that all functions have code changed, all your functions will be migrated to new hashing algorithm. Please note that the change can be caused by e.g. upgrading a dependency used by all your functions so you can pair it with regular chores.
+- Add a dummy file that will be included in deployment artifacts for all your functions, set `provider.lambdaHashingVersion: 20201221` in your configuration, and run `sls deploy`. Due to the fact that all functions have code changed, all your functions will be migrated to new hashing algorithm.
+- If it is safe in your case (e.g. it's only development sandbox), you can also tear down the whole service by `sls remove`, set `provider.lambdaHashingVersion: 20201221` in your configuration, and run `sls deploy`. Newly recreated environment will be using new hashing algorithm.
+
+### Low-level changes
+
+Internal changes that may impact plugins or advanced use cases:
+
+- Plugins can no longer define custom variables via the legacy variable resolver ([learn more](../deprecations.md#new-variables-resolver)).
+
+  The new variable resolver API was introduced to provide a simpler and more stable way of defining custom variables. Most plugins have switched to that new variable resolver, but older plugins may still require some updates.
+
+- CloudFormation outputs are now always exported ([learn more](../deprecations.md#disable-default-output-export-names)
+
+  This change allows us to simplify and clean up the internals by removing options and logic switches. The use cases for not exporting CloudFormation outputs were very uncommon.
+
+- When using the Serverless Framework programmatically, the service configuration must be at the root directory of the service ([learn more](../deprecations.md#service-configurations-should-not-be-nested-in-service-sub-directories)) and the arguments have changed ([learn more here](../deprecations.md#serverless-constructor-service-configuration-dependency) as well as [here](../deprecations.md#serverless-constructor-configcommands-and-configoptions-requirement)).
+
+  Using the Serverless Framework programmatically is a very unusual and low-level scenario: we took advantage of the major version to improve the API.
+
+### Deprecated features that will be kept in v3
+
+Some Serverless Framework v2 features were marked as deprecated. However, given they are still widely used, we have chosen to keep the following features in v3.
+
+IAM configuration has changed, yet both syntaxes are supported in v3:
+
+```yaml
+# Older syntax, still supported in v3
+provider:
+  role: ...
+  rolePermissionsBoundary: ...
+  iamRoleStatements: ...
+  iamManagedPolicies: ...
+  cfnRole: ...
+
+# New syntax
+provider:
+  iam:
+    role:
+      name: ...
+      permissionsBoundary: ...
+      statements: ...
+      managedPolicies: ...
+    deploymentRole: ...
+```
+
+In the same spirit, packaging configuration has changed but both syntaxes are supported in v3:
+
+```yaml
+# Older syntax, still supported in v3
+package:
+  exclude:
+    - 'src/**'
+  include:
+    - src/function/handler.js
+
+# New syntax
+package:
+  patterns:
+    - '!src/**'
+    - src/function/handler.js
+```
+
+Configuration validation is still kept at the "warning" level by default (instead of turning to errors, as initially planned). To turn validation issues into errors, use:
+
+```yaml
+# v2 and v3 both keep the same default behavior: warnings by default
+configValidationMode: warn
+
+# Opt-in errors via:
+configValidationMode: error
+```
+
+Unlike planned initially, loading `.env` files is kept opt-in via `useDotenv: true`.
+
+Additionally, the short form `serverless deploy -f <function>` is still allowed in v3, but `serverless deploy function -f <function>` stays the preferred form.
+
+### Plugins
+
+The [`serverless-dotenv-plugin`](https://github.com/neverendingqs/serverless-dotenv-plugin) is directly impacted by v3. Indeed, for technical reasons the plugin will no longer be able to resolve `${env:xxx}` variables from `.env` files.
+
+However, `.env` files are now natively supported by Serverless Framework v3. Set `useDotenv: true` to use `.env` variables with `${env:xxx}`:
+
+```yaml
+useDotenv: true
+
+provider:
+  environment:
+    FOO: ${env:FOO}
+```
+
+The plugin can still be used as usual if you want to automatically import **all** variables from `.env` into functions.
+
+```yaml
+plugins:
+  - serverless-dotenv-plugin
+
+provider:
+  environment:
+    # With the plugin enabled, all variables in .env are automatically imported
+```
diff --git a/docs/providers/aliyun/cli-reference/invoke.md b/docs/providers/aliyun/cli-reference/invoke.md
index 74a1e517c89..6a0086b6725 100644
--- a/docs/providers/aliyun/cli-reference/invoke.md
+++ b/docs/providers/aliyun/cli-reference/invoke.md
@@ -14,7 +14,7 @@ layout: Doc
 
 # Alibaba Cloud - Invoke
 
-Invokes deployed function. It allows to send event data to the function, read logs and display other important information of the function invocation.
+Invokes a deployed function. You can send event data, read logs and display other important information of the function invocation.
 
 ```bash
 serverless invoke --function functionName
diff --git a/docs/providers/aliyun/guide/events.md b/docs/providers/aliyun/guide/events.md
index a0d30a987e5..21c486b43dd 100644
--- a/docs/providers/aliyun/guide/events.md
+++ b/docs/providers/aliyun/guide/events.md
@@ -16,7 +16,7 @@ layout: Doc
 
 Simply put, events are the things that trigger your functions to run.
 
-If you are using Alibaba Cloud as your provider, all `events` in the service are anything in Alibaba Cloud that can trigger your Functions, like HTTP endpoints, OSS events, etc..
+If you are using Alibaba Cloud as your provider, `events` in the service are limited to the Alibaba Cloud triggers HTTP and OSS.
 
 [View the Alibaba Cloud Function Compute events section for a list of supported events](../events)
 
@@ -40,7 +40,7 @@ functions:
 
 ## Types
 
-The Serverless Framework supports all of Alibaba Cloud Function Compute events. Instead of listing them here, we've put them in a separate section. [Check out the events section for more information.](../events)
+The Serverless Framework supports the Alibaba Cloud Function Compute events `oss` and `http`. Instead of listing them here, we've put them in a separate section. [Check out the events section for more information.](../events)
 
 ## Deploying
 
diff --git a/docs/providers/aliyun/guide/plugins.md b/docs/providers/aliyun/guide/plugins.md
deleted file mode 100644
index 4c31df76220..00000000000
--- a/docs/providers/aliyun/guide/plugins.md
+++ /dev/null
@@ -1,304 +0,0 @@
-<!--
-title: Serverless Framework - Alibaba Cloud Function Compute Guide - Plugins
-menuText: Plugins
-menuOrder: 13
-description: How to install and create Plugins to extend or overwrite the functionality of the Serverless Framework
-layout: Doc
--->
-
-<!-- DOCS-SITE-LINK:START automatically generated  -->
-
-### [Read this on the main serverless docs site](https://www.serverless.com/framework/docs/providers/aliyun/guide/plugins)
-
-<!-- DOCS-SITE-LINK:END -->
-
-# Alibaba Cloud - Plugins
-
-A Plugin is custom Javascript code that creates new or extends existing commands within the Serverless Framework. The Serverless Framework is merely a group of Plugins that are provided in the core. If you or your organization have a specific workflow, install a pre-written Plugin or write a plugin to customize the Framework to your needs. External Plugins are written exactly the same way as the core Plugins.
-
-- [How to create serverless plugins - Part 1](https://serverless.com/blog/writing-serverless-plugins/)
-- [How to create serverless plugins - Part 2](https://serverless.com/blog/writing-serverless-plugins-2/)
-
-## Installing Plugins
-
-External Plugins are added on a per service basis and are not applied globally. Make sure you are in your Service's root directory, then install the corresponding Plugin with the help of npm:
-
-```
-npm install --save custom-serverless-plugin
-```
-
-We need to tell Serverless that we want to use the plugin inside our service. We do this by adding the name of the Plugin to the `plugins` section in the `serverless.yml` file.
-
-```yml
-# serverless.yml file
-
-plugins:
-  - custom-serverless-plugin
-```
-
-Plugins might want to add extra information which should be accessible to Serverless. The `custom` section in the `serverless.yml` file is the place where you can add necessary configurations for your plugins (the plugins author / documentation will tell you if you need to add anything there):
-
-```yml
-plugins:
-  - custom-serverless-plugin
-
-custom:
-  customkey: customvalue
-```
-
-## Service local plugin
-
-If you are working on a plugin or have a plugin that is just designed for one project you can add them to the `.serverless_plugins` directory at the root of your service, and in the `plugins` array in `serverless.yml`.
-
-The plugin will be loaded based on being named `custom-serverless-plugin.js` or `custom-serverless-plugin\index.js` in the root of `.serverless_plugins` folder.
-
-### Load Order
-
-Keep in mind that the order you define your plugins matters. When Serverless loads all the core plugins and then the custom plugins in the order you've defined them.
-
-```yml
-# serverless.yml
-
-plugins:
-  - plugin1
-  - plugin2
-```
-
-In this case `plugin1` is loaded before `plugin2`.
-
-## Writing Plugins
-
-### Concepts
-
-#### Plugin
-
-Code which defines _Commands_, any _Events_ within a _Command_, and any _Hooks_ assigned to an _Lifecycle Event_.
-
-- Command // CLI configuration, commands, subcommands, options
-  - LifecycleEvent(s) // Events that happen sequentially when the command is run
-    - Hook(s) // Code that runs when a Lifecycle Event happens during a Command
-
-#### Command
-
-A CLI _Command_ that can be called by a user, e.g. `serverless deploy`. A Command has no logic, but simply defines the CLI configuration (e.g. command, subcommands, parameters) and the _Lifecycle Events_ for the command. Every command defines its own lifecycle events.
-
-```javascript
-'use strict';
-
-class MyPlugin {
-  constructor() {
-    this.commands = {
-      deploy: {
-        lifecycleEvents: ['resources', 'functions'],
-      },
-    };
-  }
-}
-
-module.exports = MyPlugin;
-```
-
-#### Lifecycle Events
-
-Events that fire sequentially during a Command. The above example list two Events. However, for each Event, and additional `before` and `after` event is created. Therefore, six Events exist in the above example:
-
-- `before:deploy:resources`
-- `deploy:resources`
-- `after:deploy:resources`
-- `before:deploy:functions`
-- `deploy:functions`
-- `after:deploy:functions`
-
-The name of the command in front of lifecycle events when they are used for Hooks.
-
-#### Hooks
-
-A Hook binds code to any lifecycle event from any command.
-
-```javascript
-'use strict';
-
-class Deploy {
-  constructor() {
-    this.commands = {
-      deploy: {
-        lifecycleEvents: ['resources', 'functions'],
-      },
-    };
-
-    this.hooks = {
-      'before:deploy:resources': this.beforeDeployResources,
-      'deploy:resources': this.deployResources,
-      'after:deploy:functions': this.afterDeployFunctions,
-    };
-  }
-
-  beforeDeployResources() {
-    console.log('Before Deploy Resources');
-  }
-
-  deployResources() {
-    console.log('Deploy Resources');
-  }
-
-  afterDeployFunctions() {
-    console.log('After Deploy Functions');
-  }
-}
-
-module.exports = Deploy;
-```
-
-### Nesting Commands
-
-You can also nest commands, e.g. if you want to provide a command `serverless deploy single`. Those nested commands have their own lifecycle events and do not inherit them from their parents.
-
-```javascript
-'use strict';
-
-class MyPlugin {
-  constructor() {
-    this.commands = {
-      deploy: {
-        lifecycleEvents: ['resources', 'functions'],
-        commands: {
-          function: {
-            lifecycleEvents: ['package', 'deploy'],
-          },
-        },
-      },
-    };
-  }
-}
-
-module.exports = MyPlugin;
-```
-
-### Defining Options
-
-Each (sub)command can have multiple Options.
-
-Options are passed in with a double dash (`--`) like this: `serverless function deploy --function functionName`.
-
-Option Shortcuts are passed in with a single dash (`-`) like this: `serverless function deploy -f functionName`.
-
-The `options` object will be passed in as the second parameter to the constructor of your plugin.
-
-In it, you can optionally add a `shortcut` property, as well as a `required` property. The Framework will return an error if a `required` Option is not included.
-
-**Note:** At this time, the Serverless Framework does not use parameters.
-
-```javascript
-'use strict';
-
-class Deploy {
-  constructor(serverless, options) {
-    this.serverless = serverless;
-    this.options = options;
-
-    this.commands = {
-      deploy: {
-        lifecycleEvents: ['functions'],
-        options: {
-          function: {
-            usage: 'Specify the function you want to deploy (e.g. "--function myFunction")',
-            shortcut: 'f',
-            required: true,
-          },
-        },
-      },
-    };
-
-    this.hooks = {
-      'deploy:functions': this.deployFunction.bind(this),
-    };
-  }
-
-  deployFunction() {
-    console.log('Deploying function: ', this.options.function);
-  }
-}
-
-module.exports = Deploy;
-```
-
-### Provider Specific Plugins
-
-Plugins can be provider specific which means that they are bound to a provider.
-
-**Note:** Binding a plugin to a provider is optional. Serverless will always consider your plugin if you don't specify a `provider`.
-
-The provider definition should be added inside the plugins constructor:
-
-```javascript
-'use strict';
-
-class ProviderDeploy {
-  constructor(serverless, options) {
-    this.serverless = serverless;
-    this.options = options;
-
-    // set the providers name here
-    this.provider = this.serverless.getProvider('providerName');
-
-    this.commands = {
-      deploy: {
-        lifecycleEvents: ['functions'],
-        options: {
-          function: {
-            usage: 'Specify the function you want to deploy (e.g. "--function myFunction")',
-            required: true,
-          },
-        },
-      },
-    };
-
-    this.hooks = {
-      'deploy:functions': this.deployFunction.bind(this),
-    };
-  }
-
-  deployFunction() {
-    console.log('Deploying function: ', this.options.function);
-  }
-}
-
-module.exports = ProviderDeploy;
-```
-
-The Plugin's functionality will now only be executed when the Serverless Service's provider matches the provider name which is defined inside the plugins constructor.
-
-### Serverless Instance
-
-The `serverless` instance which enables access to global service config during runtime is passed in as the first parameter to the plugin constructor.
-
-```javascript
-'use strict';
-
-class MyPlugin {
-  constructor(serverless, options) {
-    this.serverless = serverless;
-    this.options = options;
-
-    this.commands = {
-      log: {
-        lifecycleEvents: ['serverless'],
-      },
-    };
-
-    this.hooks = {
-      'log:serverless': this.logServerless.bind(this),
-    };
-  }
-
-  logServerless() {
-    console.log('Serverless instance: ', this.serverless);
-  }
-}
-
-module.exports = MyPlugin;
-```
-
-### Command Naming
-
-Command names need to be unique. If we load two commands and both want to specify the same command (e.g. we have an integrated command `deploy` and an external command also wants to use `deploy`) the Serverless CLI will print an error and exit. If you want to have your own `deploy` command you need to name it something different like `myCompanyDeploy` so they don't clash with existing plugins.
diff --git a/docs/providers/aws/README.md b/docs/providers/aws/README.md
index a08cc56c7a3..b205dbfe6c3 100644
--- a/docs/providers/aws/README.md
+++ b/docs/providers/aws/README.md
@@ -21,7 +21,6 @@ layout: Doc
     <div class="docsProviderItems">
       <ul>
         <li><a href="./guide/intro.md">Intro</a></li>
-        <li><a href="./guide/installation.md">Installation</a></li>
         <li><a href="./guide/credentials.md">Credentials</a></li>
         <li><a href="./guide/services.md">Services</a></li>
         <li><a href="./guide/functions.md">Functions</a></li>
diff --git a/docs/providers/aws/cli-reference/config-credentials.md b/docs/providers/aws/cli-reference/config-credentials.md
index d7eb8168cb4..adb3fb81b56 100644
--- a/docs/providers/aws/cli-reference/config-credentials.md
+++ b/docs/providers/aws/cli-reference/config-credentials.md
@@ -43,7 +43,11 @@ This example will configure the `default` profile with the `aws_access_key_id` o
 ### Configure a custom profile
 
 ```bash
-serverless config credentials --provider aws --key 1234 --secret 5678 --profile custom-profile
+serverless config credentials \
+  --provider aws \
+  --key 1234 \
+  --secret 5678 \
+  --profile custom-profile
 ```
 
 This example create and configure a `custom-profile` profile with the `aws_access_key_id` of `1234` and the `aws_secret_access_key` of `5678`.
@@ -51,7 +55,12 @@ This example create and configure a `custom-profile` profile with the `aws_acces
 ### Update an existing profile
 
 ```bash
-serverless config credentials --provider aws --key 1234 --secret 5678 --profile custom-profile --overwrite
+serverless config credentials \
+  --provider aws \
+  --key 1234 \
+  --secret 5678 \
+  --profile custom-profile \
+  --overwrite
 ```
 
 This example overwrite `custom-profile` profile with the `aws_access_key_id` of `1234` and the `aws_secret_access_key` of `5678`.
diff --git a/docs/providers/aws/cli-reference/config.md b/docs/providers/aws/cli-reference/config.md
new file mode 100644
index 00000000000..21bb7d7c10b
--- /dev/null
+++ b/docs/providers/aws/cli-reference/config.md
@@ -0,0 +1,40 @@
+<!--
+title: Serverless Framework Commands - AWS Lambda - Config
+menuText: config
+menuOrder: 1
+description: Configure Serverless
+layout: Doc
+-->
+
+<!-- DOCS-SITE-LINK:START automatically generated  -->
+
+### [Read this on the main serverless docs site](https://www.serverless.com/framework/docs/providers/aws/cli-reference/config)
+
+<!-- DOCS-SITE-LINK:END -->
+
+# AWS - Config
+
+The purpose of `serverless config` is to allow to enable or disable automatic update mechanism of the Framework. Additionally, it supports `config credentials` subcommand. For more details about them, please refer to their corresponding documentation pages. Auto update mechanism is supported for global installations across all operating systems with the exception of standalone binary installation on Windows.
+
+## Options
+
+- `--autoupdate` Turn on auto update mechanism
+- `--no-autoupdate` Turn off auto update mechanism
+
+## Provided lifecycle events
+
+- `config:config`
+
+## Examples
+
+### Turn on auto update mechanism
+
+```bash
+serverless config --autoupdate
+```
+
+### Turn off auto update mechanism
+
+```bash
+serverless config --no-autoupdate
+```
diff --git a/docs/providers/aws/cli-reference/create.md b/docs/providers/aws/cli-reference/create.md
index 7a6f9a491f3..516749102b4 100644
--- a/docs/providers/aws/cli-reference/create.md
+++ b/docs/providers/aws/cli-reference/create.md
@@ -16,22 +16,24 @@ layout: Doc
 
 Creates a new service in the current working directory based on the provided template.
 
-**Create service in current working directory:**
+**Create a service in the current working directory:**
 
 ```bash
 serverless create --template aws-nodejs
 ```
 
-**Create service in new folder:**
+**Create a service in a new folder:**
 
 ```bash
 serverless create --template aws-nodejs --path myService
 ```
 
-**Create service in new folder using a custom template:**
+**Create a service in a new folder using a custom template:**
 
 ```bash
-serverless create --template-url https://github.com/serverless/serverless/tree/master/lib/plugins/create/templates/aws-nodejs --path myService
+serverless create \
+  --template-url https://github.com/serverless/serverless/tree/master/lib/plugins/create/templates/aws-nodejs \
+  --path myService
 ```
 
 ## Options
@@ -106,7 +108,10 @@ renamed to `my-new-service`.
 ### Creating a new service using a local template
 
 ```bash
-serverless create --template-path path/to/my/template/folder --path path/to/my/service --name my-new-service
+serverless create \
+  --template-path path/to/my/template/folder \
+  --path path/to/my/service \
+  --name my-new-service
 ```
 
 This will copy the `path/to/my/template/folder` folder into `path/to/my/service` and rename the service to `my-new-service`.
diff --git a/docs/providers/aws/cli-reference/deploy-function.md b/docs/providers/aws/cli-reference/deploy-function.md
index c9a22f4b236..1ae83240171 100644
--- a/docs/providers/aws/cli-reference/deploy-function.md
+++ b/docs/providers/aws/cli-reference/deploy-function.md
@@ -43,7 +43,9 @@ serverless deploy function --function helloWorld
 ### Deployment with stage and region options
 
 ```bash
-serverless deploy function --function helloWorld --stage dev --region us-east-1
+serverless deploy function --function helloWorld \
+  --stage dev \
+  --region us-east-1
 ```
 
 ### Deploy only configuration changes
diff --git a/docs/providers/aws/cli-reference/deploy.md b/docs/providers/aws/cli-reference/deploy.md
index 7a52946b012..23fda45ca63 100644
--- a/docs/providers/aws/cli-reference/deploy.md
+++ b/docs/providers/aws/cli-reference/deploy.md
@@ -23,7 +23,6 @@ serverless deploy
 ## Options
 
 - `--config` or `-c` Name of your configuration file, if other than `serverless.yml|.yaml|.js|.json`.
-- `--noDeploy` or `-n` Skips the deployment steps and leaves artifacts in the `.serverless` directory
 - `--stage` or `-s` The stage in your service that you want to deploy to.
 - `--region` or `-r` The region in that stage that you want to deploy to.
 - `--package` or `-p` path to a pre-packaged directory and skip packaging step.
diff --git a/docs/providers/aws/cli-reference/generate-event.md b/docs/providers/aws/cli-reference/generate-event.md
new file mode 100644
index 00000000000..b94be8e3e47
--- /dev/null
+++ b/docs/providers/aws/cli-reference/generate-event.md
@@ -0,0 +1,56 @@
+<!--
+title: Serverless Framework Commands - AWS Lambda - Generate Event
+menuText: generate event
+menuOrder: 21
+description: Generate sample Lambda function event payload
+layout: Doc
+-->
+
+# AWS - Generate Event
+
+Creates sample Lambda function payloads for different types of events.
+
+```bash
+serverless generate-event --type eventType
+```
+
+## Options
+
+- `--type` or `-t` The type of the event to generate payload for. **Required**.
+- `--body` or `-b` The body for the message, request, or stream event.
+
+## Available event types
+
+- aws:alexaSkill
+- aws:alexaSmartHome
+- aws:apiGateway
+- aws:cloudWatch
+- aws:cloudWatchLog
+- aws:cognitoUserPool
+- aws:dynamo
+- aws:iot
+- aws:kinesis
+- aws:s3
+- aws:sns
+- aws:sqs
+- aws:websocket
+
+## Examples
+
+### Generate SQS event payload
+
+```bash
+serverless generate-event -t aws:sqs
+```
+
+### Generate Kinesis event payload with body
+
+```bash
+serverless generate-event -t aws:kinesis -b '{"foo": "bar"}'
+```
+
+### Generate SQS event and save it to a file
+
+```bash
+serverless generate-event -t aws:sqs > event.json
+```
diff --git a/docs/providers/aws/cli-reference/invoke-local.md b/docs/providers/aws/cli-reference/invoke-local.md
index dcdfe955280..117d2067bc5 100644
--- a/docs/providers/aws/cli-reference/invoke-local.md
+++ b/docs/providers/aws/cli-reference/invoke-local.md
@@ -98,7 +98,8 @@ serverless invoke local --function functionName --context "hello world"
 ### Local function invocation with context passing
 
 ```bash
-serverless invoke local --function functionName --contextPath lib/context.json
+serverless invoke local --function functionName \
+  --contextPath lib/context.json
 ```
 
 This example will pass the json context in the `lib/context.json` file (relative to the root of the service) while invoking the specified/deployed function.
@@ -110,7 +111,9 @@ serverless invoke local -f functionName -e VAR1=value1
 
 # Or more than one variable
 
-serverless invoke local -f functionName -e VAR1=value1 -e VAR2=value2
+serverless invoke local -f functionName \
+  -e VAR1=value1 \
+  -e VAR2=value2
 ```
 
 When using [AWS CloudFormation intrinsic functions](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/intrinsic-function-reference.html) as environment variables value, **only Fn::ImportValue and Ref** will be automatically resolved for function invocation. Other intrinsic functions use will result in the corresponding configuration object passed in the function as environment variable.
@@ -147,7 +150,7 @@ They _will not_ be set during the parsing of the `serverless.yml` file.
 
 ## Resource permissions
 
-Lambda functions assume an _IAM role_ during execution: the framework creates this role, and set all the permission provided in the `iamRoleStatements` section of `serverless.yml`.
+Lambda functions assume an _IAM role_ during execution: the framework creates this role, and set all the permission provided in the `provider.iam.role.statements` section of `serverless.yml`.
 
 Unless you explicitly state otherwise, every call to the AWS SDK inside the lambda function is made using this role (a temporary pair of key / secret is generated and set by AWS as environment variables, `AWS_ACCESS_KEY_ID` and `AWS_SECRET_ACCESS_KEY`).
 
diff --git a/docs/providers/aws/cli-reference/invoke.md b/docs/providers/aws/cli-reference/invoke.md
index d04ee3962cf..cc48d21aa54 100644
--- a/docs/providers/aws/cli-reference/invoke.md
+++ b/docs/providers/aws/cli-reference/invoke.md
@@ -14,7 +14,7 @@ layout: Doc
 
 # AWS - Invoke
 
-Invokes deployed function. It allows to send event data to the function, read logs and display other important information of the function invocation.
+Invokes a deployed function. You can send event data, read logs and display other important information of the function invocation.
 
 ```bash
 serverless invoke [local] --function functionName
@@ -72,19 +72,19 @@ output the result of the invocation in your terminal.
 #### Function invocation with data
 
 ```bash
-serverless invoke --function functionName --stage dev --region us-east-1 --data "hello world"
+serverless invoke --function functionName --data "hello world"
 ```
 
 #### Function invocation with custom context
 
 ```bash
-serverless invoke --function functionName --stage dev --region us-east-1 --context "hello world"
+serverless invoke --function functionName --context "hello world"
 ```
 
 #### Function invocation with context passing
 
 ```bash
-serverless invoke --function functionName --stage dev --region us-east-1 --contextPath lib/context.json
+serverless invoke --function functionName --contextPath lib/context.json
 ```
 
 This example will pass the json context in the `lib/context.json` file (relative to the root of the service) while invoking the specified/deployed function.
@@ -92,13 +92,13 @@ This example will pass the json context in the `lib/context.json` file (relative
 #### Function invocation with data from standard input
 
 ```bash
-node dataGenerator.js | serverless invoke --function functionName --stage dev --region us-east-1
+node dataGenerator.js | serverless invoke --function functionName
 ```
 
 #### Function invocation with logging
 
 ```bash
-serverless invoke --function functionName --stage dev --region us-east-1 --log
+serverless invoke --function functionName --log
 ```
 
 Just like the first example, but will also outputs logging information about your invocation.
@@ -106,7 +106,7 @@ Just like the first example, but will also outputs logging information about you
 #### Function invocation with data passing
 
 ```bash
-serverless invoke --function functionName --stage dev --region us-east-1 --path lib/data.json
+serverless invoke --function functionName --path lib/data.json
 ```
 
 This example will pass the json data in the `lib/data.json` file (relative to the root of the service) while invoking
@@ -132,14 +132,15 @@ serverless invoke local --function functionName --context "hello world"
 ### Local function invocation with context passing
 
 ```bash
-serverless invoke local --function functionName --contextPath lib/context.json
+serverless invoke local --function functionName \
+  --contextPath lib/context.json
 ```
 
 This example will pass the json context in the `lib/context.json` file (relative to the root of the service) while invoking the specified/deployed function.
 
 ### Limitations
 
-Currently, `invoke local` only supports the NodeJs and Python runtimes.
+Currently, `invoke local` only supports the Node.js, Python, Java and Ruby runtimes.
 
 ## Resource permissions
 
diff --git a/docs/providers/aws/cli-reference/login.md b/docs/providers/aws/cli-reference/login.md
index 511644bf59f..b34339d2f79 100644
--- a/docs/providers/aws/cli-reference/login.md
+++ b/docs/providers/aws/cli-reference/login.md
@@ -20,7 +20,4 @@ It will create a new serverless platform account if one doesn't already exist.
 
 ```bash
 serverless login
-
-# Shorthand
-sls login
 ```
diff --git a/docs/providers/aws/cli-reference/logs.md b/docs/providers/aws/cli-reference/logs.md
index 8cae90f8492..2c05bb88cd4 100644
--- a/docs/providers/aws/cli-reference/logs.md
+++ b/docs/providers/aws/cli-reference/logs.md
@@ -19,7 +19,7 @@ Lets you watch the logs of a specific function.
 ```bash
 serverless logs -f hello
 
-# Optionally tail the logs with -t
+# Optionally tail the logs with --tail or -t
 serverless logs -f hello -t
 ```
 
diff --git a/docs/providers/aws/cli-reference/metrics.md b/docs/providers/aws/cli-reference/metrics.md
index 1ea7cad9370..c562803d779 100644
--- a/docs/providers/aws/cli-reference/metrics.md
+++ b/docs/providers/aws/cli-reference/metrics.md
@@ -59,7 +59,9 @@ Displays all `hello` function metrics for the last 24h.
 ### See metrics for the function `hello` of a specific timespan
 
 ```bash
-serverless metrics --function hello --startTime 2016-01-01 --endTime 2016-01-02
+serverless metrics --function hello \
+  --startTime 2016-01-01 \
+  --endTime 2016-01-02
 ```
 
 Displays all `hello` function metrics for the time between January 1, 2016 and January 2, 2016.
diff --git a/docs/providers/aws/cli-reference/print.md b/docs/providers/aws/cli-reference/print.md
index 135db376ff7..c679cdcd412 100644
--- a/docs/providers/aws/cli-reference/print.md
+++ b/docs/providers/aws/cli-reference/print.md
@@ -1,7 +1,7 @@
 <!--
 title: Serverless Framework Commands - AWS Lambda - Print
 menuText: print
-menuOrder: 21
+menuOrder: 22
 description: Print your config with all variables resolved for debugging
 layout: Doc
 -->
diff --git a/docs/providers/aws/cli-reference/rollback-function.md b/docs/providers/aws/cli-reference/rollback-function.md
index 5a152b57fc3..43ecfd5f5f2 100644
--- a/docs/providers/aws/cli-reference/rollback-function.md
+++ b/docs/providers/aws/cli-reference/rollback-function.md
@@ -17,7 +17,8 @@ layout: Doc
 Rollback a function service to a specific version.
 
 ```bash
-serverless rollback function --function <name> --function-version <version>
+serverless rollback function --function <name> \
+  --function-version <version>
 ```
 
 **Note:** You can only rollback a function which was previously deployed through `serverless deploy`. Functions are not versioned when running `serverless deploy function`.
diff --git a/docs/providers/aws/cli-reference/slstats.md b/docs/providers/aws/cli-reference/slstats.md
index f30177402a4..c01ca586a62 100644
--- a/docs/providers/aws/cli-reference/slstats.md
+++ b/docs/providers/aws/cli-reference/slstats.md
@@ -1,7 +1,7 @@
 <!--
 title: Serverless Framework Commands - AWS Lambda - Serverless Stats
 menuText: serverless stats
-menuOrder: 22
+menuOrder: 23
 description: Enables or disables Serverless Statistic logging within the Serverless Framework.
 layout: Doc
 -->
@@ -55,6 +55,6 @@ The following is a list of the events that we collect:
 
 ## Signed in to the Dashboard
 
-If you are signed in to the [Serverless Dashboard](https://app.serverless.com), we do receive your userId as part of the event payloads. We can use this information to understand your tenant and users interactions with the CLI and building services.
+If you are signed in to the [Serverless Dashboard](https://app.serverless.com), we do receive your userId as part of the event payloads. We can use this information to understand your org and users interactions with the CLI and building services.
 
 If you are not signed in, we do not send any identifying information, such as an userId, within any of the event payloads.
diff --git a/docs/providers/aws/events/README.md b/docs/providers/aws/events/README.md
index f84270e0356..6b76c265844 100644
--- a/docs/providers/aws/events/README.md
+++ b/docs/providers/aws/events/README.md
@@ -14,6 +14,8 @@ layout: Doc
 
 Welcome to the AWS Serverless Events Glossary.
 
-Please select a section on the left to get started.
+Please select a section on the left to get started, or see the [user
+guide](../guide/events.md) for general information regarding Lambda Events in
+Serverless.
 
 If you have questions, join the [chat in gitter](https://gitter.im/serverless/serverless) or [post over on the forums](https://forum.serverless.com/)
diff --git a/docs/providers/aws/events/activemq.md b/docs/providers/aws/events/activemq.md
new file mode 100644
index 00000000000..384e6b55107
--- /dev/null
+++ b/docs/providers/aws/events/activemq.md
@@ -0,0 +1,77 @@
+<!--
+title: Serverless Framework - AWS Lambda Events - ActiveMQ
+menuText: ActiveMQ
+description:  Setting up AWS ActiveMQ Events with AWS Lambda via the Serverless Framework
+layout: Doc
+-->
+
+<!-- DOCS-SITE-LINK:START automatically generated  -->
+
+### [Read this on the main serverless docs site](https://www.serverless.com/framework/docs/providers/aws/events/activemq)
+
+<!-- DOCS-SITE-LINK:END -->
+
+# ActiveMQ
+
+An ActiveMQ message broker can be used as an event source for AWS Lambda.
+
+## Simple event definition
+
+In the following example, we specify that the `compute` function should be triggered whenever there are new messages available to consume from defined ActiveMQ `queue`.
+
+In order to configure `activemq` event, you have to provide three required properties:
+
+- `basicAuthArn`, which is a [AWS Secrets Manager](https://aws.amazon.com/secrets-manager/) ARN for credentials required to do basic auth to allow Lambda to connect to your message broker
+- `queue` to consume messages from.
+- `arn` arn for your Amazon MQ message broker
+
+```yml
+functions:
+  compute:
+    handler: handler.compute
+    events:
+      - activemq:
+          arn: arn:aws:mq:us-east-1:0000:broker:ExampleMQBroker:b-xxx-xxx
+          queue: queue-name
+          basicAuthArn: arn:aws:secretsmanager:us-east-1:01234567890:secret:MySecret
+```
+
+## Enabling and disabling ActiveMQ event
+
+The `activemq` event also supports `enabled` parameter, which is used to control if the event source mapping is active. Setting it to `false` will pause polling for and processing new messages.
+
+In the following example, we specify that the `compute` function's `activemq` event should be disabled.
+
+```yml
+functions:
+  compute:
+    handler: handler.compute
+    events:
+      - activemq:
+          arn: arn:aws:mq:us-east-1:0000:broker:ExampleMQBroker:b-xxx-xxx
+          queue: queue-name
+          enabled: false
+          basicAuthArn: arn:aws:secretsmanager:us-east-1:01234567890:secret:MySecret
+```
+
+## Specifying batch size and batch window
+
+You can also specify `batchSize` of number of items to retrieve in a single batch. If not specified, this will default to `100`.
+Likewise `maximumBatchingWindow` can be set to determine the amount of time the Lambda spends gathering records before invoking the function. The default is 0, but **if you set `batchSize` to more than 10, you must set `maximumBatchingWindow` to at least 1**. The maximum is 300.
+
+```yml
+functions:
+  compute:
+    handler: handler.compute
+    events:
+      - activemq:
+          arn: arn:aws:mq:us-east-1:0000:broker:ExampleMQBroker:b-xxx-xxx
+          queue: queue-name
+          batchSize: 5000
+          maximumBatchingWindow: 30
+          basicAuthArn: arn:aws:secretsmanager:us-east-1:01234567890:secret:MySecret
+```
+
+## IAM Permissions
+
+The Serverless Framework will automatically configure the most minimal set of IAM permissions for you. However you can still add additional permissions if you need to. Read the official [AWS documentation](https://docs.aws.amazon.com/lambda/latest/dg/with-mq.html#events-mq-permissions) for more information about IAM Permissions for Amazon MQ events.
diff --git a/docs/providers/aws/events/alb.md b/docs/providers/aws/events/alb.md
index 0573b3a2205..c6293250758 100644
--- a/docs/providers/aws/events/alb.md
+++ b/docs/providers/aws/events/alb.md
@@ -198,7 +198,7 @@ functions:
 
 ## Specifying explicitly the target group names
 
-If you want full control over the name used for the target group you can specify it using the `targetGroupName` property. Note that the name must be unique accross the entire region and is limited to 32 characters with only alphanumerics and hyphens allowed.
+If you want full control over the name used for the target group you can specify it using the `targetGroupName` property. Note that the name must be unique across the entire region and is limited to 32 characters with only alphanumerics and hyphens allowed.
 
 This setting is exclusive with the `provider.alb.targetGroupPrefix` setting.
 
diff --git a/docs/providers/aws/events/apigateway.md b/docs/providers/aws/events/apigateway.md
index 9df1dcc0599..efd1bf56d7d 100644
--- a/docs/providers/aws/events/apigateway.md
+++ b/docs/providers/aws/events/apigateway.md
@@ -12,51 +12,63 @@ layout: Doc
 
 <!-- DOCS-SITE-LINK:END -->
 
-# API Gateway
-
-- [API Gateway](#api-gateway)
-  - [Lambda Proxy Integration](#lambda-proxy-integration)
-    - [Simple HTTP Endpoint](#simple-http-endpoint)
-    - [Example "LAMBDA-PROXY" event (default)](#example-lambda-proxy-event-default)
-    - [HTTP Endpoint with Extended Options](#http-endpoint-with-extended-options)
-    - [Enabling CORS](#enabling-cors)
-    - [HTTP Endpoints with `AWS_IAM` Authorizers](#http-endpoints-with-aws_iam-authorizers)
-    - [HTTP Endpoints with Custom Authorizers](#http-endpoints-with-custom-authorizers)
-    - [HTTP Endpoints with `operationId`](#http-endpoints-with-operationId)
-    - [Catching Exceptions In Your Lambda Function](#catching-exceptions-in-your-lambda-function)
-    - [Setting API keys for your Rest API](#setting-api-keys-for-your-rest-api)
-    - [Configuring endpoint types](#configuring-endpoint-types)
-    - [Request Parameters](#request-parameters)
-    - [Request Schema Validators](#request-schema-validators)
-    - [Setting source of API key for metering requests](#setting-source-of-api-key-for-metering-requests)
-  - [Lambda Integration](#lambda-integration)
-    - [Example "LAMBDA" event (before customization)](#example-lambda-event-before-customization)
-    - [Request templates](#request-templates)
-      - [Default Request Templates](#default-request-templates)
-      - [Custom Request Templates](#custom-request-templates)
-      - [Pass Through Behavior](#pass-through-behavior)
-    - [Responses](#responses)
-      - [Custom Response Headers](#custom-response-headers)
-      - [Custom Response Templates](#custom-response-templates)
-    - [Status Codes](#status-codes)
-      - [Available Status Codes](#available-status-codes)
-      - [Using Status Codes](#using-status-codes)
-      - [Custom Status Codes](#custom-status-codes)
-  - [Setting an HTTP Proxy on API Gateway](#setting-an-http-proxy-on-api-gateway)
-  - [Accessing private resources using VPC Link](#accessing-private-resources-using-vpc-link)
-  - [Mock Integration](#mock-integration)
-  - [Share API Gateway and API Resources](#share-api-gateway-and-api-resources)
-    - [Easiest and CI/CD friendly example of using shared API Gateway and API Resources.](#easiest-and-cicd-friendly-example-of-using-shared-api-gateway-and-api-resources)
-    - [Manually Configuring shared API Gateway](#manually-configuring-shared-api-gateway)
-      - [Note while using authorizers with shared API Gateway](#note-while-using-authorizers-with-shared-api-gateway)
-  - [Share Authorizer](#share-authorizer)
-  - [Resource Policy](#resource-policy)
-  - [Compression](#compression)
-  - [Binary Media Types](#binary-media-types)
-  - [Detailed CloudWatch Metrics](#detailed-cloudwatch-metrics)
-  - [AWS X-Ray Tracing](#aws-x-ray-tracing)
-  - [Tags / Stack Tags](#tags--stack-tags)
-  - [Logs](#logs)
+# API Gateway REST API
+
+API Gateway lets you deploy HTTP APIs. It comes [in two versions](https://docs.aws.amazon.com/apigateway/latest/developerguide/http-api-vs-rest.html):
+
+- v1, also called **REST API**
+- v2, also called **HTTP API**, which is faster and cheaper than v1
+
+Despite their confusing name, both versions allow deploying any HTTP API (like REST, GraphQL, etc.). Read the full comparison [in the AWS documentation](https://docs.aws.amazon.com/apigateway/latest/developerguide/http-api-vs-rest.html).
+
+This guide documents using API Gateway **v1 REST API** via the `http` event.
+
+To use API Gateway **v2 HTTP API** instead, follow the [HTTP API guide](http-api.md).
+
+Summary:
+
+- [Lambda Proxy Integration](#lambda-proxy-integration)
+  - [Simple HTTP Endpoint](#simple-http-endpoint)
+  - [Example "LAMBDA-PROXY" event (default)](#example-lambda-proxy-event-default)
+  - [HTTP Endpoint with Extended Options](#http-endpoint-with-extended-options)
+  - [Enabling CORS](#enabling-cors)
+  - [HTTP Endpoints with `AWS_IAM` Authorizers](#http-endpoints-with-aws_iam-authorizers)
+  - [HTTP Endpoints with Custom Authorizers](#http-endpoints-with-custom-authorizers)
+  - [HTTP Endpoints with `operationId`](#http-endpoints-with-operationId)
+  - [Catching Exceptions In Your Lambda Function](#catching-exceptions-in-your-lambda-function)
+  - [Setting API keys for your Rest API](#setting-api-keys-for-your-rest-api)
+  - [Configuring endpoint types](#configuring-endpoint-types)
+  - [Request Parameters](#request-parameters)
+  - [Request Schema Validators](#request-schema-validators)
+  - [Setting source of API key for metering requests](#setting-source-of-api-key-for-metering-requests)
+- [Lambda Integration](#lambda-integration)
+  - [Example "LAMBDA" event (before customization)](#example-lambda-event-before-customization)
+  - [Request templates](#request-templates)
+    - [Default Request Templates](#default-request-templates)
+    - [Custom Request Templates](#custom-request-templates)
+    - [Pass Through Behavior](#pass-through-behavior)
+  - [Responses](#responses)
+    - [Custom Response Headers](#custom-response-headers)
+    - [Custom Response Templates](#custom-response-templates)
+  - [Status Codes](#status-codes)
+    - [Available Status Codes](#available-status-codes)
+    - [Using Status Codes](#using-status-codes)
+    - [Custom Status Codes](#custom-status-codes)
+- [Setting an HTTP Proxy on API Gateway](#setting-an-http-proxy-on-api-gateway)
+- [Accessing private resources using VPC Link](#accessing-private-resources-using-vpc-link)
+- [Mock Integration](#mock-integration)
+- [Share API Gateway and API Resources](#share-api-gateway-and-api-resources)
+  - [Easiest and CI/CD friendly example of using shared API Gateway and API Resources.](#easiest-and-cicd-friendly-example-of-using-shared-api-gateway-and-api-resources)
+  - [Manually Configuring shared API Gateway](#manually-configuring-shared-api-gateway)
+    - [Note while using authorizers with shared API Gateway](#note-while-using-authorizers-with-shared-api-gateway)
+- [Share Authorizer](#share-authorizer)
+- [Resource Policy](#resource-policy)
+- [Compression](#compression)
+- [Binary Media Types](#binary-media-types)
+- [Detailed CloudWatch Metrics](#detailed-cloudwatch-metrics)
+- [AWS X-Ray Tracing](#aws-x-ray-tracing)
+- [Tags / Stack Tags](#tags--stack-tags)
+- [Logs](#logs)
 
 _Are you looking for tutorials on using API Gateway? Check out the following resources:_
 
@@ -327,7 +339,8 @@ functions:
               - X-Amz-Security-Token
               - X-Amz-User-Agent
             allowCredentials: false
-            cacheControl: 'max-age=600, s-maxage=600, proxy-revalidate' # Caches on browser and proxy for 10 minutes and doesnt allow proxy to serve out of date content
+            # Caches on browser and proxy for 10 minutes and doesnt allow proxy to serve out of date content
+            cacheControl: 'max-age=600, s-maxage=600, proxy-revalidate'
 ```
 
 CORS header accepts single value too
@@ -355,8 +368,10 @@ module.exports.hello = function (event, context, callback) {
   const response = {
     statusCode: 200,
     headers: {
-      'Access-Control-Allow-Origin': '*', // Required for CORS support to work
-      'Access-Control-Allow-Credentials': true, // Required for cookies, authorization headers with HTTPS
+      // Required for CORS support to work
+      'Access-Control-Allow-Origin': '*',
+      // Required for cookies, authorization headers with HTTPS
+      'Access-Control-Allow-Credentials': true,
     },
     body: JSON.stringify({ message: 'Hello World!' }),
   };
@@ -608,7 +623,7 @@ In case an exception is thrown in your lambda function AWS will send an error me
 
 ### Setting API keys for your Rest API
 
-You can specify a list of API keys to be used by your service Rest API by adding an `apiKeys` array property to the `provider.apiGateway` object in `serverless.yml`. You'll also need to explicitly specify which endpoints are `private` and require one of the api keys to be included in the request by adding a `private` boolean property to the `http` event object you want to set as private. API Keys are created globally, so if you want to deploy your service to different stages make sure your API key contains a stage variable as defined below. When using API keys, you can optionally define usage plan quota and throttle, using `usagePlan` object.
+You can specify a list of API keys to be used by your service Rest API by adding an `apiKeys` array property to the `provider.apiGateway` object in `serverless.yml`. You'll also need to explicitly specify which endpoints are `private` and require one of the api keys to be included in the request by adding a `private` boolean property to the `http` event object you want to set as private. API Keys are created globally, so if you want to deploy your service to different stages make sure your API key contains a stage variable as defined below. When using API keys, you can optionally define usage plan quota and throttle, using `usagePlan` object. Additionally, you can also disable selected API keys by setting `enabled` property to `false`.
 
 When setting the value, you need to be aware that changing value will require replacement and CloudFormation doesn't allow
 two API keys with the same name. It means that you need to change the name also when changing the value. If you don't care
@@ -624,10 +639,12 @@ provider:
     apiKeys:
       - myFirstKey
       - ${opt:stage}-myFirstKey
-      - ${env:MY_API_KEY} # you can hide it in a serverless variable
+      # you can hide it in a serverless variable
+      - ${env:MY_API_KEY}
       - name: myThirdKey
         value: myThirdKeyValue
-      - value: myFourthKeyValue # let cloudformation name the key (recommended when setting api key value)
+      # let cloudformation name the key (recommended when setting api key value)
+      - value: myFourthKeyValue
         description: Api key description # Optional
         customerId: A string that will be set as the customerID for the key # Optional
     usagePlan:
@@ -1637,16 +1654,17 @@ provider:
   name: aws
   runtime: nodejs12.x
 
-  resourcePolicy:
-    - Effect: Allow
-      Principal: '*'
-      Action: execute-api:Invoke
-      Resource:
-        - execute-api:/*/*/*
-      Condition:
-        IpAddress:
-          aws:SourceIp:
-            - '123.123.123.123'
+  apiGateway:
+    resourcePolicy:
+      - Effect: Allow
+        Principal: '*'
+        Action: execute-api:Invoke
+        Resource:
+          - execute-api:/*/*/*
+        Condition:
+          IpAddress:
+            aws:SourceIp:
+              - '123.123.123.123'
 ```
 
 ## Compression
@@ -1664,31 +1682,35 @@ provider:
 
 API Gateway makes it possible to return binary media such as images or files as responses.
 
-Configuring API Gateway to return binary media can be done via the `binaryMediaTypes` config:
+To return binary media in proxy integration, set the `binaryMediaTypes` config:
 
 ```yml
 provider:
   apiGateway:
     binaryMediaTypes:
       - '*/*'
+functions:
+  binaryExample:
+    handler: binaryExample.handler
+    events:
+      - http:
+          path: binary
+          method: GET
 ```
 
-In your Lambda function you need to ensure that the correct `content-type` header is set. Furthermore you might want to return the response body in base64 format.
+Having that in your Lambda function, you need to ensure that the correct `content-type` header is set and provide a base64 encoded string for a body.
+e.g., Assuming that there's an `image.jpg` file located aside of `binaryExample.js` lambda handler, the handler can be set up as follows:
 
-To convert the request or response payload, you can set the [contentHandling](https://docs.aws.amazon.com/apigateway/latest/developerguide/api-gateway-payload-encodings-workflow.html) property (if set, the response contentHandling property will be passed to integration responses with 2XXs method response statuses).
+```js
+const fsp = require('fs').promises;
+const path = require('path');
 
-```yml
-functions:
-  create:
-    handler: posts.create
-    events:
-      - http:
-          path: posts/create
-          method: post
-          request:
-            contentHandling: CONVERT_TO_TEXT
-          response:
-            contentHandling: CONVERT_TO_TEXT
+module.exports.handler = async () => ({
+  statusCode: 200,
+  headers: { 'Content-type': 'image/jpeg' },
+  body: (await fsp.readFile(path.resolve(__dirname, 'image.jpg'))).toString('base64'),
+  isBase64Encoded: true,
+});
 ```
 
 ## Detailed CloudWatch Metrics
@@ -1835,3 +1857,13 @@ provider:
       level: INFO
       fullExecutionData: false
 ```
+
+## Disable Default Endpoint
+
+By default, clients can invoke your API with the default https://{api_id}.execute-api.{region}.amazonaws.com endpoint. To require that clients use a custom domain name to invoke your API, disable the default endpoint.
+
+```yml
+provider:
+  apiGateway:
+    disableDefaultEndpoint: true
+```
diff --git a/docs/providers/aws/events/cloudfront.md b/docs/providers/aws/events/cloudfront.md
index 29e1fe521bb..125216aa4bb 100644
--- a/docs/providers/aws/events/cloudfront.md
+++ b/docs/providers/aws/events/cloudfront.md
@@ -35,7 +35,7 @@ Lambda@Edge has four options when the Lambda function is triggered
 
 **MEMORY AND TIMEOUT LIMITS:** According to [AWS Limits on Lambda@Edge](https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/cloudfront-limits.html#limits-lambda-at-edge) the limits for viewer-request and viewer-response are 128MB memory and 5 seconds timeout and for origin-request and origin-response are 3008MB memory and 30 seconds timeout.
 
-**RUNTIME LIMITS:** According to [AWS Requirements on Lambda@Edge](https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/lambda-requirements-limits.html) the runtimes supported by Lambda@Edge functions are: `Python 3.8`, `Python 3.7`, `Node.js 12.x`, `Node.js 10.x`.
+**RUNTIME LIMITS:** According to [AWS Requirements on Lambda@Edge](https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/lambda-requirements-limits.html) the runtimes supported by Lambda@Edge functions are: `Python 3.8`, `Python 3.7`, `Node.js 14.x`, `Node.js 12.x`, `Node.js 10.x`.
 
 ## Simple event definition
 
@@ -238,6 +238,20 @@ functions:
             id: 658327ea-f89d-4fab-a63d-7e88639e58f6 # references AWS Managed Policy named Managed-CachingOptimized
 ```
 
+It is also possible to reference policies with `behavior.CachePolicyId` property. When both `cachePolicy.id` and `behavior.CachePolicyId` are specified, setting from `cachePolicy.id` will be used. Similarily, when `cachePolicy.name` and `behavior.CachePolicyId` are specified, setting from `cachePolicy.name` will be used.
+
+```yml
+functions:
+  myLambdaAtEdge:
+    handler: myLambdaAtEdge.handler
+    events:
+      - cloudFront:
+          eventType: viewer-response
+          origin: s3://bucketname.s3.amazonaws.com/files
+          behavior:
+            CachePolicyId: 658327ea-f89d-4fab-a63d-7e88639e58f6 # references AWS Managed Policy named Managed-CachingOptimized
+```
+
 ### CloudFront Distribution configurations
 
 Amazon CloudFront distribution configurations can be set in the resources block of the serverless.yml, by defining `CloudFrontDistribution`.
diff --git a/docs/providers/aws/events/cognito-user-pool.md b/docs/providers/aws/events/cognito-user-pool.md
index a8b9129f9a5..5fb141949b7 100644
--- a/docs/providers/aws/events/cognito-user-pool.md
+++ b/docs/providers/aws/events/cognito-user-pool.md
@@ -134,5 +134,21 @@ resources:
       Type: AWS::Cognito::UserPool
 ```
 
+## Forcing deploying of triggers
+
+A Cognito User Pool with triggers attached may not be correctly updated by AWS Cloudformation on subsequent deployments. To circumvent this issue you can use the `forceDeploy` flag which will try to force Cloudformation to update the triggers no matter what. This flag has to be used in conjuction with the `existing: true` flag.
+
+```yml
+functions:
+  preSignUp:
+    handler: preSignUp.handler
+    events:
+      - cognitoUserPool:
+          pool: MyUserPool1
+          trigger: PreSignUp
+          existing: true
+          forceDeploy: true
+```
+
 [aws-triggers-guide]: http://docs.aws.amazon.com/cognito/latest/developerguide/cognito-user-identity-pools-working-with-aws-lambda-triggers.html
 [aws-triggers-list]: https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-userpool-lambdaconfig.html
diff --git a/docs/providers/aws/events/event-bridge.md b/docs/providers/aws/events/event-bridge.md
index 2b8f29c6428..ad23168ff35 100644
--- a/docs/providers/aws/events/event-bridge.md
+++ b/docs/providers/aws/events/event-bridge.md
@@ -16,7 +16,7 @@ layout: Doc
 
 The [EventBridge](https://aws.amazon.com/eventbridge/) makes it possible to connect applications using data from external sources (e.g. own applications, SaaS) or AWS services. The `eventBridge` event types helps setting up AWS Lambda functions to react to events coming in via the EventBridge.
 
-_Note_: Prior to `2.27.0` version of the Framework, `eventBridge` resources were provisioned with Custom Resources. With `2.27.0` an optional support for native CloudFormation was introduced and can be turned on by setting `provider.eventBridge.useCloudFormation` property to `true`. It is recommended to migrate to native CloudFormation as it will become a default with next major version. It also adds the ability to define `eventBus` with CF intrinsic functions as values.
+_Note_: Prior to `2.27.0` version of the Framework, `eventBridge` resources were provisioned with Custom Resources. With `2.27.0` an optional support for native CloudFormation was introduced and can be turned on by setting `provider.eventBridge.useCloudFormation: true`. It is recommended to migrate to native CloudFormation as it will become a default with v3. It also adds the ability to define `eventBus` with CF intrinsic functions as values.
 
 ## Setting up a scheduled event
 
@@ -31,6 +31,22 @@ functions:
             key1: value1
 ```
 
+## Enabling / Disabling
+
+**Note:** `eventBridge` events are enabled by default. Use `enabled: false` to disable the rule.
+
+```yml
+functions:
+  myFunction:
+    handler: index.handler
+    events:
+      - eventBridge:
+          enabled: false
+          schedule: rate(10 minutes)
+          input:
+            key1: value1
+```
+
 ## Setting up event pattern matching
 
 ```yml
@@ -71,7 +87,13 @@ functions:
 
 ### Re-using an existing event bus
 
-If you want to reuse an existing event bus, you can define it with literal `arn` or with a reference to an existing event bus name via CF intrinsic functions. Referencing via intrinsic functions in available only if you use native CloudFormation support with `provider.eventBridge.useCloudFormation: true` setting.
+If you want to reuse an existing event bus, you can define it with literal `arn` or with a reference to an existing event bus name via CF intrinsic functions. Referencing via intrinsic functions is available only if you use native CloudFormation support with `provider.eventBridge.useCloudFormation: true` setting:
+
+```yml
+provider:
+  eventBridge:
+    useCloudFormation: true
+```
 
 Using literal `arn`:
 
@@ -164,3 +186,46 @@ functions:
               eventTime: '$.time'
             inputTemplate: '{"time": <eventTime>, "key1": "value1"}'
 ```
+
+## Adding a DLQ to an event rule
+
+DeadLetterQueueArn is not available for custom resources, only for native CloudFormation.
+
+```yml
+functions:
+  myFunction:
+    handler: index.handler
+    events:
+      - eventBridge:
+          eventBus: custom-saas-events
+          pattern:
+            source:
+              - saas.external
+          deadLetterQueueArn:
+            Fn::GetAtt:
+              - QueueName
+              - Arn
+```
+
+## Adding a retry policy to an event rule
+
+RetryPolicy is not available for custom resources, only for native CloudFormation.
+
+```yml
+functions:
+  myFunction:
+    handler: index.handler
+    events:
+      - eventBridge:
+          eventBus: custom-saas-events
+          pattern:
+            source:
+              - saas.external
+          deadLetterQueueArn:
+            Fn::GetAtt:
+              - QueueName
+              - Arn
+          retryPolicy:
+            maximumEventAge: 3600
+            maximumRetryAttempts: 3
+```
diff --git a/docs/providers/aws/events/http-api.md b/docs/providers/aws/events/http-api.md
index 0333c0c58b0..6ff6fa8e102 100644
--- a/docs/providers/aws/events/http-api.md
+++ b/docs/providers/aws/events/http-api.md
@@ -12,11 +12,18 @@ layout: Doc
 
 <!-- DOCS-SITE-LINK:END -->
 
-# HTTP API
+# API Gateway HTTP API
 
-HTTP APIs are a special flavored [API Gateway](https://aws.amazon.com/api-gateway/) implementation which offer more features and improved performance. They have some benefits and drawbacks compared to the traditional API Gateway REST APIs. Read the differences in the [AWS Documentation](https://docs.aws.amazon.com/apigateway/latest/developerguide/http-api-vs-rest.html).
+API Gateway lets you deploy HTTP APIs. It comes [in two versions](https://docs.aws.amazon.com/apigateway/latest/developerguide/http-api-vs-rest.html):
 
-The Serverless Framework makes it possible to setup [API Gateway](https://aws.amazon.com/api-gateway/) HTTP APIs via the `httpApi` event.
+- v1, also called **REST API**
+- v2, also called **HTTP API**, which is faster and cheaper than v1
+
+Despite their confusing name, both versions allow deploying any HTTP API (like REST, GraphQL, etc.). Read the full comparison [in the AWS documentation](https://docs.aws.amazon.com/apigateway/latest/developerguide/http-api-vs-rest.html).
+
+This guide documents using API Gateway **v2 HTTP API** via the `httpApi` event.
+
+To use API Gateway **v1 REST API** instead, follow the [API Gateway REST API guide](apigateway.md).
 
 ## Event Definition
 
@@ -392,6 +399,20 @@ provider:
     payload: '1.0'
 ```
 
+The payload version can also be specified at the function level with httpApi.payload property and it will take precedence over the payload version configured at the provider level. It can be configured as:
+
+```yaml
+functions:
+  hello:
+    handler: index.handler
+    httpApi:
+      payload: '1.0'
+    events:
+      - httpApi:
+          path: /hello
+          method: GET
+```
+
 ### Detailed Metrics
 
 With HTTP API we may configure detailed metrics that can be used setup monitoring and alerting in Cloudwatch.
@@ -406,7 +427,7 @@ provider:
 
 ### Tags
 
-When using HTTP API, it is possible to tag the corresponding API Gateway. By setting `provider.httpApi.useProviderTags` to `true`, all tags defined on `provider.tags` will be applied to API Gateway.
+When using HTTP API, it is possible to tag the corresponding API Gateway resources. By setting `provider.httpApi.useProviderTags` to `true`, all tags defined on `provider.tags` will be applied to API Gateway and API Gateway Stage.
 
 ```yaml
 provider:
@@ -416,6 +437,80 @@ provider:
     useProviderTags: true
 ```
 
-In the above example, the tag project: myProject will be applied to API Gateway.
+In the above example, the tag project: myProject will be applied to API Gateway and API Gateway Stage.
 
 _Note: If the API Gateway has any existing tags applied outside of Serverless Framework, they will be removed during deployment._
+
+### Disable Default Endpoint
+
+By default, clients can invoke your API with the default https://{api_id}.execute-api.{region}.amazonaws.com endpoint. To require that clients use a custom domain name to invoke your API, disable the default endpoint.
+
+```yml
+provider:
+  httpApi:
+    disableDefaultEndpoint: true
+```
+
+### Service Naming
+
+You can use the `shouldStartNameWithService` option to change the naming scheme for HTTP API from the default `${stage}-${service}` to `${service}-${stage}`.
+
+```yml
+provider:
+  httpApi:
+    shouldStartNameWithService: true
+```
+
+## Custom domains
+
+API Gateway generates URLs for HTTP APIs in the following format:
+
+```
+https://<random>.execute-api.<region>.amazonaws.com/
+```
+
+It is possible to replace those URLs by a custom domain.
+
+Step 1, create an HTTPS certificate in AWS ACM:
+
+- Open [AWS ACM](https://console.aws.amazon.com/acm/home) (AWS Certificate Manager)
+- Switch to the region of your application
+- Click "Request a certificate"
+- Select "Request a public certificate" and continue
+- Add your domain and continue
+- Choose the domain validation of your choice:
+  - Email validation will require you to click a link you will receive in an email sent to admin@your-domain.com
+  - Domain validation will require you to add CNAME entries to your DNS configuration
+- Validate the domain via the method chosen above
+
+Step 2, set up the custom domain in API Gateway:
+
+- Open [API Gateway's "Custom Domain" configuration](https://console.aws.amazon.com/apigateway/main/publish/domain-names)
+- Switch to the region of your application
+- Click "Create"
+- Enter your domain name, select the certificate you created above and validate the page
+- After the domain is created, click the "API mappings" tab
+- Click "Configure API mappings" and "Add new mapping"
+- Select your HTTP API and the `$default` stage
+- Click "Save"
+
+Step 3, configure the DNS of the domain:
+
+- If using Route53:
+  - Open the Hosted Zone in the [Route53 console](https://console.aws.amazon.com/route53/v2/hostedzones)
+  - Click "Create record"
+  - Select "Record type" of type "A"
+  - "Route traffic to": select "Alias", and then select your API Gateway
+  - Finish the record creation
+- If using any other domain registrar
+  - Open the "Configurations" tab on the custom domain name you just created
+  - Note the "API Gateway domain name" which should look like this: `d-1234567890.execute-api.us-east-1.amazonaws.com`
+  - Create a CNAME entry to point your domain name to the API Gateway domain
+
+Once a custom domain is set up, you can [disable the default API Gateway endpoint](#disable-default-endpoint):
+
+```yaml
+provider:
+  httpApi:
+    disableDefaultEndpoint: true
+```
diff --git a/docs/providers/aws/events/kafka.md b/docs/providers/aws/events/kafka.md
index 73a8c43f18d..63e3df7320f 100644
--- a/docs/providers/aws/events/kafka.md
+++ b/docs/providers/aws/events/kafka.md
@@ -15,15 +15,53 @@ layout: Doc
 
 A self-managed Apache Kafka cluster can be used as an event source for AWS Lambda.
 
-## Simple event definition
+In order to configure lambda to trigger via `kafka` events, you must provide three required properties:
 
-In the following example, we specify that the `compute` function should be triggered whenever there are new messages available to consume from defined Kafka `topic`.
+- `accessConfigurations` which defines the chosen [authentication](#authentication) method configuration
+- `topic` to consume messages from
+- `bootstrapServers` - an array of bootstrap server addresses for your Kafka cluster
 
-In order to configure `kafka` event, you have to provide three required properties:
+## Authentication
 
-- `accessConfigurations`, which is either secret credentials required to do [SASL_SCRAM auth](https://docs.confluent.io/platform/current/kafka/authentication_sasl/authentication_sasl_scram.html), or this is VPC configuration to allow Lambda to connect to your cluster
-- `topic` to consume messages from.
-- `bootstrapServers` an array of bootstrap server addresses for your Kafka cluster
+You must authenticate your Lambda with a self-managed Apache Kafka cluster using one of;
+
+- VPC - subnet(s) and security group
+- SASL SCRAM/PLAIN - AWS Secrets Manager secret containing credentials
+- Mutual TLS (mTLS) - AWS Secrets Manager secret containing client certificate, private key, and optionally a CA certificate
+
+You can provide this configuration via `accessConfigurations`
+
+You must provide at least one method, but it is possible to use VPC in parallel with other methods. For example, you may choose to authenticate via mTLS or SASL/SCRAM, and also place your Lambda and cluster within a VPC.
+
+Valid options for `accessConfigurations` are:
+
+```yaml
+saslPlainAuth: arn:aws:secretsmanager:us-east-1:01234567890:secret:SaslPlain
+saslScram256Auth: arn:aws:secretsmanager:us-east-1:01234567890:secret:SaslScram256
+saslScram512Auth: arn:aws:secretsmanager:us-east-1:01234567890:secret:SaslScram512
+clientCertificateTlsAuth: arn:aws:secretsmanager:us-east-1:01234567890:secret:ClientCertificateTLS
+serverRootCaCertificate: arn:aws:secretsmanager:us-east-1:01234567890:secret:ServerRootCaCertificate
+vpcSubnet:
+  - subnet-0011001100
+  - subnet-0022002200
+vpcSecurityGroup: sg-0123456789
+```
+
+For more information see:
+
+- [AWS Documentation - Using Lambda with self-managed Apache Kafka](https://docs.aws.amazon.com/lambda/latest/dg/with-kafka.html#smaa-authentication)
+
+- [AWS Documentation - AWS::Lambda::EventSourceMapping SourceAccessConfiguration](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lambda-eventsourcemapping-sourceaccessconfiguration.html)
+
+- [Confluent documentation - Authentication with SASL/PLAIN](https://docs.confluent.io/platform/current/kafka/authentication_sasl/authentication_sasl_plain.html)
+
+- [Confluent documentation - Authentication with SASL/SCRAM](https://docs.confluent.io/platform/current/kafka/authentication_sasl/authentication_sasl_scram.html)
+
+- [Confluent documentation Encryption and Authentication with SSL](https://docs.confluent.io/platform/current/kafka/authentication_ssl.html)
+
+## Basic Example: SASL/SCRAM
+
+In the following example, we specify that the `compute` function should be triggered whenever there are new messages available to consume from Kafka topic `MySelfManagedKafkaTopic` from self-hosted cluster at `xyz.com`. The cluster has been authenticated using SASL/SCRAM, the credentials are stored at secret `MyBrokerSecretName`
 
 ```yml
 functions:
@@ -33,7 +71,26 @@ functions:
       - kafka:
           accessConfigurations:
             saslScram512Auth: arn:aws:secretsmanager:us-east-1:01234567890:secret:MyBrokerSecretName
-          topic: AWSKafkaTopic
+          topic: MySelfManagedKafkaTopic
+          bootstrapServers:
+            - abc3.xyz.com:9092
+            - abc2.xyz.com:9092
+```
+
+## Example: Using mTLS
+
+In this example, the lambda event source is a self-managed Apache kafka cluster authenticated via mTLS. The value of `clientCertificateTlsAuth` is an arn of a secret containing the client certificate and privatekey required for the mTLS handshake. The value of `serverRootCaCertificate` is an arn of a secret containing the Certificate Authority (CA) Certificate. This is optional, you only need to provide if your cluster requires it.
+
+```yml
+functions:
+  compute:
+    handler: handler.compute
+    events:
+      - kafka:
+          accessConfigurations:
+            clientCertificateTlsAuth: arn:aws:secretsmanager:us-east-1:01234567890:secret:ClientCertificateTLS
+            serverRootCaCertificate: arn:aws:secretsmanager:us-east-1:01234567890:secret:ServerRootCaCertificate
+          topic: MySelfManagedMTLSKafkaTopic
           bootstrapServers:
             - abc3.xyz.com:9092
             - abc2.xyz.com:9092
@@ -60,7 +117,7 @@ functions:
             - abc2.xyz.com:9092
 ```
 
-## Enabling and disabling Kafka event
+## Enabling and disabling Kafka event trigger
 
 The `kafka` event also supports `enabled` parameter, which is used to control if the event source mapping is active. Setting it to `false` will pause polling for and processing new messages.
 
@@ -84,3 +141,28 @@ functions:
 ## IAM Permissions
 
 The Serverless Framework will automatically configure the most minimal set of IAM permissions for you. However you can still add additional permissions if you need to. Read the official [AWS documentation](https://docs.aws.amazon.com/lambda/latest/dg/kafka-smaa.html) for more information about IAM Permissions for Kafka events.
+
+## Setting the BatchSize, MaximumBatchingWindow and StartingPosition
+
+You can set the `batchSize`, which effects how many messages can be processed in a single Lambda invocation. The default `batchSize` is 100, and the max `batchSize` is 10000.
+Likewise `maximumBatchingWindow` can be set to determine the amount of time the Lambda spends gathering records before invoking the function. The default is 0, but **if you set `batchSize` to more than 10, you must set `maximumBatchingWindow` to at least 1**. The maximum is 300.
+In addition, you can also configure `startingPosition`, which controls the position at which Lambda should start consuming messages from the topic. It supports two possible values, `TRIM_HORIZON` and `LATEST`, with `TRIM_HORIZON` being the default.
+
+In the following example, we specify that the `compute` function should have a `kafka` event configured with `batchSize` of 1000, `maximumBatchingWindow` of 30 seconds and `startingPosition` equal to `LATEST`.
+
+```yml
+functions:
+  compute:
+    handler: handler.compute
+    events:
+      - kafka:
+          accessConfigurations:
+            saslScram512Auth: arn:aws:secretsmanager:us-east-1:01234567890:secret:MyBrokerSecretName
+          topic: MySelfManagedKafkaTopic
+          bootstrapServers:
+            - abc3.xyz.com:9092
+            - abc2.xyz.com:9092
+          batchSize: 1000
+          maximumBatchingWindow: 30
+          startingPosition: LATEST
+```
diff --git a/docs/providers/aws/events/msk.md b/docs/providers/aws/events/msk.md
index d67121fb5bf..94bb5e0d05b 100644
--- a/docs/providers/aws/events/msk.md
+++ b/docs/providers/aws/events/msk.md
@@ -43,12 +43,13 @@ functions:
           topic: mytopic
 ```
 
-## Setting the BatchSize and StartingPosition
+## Setting the BatchSize, MaximumBatchingWindow and StartingPosition
 
 For the MSK event integration, you can set the `batchSize`, which effects how many messages can be processed in a single Lambda invocation. The default `batchSize` is 100, and the max `batchSize` is 10000.
+Likewise `maximumBatchingWindow` can be set to determine the amount of time the Lambda spends gathering records before invoking the function. The default is 0, but **if you set `batchSize` to more than 10, you must set `maximumBatchingWindow` to at least 1**. The maximum is 300.
 In addition, you can also configure `startingPosition`, which controls the position at which Lambda should start consuming messages from MSK topic. It supports two possible values, `TRIM_HORIZON` and `LATEST`, with `TRIM_HORIZON` being the default.
 
-In the following example, we specify that the `compute` function should have an `msk` event configured with `batchSize` of 1000 and `startingPosition` equal to `LATEST`.
+In the following example, we specify that the `compute` function should have an `msk` event configured with `batchSize` of 1000, `maximumBatchingWindow` to 30 seconds and `startingPosition` equal to `LATEST`.
 
 ```yml
 functions:
@@ -59,6 +60,7 @@ functions:
           arn: arn:aws:kafka:region:XXXXXX:cluster/MyCluster/xxxx-xxxxx-xxxx
           topic: mytopic
           batchSize: 1000
+          maximumBatchingWindow: 30
           startingPosition: LATEST
 ```
 
diff --git a/docs/providers/aws/events/rabbitmq.md b/docs/providers/aws/events/rabbitmq.md
new file mode 100644
index 00000000000..01a664f50b7
--- /dev/null
+++ b/docs/providers/aws/events/rabbitmq.md
@@ -0,0 +1,77 @@
+<!--
+title: Serverless Framework - AWS Lambda Events - RabbitMQ
+menuText: RabbitMQ
+description:  Setting up AWS RabbitMQ Events with AWS Lambda via the Serverless Framework
+layout: Doc
+-->
+
+<!-- DOCS-SITE-LINK:START automatically generated  -->
+
+### [Read this on the main serverless docs site](https://www.serverless.com/framework/docs/providers/aws/events/rabbitmq)
+
+<!-- DOCS-SITE-LINK:END -->
+
+# RabbitMQ
+
+A RabbitMQ message broker can be used as an event source for AWS Lambda.
+
+## Simple event definition
+
+In the following example, we specify that the `compute` function should be triggered whenever there are new messages available to consume from defined RabbitMQ `queue`.
+
+In order to configure `rabbitmq` event, you have to provide three required properties:
+
+- `basicAuthArn`, which is a [AWS Secrets Manager](https://aws.amazon.com/secrets-manager/) ARN for credentials required to do basic auth to allow Lambda to connect to your message broker
+- `queue` to consume messages from.
+- `arn` arn for your Amazon MQ message broker
+
+```yml
+functions:
+  compute:
+    handler: handler.compute
+    events:
+      - rabbitmq:
+          arn: arn:aws:mq:us-east-1:0000:broker:ExampleMQBroker:b-xxx-xxx
+          queue: queue-name
+          basicAuthArn: arn:aws:secretsmanager:us-east-1:01234567890:secret:MySecret
+```
+
+## Enabling and disabling RabbitMQ event
+
+The `rabbitmq` event also supports `enabled` parameter, which is used to control if the event source mapping is active. Setting it to `false` will pause polling for and processing new messages.
+
+In the following example, we specify that the `compute` function's `rabbitmq` event should be disabled.
+
+```yml
+functions:
+  compute:
+    handler: handler.compute
+    events:
+      - rabbitmq:
+          arn: arn:aws:mq:us-east-1:0000:broker:ExampleMQBroker:b-xxx-xxx
+          queue: queue-name
+          enabled: false
+          basicAuthArn: arn:aws:secretsmanager:us-east-1:01234567890:secret:MySecret
+```
+
+## Specifying batch size and batch window
+
+You can also specify `batchSize` of number of items to retrieve in a single batch. If not specified, this will default to `100`.
+Likewise `maximumBatchingWindow` can be set to determine the amount of time the Lambda spends gathering records before invoking the function. The default is 0, but **if you set `batchSize` to more than 10, you must set `maximumBatchingWindow` to at least 1**. The maximum is 300.
+
+```yml
+functions:
+  compute:
+    handler: handler.compute
+    events:
+      - rabbitmq:
+          arn: arn:aws:mq:us-east-1:0000:broker:ExampleMQBroker:b-xxx-xxx
+          queue: queue-name
+          batchSize: 5000
+          maximumBatchingWindow: 30
+          basicAuthArn: arn:aws:secretsmanager:us-east-1:01234567890:secret:MySecret
+```
+
+## IAM Permissions
+
+The Serverless Framework will automatically configure the most minimal set of IAM permissions for you. However you can still add additional permissions if you need to. Read the official [AWS documentation](https://docs.aws.amazon.com/lambda/latest/dg/with-mq.html#events-mq-permissions) for more information about IAM Permissions for Amazon MQ events.
diff --git a/docs/providers/aws/events/schedule.md b/docs/providers/aws/events/schedule.md
index 1e46a5e79c2..1840dc938bb 100644
--- a/docs/providers/aws/events/schedule.md
+++ b/docs/providers/aws/events/schedule.md
@@ -69,3 +69,24 @@ events:
       description: 'your scheduled rate event description'
       rate: rate(2 hours)
 ```
+
+## Specify multiple schedule expressions
+
+An array of schedule expressions (i.e. using either `rate` or `cron` syntax) can be specified, in order to avoid repeating other configuration variables.
+This is specially useful in situations in which there's no other way than using multiple cron expressions to schedule a function.
+
+This will trigger the function at certain times on weekdays and on different times on weekends, using the same input:
+
+```yaml
+functions:
+  foo:
+    handler: foo.handler
+    events:
+      - schedule:
+          rate:
+            - cron(0 0/4 ? * MON-FRI *)
+            - cron(0 2 ? * SAT-SUN *)
+          input:
+            key1: value1
+            key2: value2
+```
diff --git a/docs/providers/aws/events/sqs.md b/docs/providers/aws/events/sqs.md
index 669097b09ae..40ba80713ce 100644
--- a/docs/providers/aws/events/sqs.md
+++ b/docs/providers/aws/events/sqs.md
@@ -51,7 +51,11 @@ functions:
 
 For the SQS event integration, you can set the `batchSize`, which effects how many SQS messages can be included in a single Lambda invocation. The default `batchSize` is `10`. The max `batchSize` is `10000` for a standard queue, `10` for a FIFO queue.
 
-You can also set `maximumBatchingWindow` to standard queues to specify the maximum amount of time in seconds to gather records before invoking the function. The max `maximumBatchingWindow` is `300` seconds. Check [AWS documentation](https://docs.aws.amazon.com/lambda/latest/dg/with-sqs.html) for more details.
+You can also set `maximumBatchingWindow` to standard queues to specify the maximum amount of time in seconds to gather records before invoking the function. The max `maximumBatchingWindow` is `300` seconds.
+
+You can set `functionResponseType` to `ReportBatchItemFailures` to let your function return a partial success result if one or more messages in the batch have failed.
+
+Check [AWS documentation](https://docs.aws.amazon.com/lambda/latest/dg/with-sqs.html) for more details.
 
 ```yml
 functions:
@@ -62,8 +66,59 @@ functions:
           arn: arn:aws:sqs:region:XXXXXX:myQueue
           batchSize: 10
           maximumBatchingWindow: 60
+          functionResponseType: ReportBatchItemFailures
+```
+
+## Setting filter patterns
+
+This configuration allows customers to filter event before lambda invocation. It accepts up to 5 filter patterns by default and up to 10 with quota extension. If one event matches at least 1 pattern, lambda will process it.
+
+For more details and examples of filter patterns, please see the [AWS event filtering documentation](https://docs.aws.amazon.com/lambda/latest/dg/invocation-eventfiltering.html)
+
+Note: Serverless only sets this property if you explicitly add it to the `sqs` configuration (see an example below). The following example will only process records where field `a` is equal to 1 or 2.
+
+```yml
+functions:
+  onlyOneOrTwo:
+    handler: handler.preprocess
+    events:
+      - sqs:
+          arn: arn:aws:sqs:region:XXXXXX:myQueue
+          filterPatterns:
+            - a: [1, 2]
 ```
 
 ## IAM Permissions
 
 The Serverless Framework will automatically configure the most minimal set of IAM permissions for you. However you can still add additional permissions if you need to. Read the official [AWS documentation](https://docs.aws.amazon.com/AWSSimpleQueueService/latest/SQSDeveloperGuide/sqs-configure-lambda-function-trigger.html) for more information about IAM Permissions for SQS events.
+
+## Deploying SQS queues
+
+The examples above show how to consume messages from an existing SQS queue. To create an SQS queue in `serverless.yml`, you can either write custom CloudFormation, or you can use Lift.
+
+[Lift](https://github.com/getlift/lift) is a Serverless Framework plugin that simplifies deploying pieces of applications via "[constructs](https://github.com/getlift/lift#constructs)". Lift can be installed via:
+
+```
+serverless plugin install -n serverless-lift
+```
+
+We can use the [`queue` construct](https://github.com/getlift/lift/blob/master/docs/queue.md) to deploy an SQS queue with its Lambda consumer:
+
+```yaml
+constructs:
+  my-queue:
+    type: queue
+    worker:
+      handler: handler.compute
+
+plugins:
+  - serverless-lift
+```
+
+The `queue` construct deploys:
+
+- An SQS queue
+- A `worker` Lambda function: this function processes messages sent to the queue.
+- An SQS "[dead letter queue](https://docs.aws.amazon.com/AWSSimpleQueueService/latest/SQSDeveloperGuide/sqs-dead-letter-queues.html)": this queue stores all the messages that failed to be processed.
+
+Read the [`queue` construct documentation](https://github.com/getlift/lift/blob/master/docs/queue.md) to find a complete example with code, and to learn how to configure the batch size, retries and other options.
diff --git a/docs/providers/aws/events/streams.md b/docs/providers/aws/events/streams.md
index 12fed255ccb..1a53ba41660 100644
--- a/docs/providers/aws/events/streams.md
+++ b/docs/providers/aws/events/streams.md
@@ -77,8 +77,6 @@ functions:
 This configuration sets up a disabled Kinesis stream event for the `preprocess` function which has a batch size of `100`. The starting position is
 `LATEST`.
 
-**Note:** The `stream` event will hook up your existing streams to a Lambda function. Serverless won't create a new stream for you.
-
 ```yml
 functions:
   preprocess:
@@ -106,8 +104,6 @@ The `batchWindow` property specifies a maximum amount of time to wait before tri
 
 For more information, read the [AWS release announcement](https://aws.amazon.com/about-aws/whats-new/2019/09/aws-lambda-now-supports-custom-batch-window-for-kinesis-and-dynamodb-event-sources/) for this property.
 
-**Note:** The `stream` event will hook up your existing streams to a Lambda function. Serverless won't create a new stream for you.
-
 ```yml
 functions:
   preprocess:
@@ -126,8 +122,6 @@ This configuration provides the ability to recursively split a failed batch and
 
 [Related AWS documentation](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lambda-eventsourcemapping.html#cfn-lambda-eventsourcemapping-bisectbatchonfunctionerror)
 
-**Note:** The `stream` event will hook up your existing streams to a Lambda function. Serverless won't create a new stream for you.
-
 ```yml
 functions:
   preprocess:
@@ -146,8 +140,6 @@ This configuration sets up the maximum number of times to retry when the functio
 
 [Related AWS documentation](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lambda-eventsourcemapping.html#cfn-lambda-eventsourcemapping-maximumretryattempts)
 
-**Note:** The `stream` event will hook up your existing streams to a Lambda function. Serverless won't create a new stream for you.
-
 ```yml
 functions:
   preprocess:
@@ -169,8 +161,6 @@ This configuration sets up the maximum age of a record that Lambda sends to a fu
 
 [Related AWS documentation](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lambda-eventsourcemapping.html#cfn-lambda-eventsourcemapping-maximumrecordageinseconds)
 
-**Note:** The `stream` event will hook up your existing streams to a Lambda function. Serverless won't create a new stream for you.
-
 ```yml
 functions:
   preprocess:
@@ -255,8 +245,6 @@ The `parallelizationFactor` property specifies the number of concurrent Lambda i
 
 For more information, read the [AWS release announcement](https://aws.amazon.com/blogs/compute/new-aws-lambda-scaling-controls-for-kinesis-and-dynamodb-event-sources/) for this property.
 
-**Note:** The `stream` event will hook up your existing streams to a Lambda function. Serverless won't create a new stream for you.
-
 ```yml
 functions:
   preprocess:
@@ -273,8 +261,6 @@ This configuration allows customers to automatically checkpoint records that hav
 
 For more information, read the [AWS release announcement](https://aws.amazon.com/about-aws/whats-new/2020/12/aws-lambda-launches-checkpointing-for-amazon-kinesis-and-amazon-dynamodb-streams/)
 
-Note: Serverless only sets this property if you explicitly add it to the stream configuration (see example below).
-
 ```yml
 functions:
   preprocess:
@@ -320,3 +306,45 @@ functions:
 ```
 
 For more information, read this [AWS blog post](https://aws.amazon.com/blogs/compute/increasing-real-time-stream-processing-performance-with-amazon-kinesis-data-streams-enhanced-fan-out-and-aws-lambda/) or this [AWS documentation](https://docs.aws.amazon.com/streams/latest/dev/introduction-to-enhanced-consumers.html).
+
+## Setting TumblingWindowInSeconds
+
+This configuration allows customers to aggregate values in near-realtime, allowing state to by passed forward by Lambda invocations. A event source created with this property adds several new attributes to the events delivered to the Lambda function.
+
+- **window**: beginning and ending timestamps of the tumbling window;
+- **state**: an object containing state of a previous execution. Initially empty can contain up to **1mb** of data;
+- **isFinalInvokeForWindow**: indicates if this is the last execution for the tumbling window;
+- **isWindowTerminatedEarly**: happens only when the state object exceeds maximum allowed size of 1mb.
+
+For more information and examples, read the [AWS release announcement](https://aws.amazon.com/blogs/compute/using-aws-lambda-for-streaming-analytics/)
+
+Note: Serverless only sets this property if you explicitly add it to the stream configuration (see example below).
+
+```yml
+functions:
+  preprocess:
+    handler: handler.preprocess
+    events:
+      - stream:
+          arn: arn:aws:dynamodb:region:XXXXXX:table/foo/stream/1970-01-01T00:00:00.000
+          tumblingWindowInSeconds: 30
+```
+
+## Setting filter patterns
+
+This configuration allows customers to filter event before lambda invocation. It accepts up to 5 filter patterns by default and up to 10 with quota extension. If one event matches at least 1 pattern, lambda will process it.
+
+For more details and examples of filter patterns, please see the [AWS event filtering documentation](https://docs.aws.amazon.com/lambda/latest/dg/invocation-eventfiltering.html)
+
+Note: Serverless only sets this property if you explicitly add it to the stream configuration (see an example below). The following example will only process inserted items in the DynamoDB table (it will skip removed and modified items).
+
+```yml
+functions:
+  handleInsertedDynamoDBItem:
+    handler: handler.preprocess
+    events:
+      - stream:
+          arn: arn:aws:dynamodb:region:XXXXXX:table/foo/stream/1970-01-01T00:00:00.000
+          filterPatterns:
+            - eventName: [INSERT]
+```
diff --git a/docs/providers/aws/examples/hello-world/csharp/README.md b/docs/providers/aws/examples/hello-world/csharp/README.md
index a590b3c0645..982534e5f4f 100644
--- a/docs/providers/aws/examples/hello-world/csharp/README.md
+++ b/docs/providers/aws/examples/hello-world/csharp/README.md
@@ -13,7 +13,7 @@ layout: Doc
 
 # Hello World C# Example
 
-Make sure `serverless` is installed. [See installation guide](../../../guide/installation.md).
+Make sure `serverless` is installed. [See installation guide](https://www.serverless.com/framework/docs/getting-started).
 
 Once installed the Serverless CLI can be called with `serverless` or the shorthand `sls` command.
 
@@ -31,7 +31,7 @@ Commands
 
 ## 1. Create a service
 
-```
+```bash
 sls create --template aws-csharp --path myService
 ```
 
@@ -41,19 +41,19 @@ The `--path` or shorthand `-p` is the location to be created with the template s
 
 ## 2. Build using .NET Core 3.1 CLI tools and create zip package
 
-```
+```bash
 # Linux or Mac OS
 ./build.sh
 ```
 
-```
+```bash
 # Windows PowerShell
 .\build.cmd
 ```
 
 ## 3. Deploy
 
-```
+```bash
 sls deploy
 ```
 
@@ -61,7 +61,7 @@ This will deploy your function to AWS Lambda based on the settings in `serverles
 
 ## 4. Invoke deployed function
 
-```
+```bash
 sls invoke -f hello
 ```
 
@@ -69,14 +69,14 @@ Invoke deployed function with command `invoke` and `--function` or shorthand `-f
 
 In your terminal window you should see the response from AWS Lambda.
 
-```bash
+```json
 {
-    "Message": "Go Serverless v1.0! Your function executed successfully!",
-    "Request": {
-        "Key1": null,
-        "Key2": null,
-        "Key3": null
-    }
+  "Message": "Go Serverless v1.0! Your function executed successfully!",
+  "Request": {
+    "Key1": null,
+    "Key2": null,
+    "Key3": null
+  }
 }
 ```
 
diff --git a/docs/providers/aws/examples/hello-world/fsharp/README.md b/docs/providers/aws/examples/hello-world/fsharp/README.md
index e918bbf330c..bd0e8afb829 100644
--- a/docs/providers/aws/examples/hello-world/fsharp/README.md
+++ b/docs/providers/aws/examples/hello-world/fsharp/README.md
@@ -13,7 +13,7 @@ layout: Doc
 
 # Hello World F# Example
 
-Make sure `serverless` is installed. [See installation guide](../../../guide/installation.md).
+Make sure `serverless` is installed. [See installation guide](https://www.serverless.com/framework/docs/getting-started).
 
 Once installed the Serverless CLI can be called with `serverless` or the shorthand `sls` command.
 
@@ -29,7 +29,7 @@ Commands
 
 ## 1. Create a service
 
-```
+```bash
 sls create --template aws-fsharp --path myService
 ```
 
@@ -39,19 +39,19 @@ The `--path` or shorthand `-p` is the location to be created with the template s
 
 ## 2. Build using .NET Core 3.1.x CLI tools and create zip package
 
-```
+```bash
 # Linux or Mac OS
 ./build.sh
 ```
 
-```
+```bash
 # Windows PowerShell
 ./build.cmd
 ```
 
 ## 3. Deploy
 
-```
+```bash
 sls deploy
 ```
 
@@ -59,7 +59,7 @@ This will deploy your function to AWS Lambda based on the settings in `serverles
 
 ## 4. Invoke deployed function
 
-```
+```bash
 sls invoke -f hello
 ```
 
@@ -67,14 +67,14 @@ Invoke deployed function with command `invoke` and `--function` or shorthand `-f
 
 In your terminal window you should see the response from AWS Lambda.
 
-```bash
+```json
 {
-    "Message": "Go Serverless v1.0! Your function executed successfully!",
-    "Request": {
-        "Key1": null,
-        "Key2": null,
-        "Key3": null
-    }
+  "Message": "Go Serverless v1.0! Your function executed successfully!",
+  "Request": {
+    "Key1": null,
+    "Key2": null,
+    "Key3": null
+  }
 }
 ```
 
diff --git a/docs/providers/aws/examples/hello-world/go/README.md b/docs/providers/aws/examples/hello-world/go/README.md
index 792750628d9..7c29a2fc8ec 100644
--- a/docs/providers/aws/examples/hello-world/go/README.md
+++ b/docs/providers/aws/examples/hello-world/go/README.md
@@ -13,7 +13,7 @@ layout: Doc
 
 # Hello World Go Example
 
-Make sure `serverless` is installed. [See installation guide](../../../guide/installation.md).
+Make sure `serverless` is installed. [See installation guide](https://www.serverless.com/framework/docs/getting-started).
 
 Once installed the Serverless CLI can be called with `serverless` or the shorthand `sls` command.
 
@@ -39,7 +39,7 @@ The Serverless Framework includes starter templates for various languages and pr
 
 `aws-go` fetches dependencies using standard `go get`.
 
-```
+```bash
 sls create --template aws-go --path myService
 ```
 
@@ -47,7 +47,7 @@ sls create --template aws-go --path myService
 
 `aws-go-dep` uses [go dep](https://github.com/golang/dep) and requires your project to be in `$GOPATH/src`.
 
-```
+```bash
 sls create --template aws-go-dep --path myService
 ```
 
@@ -55,7 +55,7 @@ sls create --template aws-go-dep --path myService
 
 `aws-go-mod` uses standard [Go modules] and requires your project to be **outside** `$GOPATH` and to use Go 1.13+.
 
-```
+```bash
 sls create --template aws-go-mod --path myService
 ```
 
@@ -88,7 +88,7 @@ Run `make build` to build both functions. Successful build should generate the f
 
 ## 3. Deploy
 
-```
+```bash
 sls deploy
 ```
 
@@ -96,11 +96,11 @@ This will deploy your function to AWS Lambda based on the settings in `serverles
 
 ## 4. Invoke deployed function
 
-```
+```bash
 sls invoke -f hello
 ```
 
-```
+```bash
 sls invoke -f world
 ```
 
diff --git a/docs/providers/aws/examples/hello-world/node/README.md b/docs/providers/aws/examples/hello-world/node/README.md
index 468585566d1..be9a78158fb 100644
--- a/docs/providers/aws/examples/hello-world/node/README.md
+++ b/docs/providers/aws/examples/hello-world/node/README.md
@@ -13,7 +13,7 @@ layout: Doc
 
 # Hello World Node.js Example
 
-Make sure `serverless` is installed. [See installation guide](../../../guide/installation.md).
+Make sure `serverless` is installed. [See installation guide](https://www.serverless.com/framework/docs/getting-started).
 
 Once installed the Serverless CLI can be called with `serverless` or the shorthand `sls` command.
 
@@ -29,7 +29,7 @@ Commands
 
 ## 1. Create a service
 
-```
+```bash
 sls create --template aws-nodejs --path myService
 ```
 
@@ -39,7 +39,7 @@ The `--path` or shorthand `-p` is the location to be created with the template s
 
 ## 2. Deploy
 
-```
+```bash
 sls deploy
 ```
 
@@ -47,7 +47,7 @@ This will deploy your function to AWS Lambda based on the settings in `serverles
 
 ## 3. Invoke deployed function
 
-```
+```bash
 sls invoke -f hello
 ```
 
@@ -55,10 +55,10 @@ Invoke deployed function with command `invoke` and `--function` or shorthand `-f
 
 In your terminal window you should see the response from AWS Lambda.
 
-```bash
+```json
 {
-    "statusCode": 200,
-    "body": "{\"message\":\"Go Serverless v1.0! Your function executed successfully!\",\"input\":{}}"
+  "statusCode": 200,
+  "body": "{\"message\":\"Go Serverless v1.0! Your function executed successfully!\",\"input\":{}}"
 }
 ```
 
diff --git a/docs/providers/aws/examples/hello-world/python/README.md b/docs/providers/aws/examples/hello-world/python/README.md
index 89d61fcc3f2..8bdbed0b0ad 100644
--- a/docs/providers/aws/examples/hello-world/python/README.md
+++ b/docs/providers/aws/examples/hello-world/python/README.md
@@ -13,7 +13,7 @@ layout: Doc
 
 # Hello World Python Example
 
-Make sure `serverless` is installed. [See installation guide](../../../guide/installation.md).
+Make sure `serverless` is installed. [See installation guide](https://www.serverless.com/framework/docs/getting-started).
 
 Once installed the Serverless CLI can be called with `serverless` or the shorthand `sls` command.
 
@@ -29,8 +29,8 @@ Commands
 
 ## 1. Create a service
 
-```
-sls create --template aws-python --path myService
+```bash
+sls create --template aws-python3 --path myService
 ```
 
 Using the `create` command we can specify one of the available [templates](https://serverless.com/framework/docs/providers/aws/cli-reference/create#available-templates). For this example use aws-python with the `--template` or shorthand `-t` flag.
@@ -39,7 +39,7 @@ The `--path` or shorthand `-p` is the location to be created with the template s
 
 ## 2. Deploy
 
-```
+```bash
 sls deploy
 ```
 
@@ -47,7 +47,7 @@ This will deploy your function to AWS Lambda based on the settings in `serverles
 
 ## 3. Invoke deployed function
 
-```
+```bash
 sls invoke -f hello
 ```
 
@@ -55,10 +55,10 @@ Invoke deployed function with command `invoke` and `--function` or shorthand `-f
 
 In your terminal window you should see the response from AWS Lambda.
 
-```bash
+```json
 {
-    "statusCode": 200,
-    "body": "{\"message\":\"Go Serverless v1.0! Your function executed successfully!\",\"input\":{}}"
+  "statusCode": 200,
+  "body": "{\"message\":\"Go Serverless v1.0! Your function executed successfully!\",\"input\":{}}"
 }
 ```
 
diff --git a/docs/providers/aws/examples/hello-world/ruby/README.md b/docs/providers/aws/examples/hello-world/ruby/README.md
index 9aa16fb7eb1..c40a574add0 100644
--- a/docs/providers/aws/examples/hello-world/ruby/README.md
+++ b/docs/providers/aws/examples/hello-world/ruby/README.md
@@ -13,7 +13,7 @@ layout: Doc
 
 # Hello World Ruby Example
 
-Make sure `serverless` is installed. [See installation guide](../../../guide/installation.md).
+Make sure `serverless` is installed. [See installation guide](https://www.serverless.com/framework/docs/getting-started).
 
 Once installed the Serverless CLI can be called with `serverless` or the shorthand `sls` command.
 
@@ -29,7 +29,7 @@ Commands
 
 ## 1. Create a service
 
-```
+```bash
 sls create --template aws-ruby --path myService
 ```
 
@@ -39,7 +39,7 @@ The `--path` or shorthand `-p` is the location to be created with the template s
 
 ## 2. Deploy
 
-```
+```bash
 sls deploy
 ```
 
@@ -47,7 +47,7 @@ This will deploy your function to AWS Lambda based on the settings in `serverles
 
 ## 3. Invoke deployed function
 
-```
+```bash
 sls invoke -f hello
 ```
 
diff --git a/docs/providers/aws/guide/credentials.md b/docs/providers/aws/guide/credentials.md
index eabd2d50a22..994f36b3bcd 100644
--- a/docs/providers/aws/guide/credentials.md
+++ b/docs/providers/aws/guide/credentials.md
@@ -91,7 +91,8 @@ export AWS_SECRET_ACCESS_KEY=<your-secret-key-here>
 # AWS_ACCESS_KEY_ID and AWS_SECRET_ACCESS_KEY are now available for serverless to use
 serverless deploy
 
-# 'export' command is valid only for unix shells. In Windows - use 'set' instead of 'export'
+# 'export' command is valid only for unix shells
+# In Windows use 'set' instead of 'export'
 ```
 
 **Please note:** _If you are using a self-signed certificate you'll need to do one of the following:_
@@ -109,8 +110,8 @@ export cafile="/path/to/cafile.pem"
 # or multiple, comma separated
 export cafile="/path/to/cafile1.pem,/path/to/cafile2.pem"
 
-
-# 'export' command is valid only for unix shells. In Windows - use 'set' instead of 'export'
+# 'export' command is valid only for unix shells
+# In Windows use 'set' instead of 'export'
 ```
 
 #### Using AWS Profiles
@@ -124,7 +125,10 @@ Serverless provides a convenient way to configure AWS profiles with the help of
 Here's an example how you can configure the `default` AWS profile:
 
 ```bash
-serverless config credentials --provider aws --key AKIAIOSFODNN7EXAMPLE --secret wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY
+serverless config credentials \
+  --provider aws \
+  --key AKIAIOSFODNN7EXAMPLE \
+  --secret wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY
 ```
 
 Take a look at the [`config` CLI reference](../cli-reference/config-credentials.md) for more information about credential configuration.
diff --git a/docs/providers/aws/guide/deploying.md b/docs/providers/aws/guide/deploying.md
index 9d38cb7dac2..fee64a62dea 100644
--- a/docs/providers/aws/guide/deploying.md
+++ b/docs/providers/aws/guide/deploying.md
@@ -83,6 +83,8 @@ The Serverless Framework translates all syntax in `serverless.yml` to a single A
 - You can disable creation of default S3 bucket policy by setting `skipPolicySetup` under `deploymentBucket` config. It only applies to deployment bucket that is automatically created
   by the Serverless Framework.
 
+- You can enable versioning for the deployment bucket by setting `versioning` under `deploymentBucket` config to `true`.
+
 Check out the [deploy command docs](../cli-reference/deploy.md) for all details and options.
 
 - For information on multi-region deployments, [checkout this article](https://serverless.com/blog/build-multiregion-multimaster-application-dynamodb-global-tables).
diff --git a/docs/providers/aws/guide/events.md b/docs/providers/aws/guide/events.md
index d0cb9b1c17e..80c8f99af96 100644
--- a/docs/providers/aws/guide/events.md
+++ b/docs/providers/aws/guide/events.md
@@ -22,6 +22,13 @@ If you are using AWS as your provider, all `events` in the service are anything
 
 Upon deployment, the framework will deploy any infrastructure required for an event (e.g., an API Gateway endpoint) and configure your `function` to listen to it.
 
+Infrastructure which is created to support events in the `events` list may be
+referenced using CloudFormation intrinsic functions like `Fn::GetAtt` or
+`Fn::Ref` (or their shorthand counterparts). For details on referencing created
+resources in AWS, see the [AWS CloudFormation Resource
+Reference](./resources.md#aws-cloudformation-resource-reference) section on the
+[AWS - Resources](./resources.md) page.
+
 ## Configuration
 
 Events belong to each Function and can be found in the `events` property in `serverless.yml`.
@@ -32,9 +39,7 @@ functions:
   createUser: # Function name
     handler: handler.createUser # Reference to file handler.js & exported function 'createUser'
     events: # All events associated with this function
-      - http:
-          path: users/create
-          method: post
+      - httpApi: 'POST /users/create'
 ```
 
 Events are objects, which can contain event-specific information.
@@ -49,15 +54,9 @@ functions:
   createUser: # Function name
     handler: handler.users # Reference to file handler.js & exported function 'users'
     events: # All events associated with this function
-      - http:
-          path: users/create
-          method: post
-      - http:
-          path: users/update
-          method: put
-      - http:
-          path: users/delete
-          method: delete
+      - httpApi: 'POST /users/create'
+      - httpApi: 'PUT /users/update'
+      - httpApi: 'DELETE /users/delete'
 ```
 
 ## Types
@@ -74,9 +73,7 @@ functions:
   createUser: # Function name
     handler: handler.users # Reference to file handler.js & exported function 'users'
     events: # All events associated with this function
-      - http:
-          path: users/{id}
-          method: get
+      - httpApi: 'GET /users/{id}'
 ```
 
 ## Deploying
diff --git a/docs/providers/aws/guide/functions.md b/docs/providers/aws/guide/functions.md
index abbbb61f80f..870236b4a8b 100644
--- a/docs/providers/aws/guide/functions.md
+++ b/docs/providers/aws/guide/functions.md
@@ -187,14 +187,15 @@ functions:
     memorySize: 512
 ```
 
-You can also use an existing IAM role by adding your IAM Role ARN in the `role` property. For example:
+You can also use an existing IAM role by adding your IAM Role ARN in the `iam.role` property. For example:
 
 ```yml
 # serverless.yml
 service: new-service
 provider:
   name: aws
-  role: arn:aws:iam::YourAccountNumber:role/YourIamRole
+  iam:
+    role: arn:aws:iam::YourAccountNumber:role/YourIamRole
 ```
 
 See the documentation about [IAM](./iam.md) for function level IAM roles.
@@ -203,7 +204,17 @@ See the documentation about [IAM](./iam.md) for function level IAM roles.
 
 Alternatively lambda environment can be configured through docker images. Image published to AWS ECR registry can be referenced as lambda source (check [AWS Lambda – Container Image Support](https://aws.amazon.com/blogs/aws/new-for-aws-lambda-container-image-support/)). In addition, you can also define your own images that will be built locally and uploaded to AWS ECR registry.
 
-In service configuration, images can be configured via `provider.ecr.images`. To define an image that will be built locally, you need to specify `path` property, which should point to valid docker context directory. Optionally, you can also set `file` to specify Dockerfile that should be used when building an image. It is also possible to define images that already exist in AWS ECR repository. In order to do that, you need to define `uri` property, which should follow `<account>.dkr.ecr.<region>.amazonaws.com/<repository>@<digest>` or `<account>.dkr.ecr.<region>.amazonaws.com/<repository>:<tag>` format. Additionally, with `buildArgs` property, you can define arguments that will be passed to `docker build` command with `--build-arg` flag. They might be later referenced via `ARG` within your `Dockerfile`. The `cacheFrom` property can be used to specify which images to use as a source for layer caching in the `docker build` command with `--cache-from` flag. When `uri` is defined for an image, `buildArgs` and `cacheFrom` cannot be defined.
+Serverless will create an ECR repository for your image, but it currently does not manage updates to it. An ECR repository is created only for new services or the first time that a function configured with an `image` is deployed. In service configuration, you can configure the ECR repository to scan for CVEs via the `provider.ecr.scanOnPush` property, which is `false` by default. (See [documentation](https://docs.aws.amazon.com/AmazonECR/latest/userguide/image-scanning.html))
+
+In service configuration, images can be configured via `provider.ecr.images`. To define an image that will be built locally, you need to specify `path` property, which should point to valid docker context directory. Optionally, you can also set `file` to specify Dockerfile that should be used when building an image. It is also possible to define images that already exist in AWS ECR repository. In order to do that, you need to define `uri` property, which should follow `<account>.dkr.ecr.<region>.amazonaws.com/<repository>@<digest>` or `<account>.dkr.ecr.<region>.amazonaws.com/<repository>:<tag>` format.
+
+Additionally, you can define arguments that will be passed to the `docker build` command via the following properties:
+
+- `buildArgs`: With the `buildArgs` property, you can define arguments that will be passed to `docker build` command with `--build-arg` flag. They might be later referenced via `ARG` within your `Dockerfile`. (See [Documentation](https://docs.docker.com/engine/reference/builder/#arg))
+- `cacheFrom`: The `cacheFrom` property can be used to specify which images to use as a source for layer caching in the `docker build` command with `--cache-from` flag. (See [Documentation](https://docs.docker.com/engine/reference/builder/#usage))
+- `platform`: The `platform` property can be used to specify the architecture target in the `docker build` command with the `--platform` flag. If not specified, Docker will build for your computer's architecture by default. AWS Lambda typically uses `x86` architecture unless otherwise specified in the Lambda's runtime settings. In order to avoid runtime errors when building on an ARM-based machine (e.g. Apple M1 Mac), `linux/amd64` must be used here. The options for this flag are `linux/amd64` (`x86`-based Lambdas), `linux/arm64` (`arm`-based Lambdas), or `windows/amd64`. (See [Documentation](https://docs.docker.com/engine/reference/builder/#from))
+
+When `uri` is defined for an image, `buildArgs`, `cacheFrom`, and `platform` cannot be defined.
 
 Example configuration
 
@@ -212,6 +223,7 @@ service: service-name
 provider:
   name: aws
   ecr:
+    scanOnPush: true
     images:
       baseimage:
         path: ./path/to/context
@@ -220,6 +232,7 @@ provider:
           STAGE: ${opt:stage}
         cacheFrom:
           - my-image:latest
+        platform: linux/amd64
       anotherimage:
         uri: 000000000000.dkr.ecr.sa-east-1.amazonaws.com/test-lambda-docker@sha256:6bb600b4d6e1d7cf521097177dd0c4e9ea373edb91984a505333be8ac9455d38
 ```
@@ -281,6 +294,27 @@ functions:
 
 During the first deployment when locally built images are used, Framework will automatically create a dedicated ECR repository to store these images, with name `serverless-<service>-<stage>`. Currently, the Framework will not remove older versions of images uploaded to ECR as they still might be in use by versioned functions. During `sls remove`, the created ECR repository will be removed. During deployment, Framework will attempt to `docker login` to ECR if needed. Depending on your local configuration, docker authorization token might be stored unencrypted. Please refer to documentation for more details: https://docs.docker.com/engine/reference/commandline/login/#credentials-store
 
+## Instruction set architecture
+
+By default, Lambda functions are run by 64-bit x86 architecture CPUs. However, [using arm64 architecture](https://docs.aws.amazon.com/lambda/latest/dg/foundation-arch.html) (AWS Graviton2 processor) may result in better pricing and performance.
+
+To switch all functions to AWS Graviton2 processor, configure `architecture` at `provider` level as follows:
+
+```yml
+provider:
+  ...
+  architecture: arm64
+```
+
+To toggle instruction set architecture per function individually, set it directly at `functions[]` context:
+
+```yaml
+functions:
+  hello:
+    ...
+    architecture: arm64
+```
+
 ## VPC Configuration
 
 You can add VPC configuration to a specific function in `serverless.yml` by adding a `vpc` object property in the function configuration. This object should contain the `securityGroupIds` and `subnetIds` array properties needed to construct VPC for this function. Here's an example configuration:
@@ -333,6 +367,29 @@ functions:
 
 Then, when you run `serverless deploy`, VPC configuration will be deployed along with your lambda function.
 
+If you have a provider VPC set but wish to have specific functions with no VPC, you can set the `vpc` value for these functions to `~` (null). For example:
+
+```yml
+# serverless.yml
+service: service-name
+provider:
+  name: aws
+  vpc:
+    securityGroupIds:
+      - securityGroupId1
+      - securityGroupId2
+    subnetIds:
+      - subnetId1
+      - subnetId2
+
+functions:
+  hello: # this function will have no vpc configured
+    handler: handler.hello
+    vpc: ~
+  users: # this function will inherit the service level vpc config above
+    handler: handler.users
+```
+
 **VPC IAM permissions**
 
 The Lambda function execution role must have permissions to create, describe and delete [Elastic Network Interfaces](http://docs.aws.amazon.com/AmazonVPC/latest/UserGuide/VPC_ElasticNetworkInterfaces.html) (ENI). When VPC configuration is provided the default AWS `AWSLambdaVPCAccessExecutionRole` will be associated with your Lambda execution role. In case custom roles are provided be sure to include the proper [ManagedPolicyArns](http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iam-role.html#cfn-iam-role-managepolicyarns). For more information please check [configuring a Lambda Function for Amazon VPC Access](http://docs.aws.amazon.com/lambda/latest/dg/vpc.html)
@@ -460,15 +517,15 @@ functions:
 
 By default, the framework creates function versions for every deploy. This behavior is optional, and can be turned off in cases where you don't invoke past versions by their qualifier. If you would like to do this, you can invoke your functions as `arn:aws:lambda:....:function/myFunc:3` to invoke version 3 for example.
 
-To turn off this feature, set the provider-level option `versionFunctions`.
+Versions are not cleaned up by serverless, so make sure you use a plugin or other tool to prune sufficiently old versions. The framework can't clean up versions because it doesn't have information about whether older versions are invoked or not. This feature adds to the number of total stack outputs and resources because a function version is a separate resource from the function it refers to.
+
+To turn off function versioning, set the provider-level option `versionFunctions`.
 
 ```yml
 provider:
   versionFunctions: false
 ```
 
-These versions are not cleaned up by serverless, so make sure you use a plugin or other tool to prune sufficiently old versions. The framework can't clean up versions because it doesn't have information about whether older versions are invoked or not. This feature adds to the number of total stack outputs and resources because a function version is a separate resource from the function it refers to.
-
 ## Dead Letter Queue (DLQ)
 
 When AWS lambda functions fail, they are [retried](http://docs.aws.amazon.com/lambda/latest/dg/retries-on-errors.html). If the retries also fail, AWS has a feature to send information about the failed request to a SNS topic or SQS queue, called the [Dead Letter Queue](http://docs.aws.amazon.com/lambda/latest/dg/dlq.html), which you can use to track and diagnose and react to lambda failures.
@@ -608,4 +665,29 @@ functions:
         - securityGroupId1
       subnetIds:
         - subnetId1
+``**
+
+## Lambda Hashing Algorithm migration
+
+**Note** Below migration guide is intended to be used if you are already using `v3` version of the Framework and you have `provider.lambdaHashingVersion` property set to `20200924` in your configuration file. If you are still on v2 and want to upgrade to v3, please refer to [V3 Upgrade docs](../../../guides/upgrading-v3.md#lambda-hashing-algorithm).
+
+In `v3`, Lambda version hashes are generated using an improved algorithm that fixes determinism issues. If you are still using the old hashing algorithm, you can follow the guide below to migrate to new default version.
+
+Please keep in mind that these changes require two deployments with manual configuration adjustment between them. It also creates two additional versions and temporarily overrides descriptions of your functions. Migration will need to be done separately for each of your environments/stages.
+
+1. Run `sls deploy` with additional `--enforce-hash-update` flag: that flag will override the description for Lambda functions, which will force the creation of new versions.
+2. Remove `provider.lambdaHashingVersion` setting from your configuration: your service will now always deploy with the new Lambda version hashes (which is the new default in v3).
+3. Run `sls deploy`, this time without additional `--enforce-hash-update` flag: that will restore the original descriptions on all Lambda functions.
+
+Now your whole service is fully migrated to the new Lambda Hashing Algorithm.
+
+If you do not want to temporarily override descriptions of your functions or would like to avoid creating unnecessary versions of your functions, you might want to use one of the following approaches:
+
+- Ensure that code for all your functions will change during deployment, remove `provider.lambdaHashingVersion` from your configuration, and run `sls deploy`. Due to the fact that all functions have code changed, all your functions will be migrated to new hashing algorithm. Please note that the change can be caused by e.g. upgrading a dependency used by all your functions so you can pair it with regular chores.
+- Add a dummy file that will be included in deployment artifacts for all your functions, remove `provider.lambdaHashingVersion` from your configuration, and run `sls deploy`. Due to the fact that all functions have code changed, all your functions will be migrated to new hashing algorithm.
+- If it is safe in your case (e.g. it's only development sandbox), you can also tear down the whole service by `sls remove`, remove `provider.lambdaHashingVersion` from your configuration, and run `sls deploy`. Newly recreated environment will be using new hashing algorithm.
+
+
+
+
 ```
diff --git a/docs/providers/aws/guide/iam.md b/docs/providers/aws/guide/iam.md
index 8de6af6b2d0..2a3d4bc6e3b 100644
--- a/docs/providers/aws/guide/iam.md
+++ b/docs/providers/aws/guide/iam.md
@@ -24,12 +24,14 @@ All IAM-related properties of provider are grouped under `iam` property:
 provider:
   iam:
     role:
+      name: custom-role-name
+      path: /custom-role-path/
       statements:
-        - Effect: 'Allow',
-          Resource: '*',
-          NotAction: 'iam:DeleteUser',
+        - Effect: 'Allow'
+          Resource: '*'
+          Action: 'iam:DeleteUser'
       managedPolicies:
-        - 'arn:aws:iam::123456789012:user/*',
+        - 'arn:aws:iam::123456789012:user/*'
       permissionsBoundary: arn:aws:iam::123456789012:policy/boundaries
       tags:
         key: value
@@ -120,6 +122,21 @@ provider:
       name: your-custom-name-${sls:stage}-role
 ```
 
+### Path for the Default IAM Role
+
+By default, it will use a path of: `/`
+
+This can be overridden by setting `provider.iam.role.path`:
+
+```yml
+service: new-service
+
+provider:
+  iam:
+    role:
+      path: /your-custom-path/
+```
+
 ## Custom IAM Roles
 
 **WARNING:** You need to take care of the overall role setup as soon as you define custom roles.
diff --git a/docs/providers/aws/guide/installation.md b/docs/providers/aws/guide/installation.md
deleted file mode 100644
index 864db1f8e0f..00000000000
--- a/docs/providers/aws/guide/installation.md
+++ /dev/null
@@ -1,53 +0,0 @@
-<!--
-title: Serverless Framework - AWS Lambda Guide - Installing The Serverless Framework
-menuText: Installation
-menuOrder: 2
-description: How to install the Serverless Framework and start using AWS Lambda
-layout: Doc
--->
-
-<!-- DOCS-SITE-LINK:START automatically generated  -->
-
-### [Read this on the main serverless docs site](https://www.serverless.com/framework/docs/providers/aws/guide/installation)
-
-<!-- DOCS-SITE-LINK:END -->
-
-# AWS - Installation
-
-### Installing Node.js
-
-Serverless is a [Node.js](https://nodejs.org) CLI tool so the first thing you need to do is to install Node.js on your machine.
-
-Go to the official [Node.js website](https://nodejs.org), download and follow the [installation instructions](https://nodejs.org/en/download/) to install Node.js on your local machine.
-
-**Note:** Serverless runs on Node v6 or higher.
-
-You can verify that Node.js is installed successfully by running `node --version` in your terminal. You should see the corresponding Node version number printed out.
-
-### Installing the Serverless Framework
-
-Next, install the Serverless Framework via [npm](https://npmjs.org) which was already installed when you installed Node.js.
-
-Open up a terminal and type `npm install -g serverless` to install Serverless.
-
-```bash
-npm install -g serverless
-```
-
-Once the installation process is done you can verify that Serverless is installed successfully by running the following command in your terminal:
-
-```bash
-serverless
-```
-
-To see which version of serverless you have installed run:
-
-```bash
-serverless --version
-```
-
-### Setting up AWS
-
-To run serverless commands that interface with your AWS account, you will need to setup your AWS account credentials on your machine.
-
-[Follow these instructions on setting up AWS credentials](./credentials.md)
diff --git a/docs/providers/aws/guide/intro.md b/docs/providers/aws/guide/intro.md
index a00e42da9f1..553d52e3310 100644
--- a/docs/providers/aws/guide/intro.md
+++ b/docs/providers/aws/guide/intro.md
@@ -71,10 +71,10 @@ service: users
 functions: # Your "Functions"
   usersCreate:
     events: # The "Events" that trigger this function
-      - http: post users/create
+      - httpApi: 'POST /users/create'
   usersDelete:
     events:
-      - http: delete users/delete
+      - httpApi: 'DELETE /users/delete'
 
 resources: # The "Resources" your "Functions" use.  Raw AWS CloudFormation goes in here.
 ```
@@ -88,14 +88,14 @@ _serverless.json_
     "usersCreate": {
       "events": [
         {
-          "http": "post users/create"
+          "httpApi": "POST /users/create"
         }
       ]
     },
     "usersDelete": {
       "events": [
         {
-          "http": "delete users/delete"
+          "httpApi": "DELETE /users/delete"
         }
       ]
     }
@@ -117,14 +117,14 @@ module.exports = {
     usersCreate: {
       events: [
         {
-          http: 'post users/create',
+          httpApi: 'POST /users/create',
         },
       ],
     },
     usersDelete: {
       events: [
         {
-          http: 'delete users/delete',
+          httpApi: 'DELETE /users/delete',
         },
       ],
     },
@@ -145,14 +145,14 @@ const serverlessConfiguration: Serverless = {
     usersCreate: {
       events: [
         {
-          http: 'post users/create',
+          httpApi: 'POST /users/create',
         },
       ],
     },
     usersDelete: {
       events: [
         {
-          http: 'delete users/delete',
+          httpApi: 'DELETE /users/delete',
         },
       ],
     },
@@ -163,6 +163,8 @@ const serverlessConfiguration: Serverless = {
 module.exports = serverlessConfiguration;
 ```
 
+> If deploying using a serverless.ts file, ts-node needs to be installed separately as a dev dependency.
+
 When you deploy with the Framework by running `serverless deploy`, everything in the service configuration file is deployed at once.
 
 > For the sake of simplicity, most code snippet detailed in this documentation only refer to the `serverless.yml` YAML service file format. However, all functionalities work as well in the other available service file formats.
@@ -178,3 +180,5 @@ plugins:
   - serverless-offline
   - serverless-secrets
 ```
+
+Read more about plugins in the [Plugin documentation](../../../guides/plugins).
diff --git a/docs/providers/aws/guide/layers.md b/docs/providers/aws/guide/layers.md
index 9ad2c3fb58d..7bd10e6d4ee 100644
--- a/docs/providers/aws/guide/layers.md
+++ b/docs/providers/aws/guide/layers.md
@@ -35,6 +35,9 @@ layers:
     description: Description of what the lambda layer does # optional, Description to publish to AWS
     compatibleRuntimes: # optional, a list of runtimes this layer is compatible with
       - python3.8
+    compatibleArchitectures: # optional, a list of architectures this layer is compatible with
+      - x86_64
+      - arm64
     licenseInfo: GPLv3 # optional, a string specifying license information
     # allowedAccounts: # optional, a list of AWS account IDs allowed to access this layer.
     #   - '*'
diff --git a/docs/providers/aws/guide/packaging.md b/docs/providers/aws/guide/packaging.md
index 4c7953504a9..567955a009c 100644
--- a/docs/providers/aws/guide/packaging.md
+++ b/docs/providers/aws/guide/packaging.md
@@ -112,14 +112,14 @@ functions:
   package:
     artifact: hello.jar
   events:
-    - http:
-        path: hello
-        method: get
+    - httpApi: 'GET /hello'
 ```
 
 #### Artifacts hosted on S3
 
-Artifacts can also be fetched from a remote S3 bucket. In this case you just need to provide the S3 object URL as the artifact value. This applies to both, service-wide and function-level artifact setups.
+Artifacts can also be fetched from a remote S3 bucket. In this case you just need to provide the S3 object URI (old style or new) as the artifact value. This applies to both, service-wide and function-level artifact setups.
+
+**Note:** At this time, only S3 URIs are supported. Serverless does not yet support fetching artifacts from non-S3 remote locations.
 
 ##### Service package
 
@@ -127,7 +127,7 @@ Artifacts can also be fetched from a remote S3 bucket. In this case you just nee
 service: my-service
 
 package:
-  artifact: https://s3.amazonaws.com/some-bucket/service-artifact.zip
+  artifact: s3://some-bucket/path/to/service-artifact.zip
 ```
 
 ##### Individual function packages
@@ -142,7 +142,7 @@ functions:
   hello:
     handler: com.serverless.Handler
   package:
-    artifact: https://s3.amazonaws.com/some-bucket/function-artifact.zip
+    artifact: s3://some-bucket/path/to/service-artifact.zip
 ```
 
 ### Packaging functions separately
diff --git a/docs/providers/aws/guide/plugins.md b/docs/providers/aws/guide/plugins.md
deleted file mode 100644
index a1c1dfe3b65..00000000000
--- a/docs/providers/aws/guide/plugins.md
+++ /dev/null
@@ -1,725 +0,0 @@
-<!--
-title: Serverless Framework - AWS Lambda Guide - Plugins
-menuText: Plugins
-menuOrder: 14
-description: How to install and create Plugins to extend or overwrite the functionality of the Serverless Framework
-layout: Doc
--->
-
-<!-- DOCS-SITE-LINK:START automatically generated  -->
-
-### [Read this on the main serverless docs site](https://www.serverless.com/framework/docs/providers/aws/guide/plugins)
-
-<!-- DOCS-SITE-LINK:END -->
-
-# Plugins
-
-A Plugin is custom Javascript code that creates new or extends existing commands within the Serverless Framework. The Serverless Framework is merely a group of Plugins that are provided in the core. If you or your organization have a specific workflow, install a pre-written Plugin or write a plugin to customize the Framework to your needs. External Plugins are written exactly the same way as the core Plugins.
-
-- [How to create serverless plugins - Part 1](https://serverless.com/blog/writing-serverless-plugins/)
-- [How to create serverless plugins - Part 2](https://serverless.com/blog/writing-serverless-plugins-2/)
-
-## Installing Plugins
-
-External Plugins are added on a per service basis and are not applied globally. Make sure you are in your Service's root directory, then install the corresponding Plugin with the help of NPM:
-
-```
-npm install --save custom-serverless-plugin
-```
-
-We need to tell Serverless that we want to use the plugin inside our service. We do this by adding the name of the Plugin to the `plugins` section in the `serverless.yml` file.
-
-```yml
-# serverless.yml file
-
-plugins:
-  - custom-serverless-plugin
-```
-
-The `plugins` section supports two formats:
-
-Array object:
-
-```yml
-plugins:
-  - plugin1
-  - plugin2
-```
-
-Enhanced plugins object:
-
-```yml
-plugins:
-  localPath: './custom_serverless_plugins'
-  modules:
-    - plugin1
-    - plugin2
-```
-
-Plugins might want to add extra information which should be accessible to Serverless. The `custom` section in the `serverless.yml` file is the place where you can add necessary configurations for your plugins (the plugins author / documentation will tell you if you need to add anything there):
-
-```yml
-plugins:
-  - custom-serverless-plugin
-
-custom:
-  customkey: customvalue
-```
-
-## Service local plugin
-
-If you are working on a plugin or have a plugin that is just designed for one project, it can be loaded from the local `.serverless_plugins` folder at the root of your service. Local plugins can be added in the `plugins` array in `serverless.yml`.
-
-```yml
-plugins:
-  - custom-serverless-plugin
-```
-
-Local plugins folder can be changed by enhancing `plugins` object:
-
-```yml
-plugins:
-  localPath: './custom_serverless_plugins'
-  modules:
-    - custom-serverless-plugin
-```
-
-The `custom-serverless-plugin` will be loaded from the `custom_serverless_plugins` directory at the root of your service. If the `localPath` is not provided or empty, the `.serverless_plugins` directory will be used.
-
-The plugin will be loaded based on being named `custom-serverless-plugin.js` or `custom-serverless-plugin\index.js` in the root of `localPath` folder (`.serverless_plugins` by default).
-
-If you want to load a plugin from a specific directory without affecting other plugins, you can also specify a path relative to the root of your service:
-
-```yaml
-plugins:
-  # This plugin will be loaded from the `.serverless_plugins/` or `node_modules/` directories
-  - custom-serverless-plugin
-  # This plugin will be loaded from the `sub/directory/` directory
-  - ./sub/directory/another-custom-plugin
-```
-
-### Load Order
-
-Keep in mind that the order you define your plugins matters. When Serverless loads all the core plugins and then the custom plugins in the order you've defined them.
-
-```yml
-# serverless.yml
-
-plugins:
-  - plugin1
-  - plugin2
-```
-
-In this case `plugin1` is loaded before `plugin2`.
-
-## Writing Plugins
-
-**Note:** In order to ensure that your plugin works correctly with Framework in `v2.x`, keep the following things in mind:
-
-- Do not depend on `Bluebird` API for Promises returned by Framework internals - we are actively migrating away from `Bluebird` at this point
-- If your plugin adds new properties, ensure to define corresponding schema definitions, please refer to: [Extending validation schema](#extending-validation-schema)
-- Avoid using `subcommands` as the support for them might become deprecated or removed in next major version of the Framework
-- Add `serverless` to `peerDependencies` in order to ensure officially supported Framework version(s)
-
-### Concepts
-
-#### Plugin
-
-Code which defines _Commands_, any _Events_ within a _Command_, and any _Hooks_ assigned to a _Lifecycle Event_.
-
-- Command // CLI configuration, commands, options
-  - LifecycleEvent(s) // Events that happen sequentially when the command is run
-    - Hook(s) // Code that runs when a Lifecycle Event happens during a Command
-
-#### Command
-
-A CLI _Command_ that can be called by a user, e.g. `serverless foo`. A Command has no logic, but simply defines the CLI configuration (e.g. command, parameters) and the _Lifecycle Events_ for the command. Every command defines its own lifecycle events.
-
-```javascript
-'use strict';
-
-class MyPlugin {
-  constructor() {
-    this.commands = {
-      foo: {
-        lifecycleEvents: ['resources', 'functions'],
-      },
-    };
-  }
-}
-
-module.exports = MyPlugin;
-```
-
-#### Lifecycle Events
-
-Events that fire sequentially during a Command. The above example lists two Events. However, for each Event, an additional `before` and `after` event is created. Therefore, six Events exist in the above example:
-
-- `before:foo:resources`
-- `foo:resources`
-- `after:foo:resources`
-- `before:foo:functions`
-- `foo:functions`
-- `after:foo:functions`
-
-The name of the command in front of lifecycle events when they are used for Hooks.
-
-#### Hooks
-
-A Hook binds code to any lifecycle event from any command.
-
-```javascript
-'use strict';
-
-class MyPugin {
-  constructor() {
-    this.commands = {
-      foo: {
-        lifecycleEvents: ['resources', 'functions'],
-      },
-    };
-
-    this.hooks = {
-      'before:foo:resources': this.beforeFooResources,
-      'foo:resources': this.fooResources,
-      'after:foo:functions': this.afterFooFunctions,
-    };
-  }
-
-  beforeFooResources() {
-    console.log('Before Foo Resources');
-  }
-
-  fooResources() {
-    console.log('Foo Resources');
-  }
-
-  afterFooFunctions() {
-    console.log('After Foo Functions');
-  }
-}
-
-module.exports = MyPlugin;
-```
-
-### Custom Variable Types
-
-Plugins may register its own configuration variables resolution sources.
-
-Resolvers should be configured at `configurationVariablesSources` in form of a plain object that exposes `resolve` function.
-Check below example
-
-```javascript
-'use strict';
-
-class SomePlugin {
-  constructor() {
-
-    this.configurationVariablesSources = {
-      foo: {
-        async resolve({ address, params, resolveConfigurationProperty, options  }) {
-          // `address` and `params` reflect values configured with a variable:
-          // ${foo(param1, param2):address}
-          // Note: they're passed if they're configured into variable
-
-          // `options` is CLI options
-          // `resolveConfigurationProperty` allows to access other configuration properties,
-          // and guarantees to return a fully resolved form (even if property is configured with variables)
-          const stage = options.stage || await  resolveConfigurationProperty(["provider", "stage"]) || "dev";
-
-          // Resolver is expected to return plain object, with resolved value set on `value` property.
-          // Resolve value can be any JSON value
-          return {
-            //
-            value: `Resolution of "foo" source for "${stage}" stage at "${address || ""}" addresss with "${(params || []).join(", ")}" params`
-          }
-        }
-      }
-
-}
-```
-
-Having an above source resolver (as provided with a plugin), we may use new variable source in configuration as follows:
-
-```yaml
-service: test
-provider: aws
-custom:
-  value1: ${foo(one, two):whatever}
-plugins:
-  - ./some-plugin
-```
-
-Configuration will be resolved into following form:
-
-```yaml
-service: test
-provider: aws
-custom:
-  value1: Resolution of "foo" source for "dev" stage at "whatever" address with "one, two" params
-plugins:
-  - ./some-plugin
-```
-
-### Defining Options
-
-Each command can have multiple Options.
-
-Options are passed in with a double dash (`--`) like this: `serverless foo --function functionName`.
-
-Option Shortcuts are passed in with a single dash (`-`) like this: `serverless foo -f functionName`.
-
-The `options` object will be passed in as the second parameter to the constructor of your plugin.
-
-In it, you can optionally add a `shortcut` property, as well as a `required` property. The Framework will return an error if a `required` Option is not included. You can also set a `default` property if your option is not required.
-
-Additionally `type` for each option should be set. Supported types are `string`, `boolean` and `multiple` (multiple strings).
-
-**Note:** At this time, the Serverless Framework does not use parameters.
-
-```javascript
-'use strict';
-
-class MyPlugin {
-  constructor(serverless, options) {
-    this.serverless = serverless;
-    this.options = options;
-
-    this.commands = {
-      foo: {
-        lifecycleEvents: ['functions'],
-        options: {
-          function: {
-            usage: 'Specify the function you want to handle (e.g. "--function myFunction")',
-            shortcut: 'f',
-            required: true,
-            type: 'string', // Possible options: "string", "boolean", "multiple"
-          },
-        },
-      },
-    };
-
-    this.hooks = {
-      'foo:functions': this.fooFunction.bind(this),
-    };
-  }
-
-  fooFunction() {
-    console.log('Foo function: ', this.options.function);
-  }
-}
-
-module.exports = MyPlugin;
-```
-
-### Provider Specific Plugins
-
-Plugins can be provider specific which means that they are bound to a provider.
-
-**Note:** Binding a plugin to a provider is optional. Serverless will always consider your plugin if you don't specify a `provider`.
-
-The provider definition should be added inside the plugins constructor:
-
-```javascript
-'use strict';
-
-class ProviderX {
-  constructor(serverless, options) {
-    this.serverless = serverless;
-    this.options = options;
-
-    // set the providers name here
-    this.provider = this.serverless.getProvider('providerX');
-
-    this.commands = {
-      foo: {
-        lifecycleEvents: ['functions'],
-        options: {
-          function: {
-            usage: 'Specify the function you want to handle (e.g. "--function myFunction")',
-            required: true,
-            type: 'string', // Possible options: "string", "boolean", "multiple"
-          },
-        },
-      },
-    };
-
-    this.hooks = {
-      'foo:functions': this.fooFunction.bind(this),
-    };
-  }
-
-  fooFunction() {
-    console.log('Foo function: ', this.options.function);
-  }
-}
-
-module.exports = ProviderX;
-```
-
-The Plugin's functionality will now only be executed when the Serverless Service's provider matches the provider name which is defined inside the plugins constructor.
-
-### Serverless Instance
-
-The `serverless` instance which enables access to global service config during runtime is passed in as the first parameter to the plugin constructor.
-
-```javascript
-'use strict';
-
-class MyPlugin {
-  constructor(serverless, options) {
-    this.serverless = serverless;
-    this.options = options;
-
-    this.commands = {
-      log: {
-        lifecycleEvents: ['serverless'],
-      },
-    };
-
-    this.hooks = {
-      'log:serverless': this.logServerless.bind(this),
-    };
-  }
-
-  logServerless() {
-    console.log('Serverless instance: ', this.serverless);
-  }
-}
-
-module.exports = MyPlugin;
-```
-
-**Note:** [Variable references](./variables.md#reference-properties-in-serverlessyml) in the `serverless` instance are not resolved before a Plugin's constructor is called, so if you need these, make sure to wait to access those from your [hooks](#hooks).
-
-### Command Naming
-
-Command names need to be unique. If we load two commands and both want to specify the same command (e.g. we have an integrated command `deploy` and an external command also wants to use `deploy`) the Serverless CLI will print an error and exit. If you want to have your own `deploy` command you need to name it something different like `myCompanyDeploy` so they don't clash with existing plugins.
-
-### Extending validation schema
-
-If your plugin adds support for additional params in `serverless.yml` file, you should also add validation rules to the Framework's schema. Otherwise, the Framework may place validation errors to command output about your params.
-
-The Framework uses JSON-schema validation backed by [AJV](https://github.com/ajv-validator/ajv). You can extend [initial schema](/lib/configSchema/index.js) inside your plugin constuctor by using `defineTopLevelProperty`, `defineCustomProperties`, `defineFunctionEvent`, `defineFunctionEventProperties`, `defineFunctionProperties` or `defineProvider` helpers.
-
-Use the following map to know which helper suits best your needs.
-
-```yml
-custom:
-  my-plugin:
-    customProperty: foobar # <-- use defineCustomProperties
-
-my-plugin: # <-- use defineTopLevelProperty
-  customProperty: foobar
-
-provider:
-  name: new-provider # <-- use defineProvider
-  my-plugin:
-    customProperty: foobar
-
-functions:
-  someFunc:
-    handler: handler.main
-    customProperty: foobar # <-- use defineFunctionProperties
-    events:
-      - yourPluginEvent: # <-- use defineFunctionEvent
-          customProperty: foobar
-      - http:
-          customProperty: foobar # <-- use defineFunctionEventProperties
-```
-
-We'll walk though those helpers. You may also want to check out examples from [helpers tests](tests/fixtures/configSchemaExtensions/test-plugin.js)
-
-#### `defineTopLevelProperty` helper
-
-If your plugin requires additional top-level properties (like `provider`, `custom`, `service`...), you can use the `defineTopLevelProperty` helper to add their definition.
-
-Considering the following example
-
-```yml
-// serverless.yml
-
-service: my-service
-
-yourPlugin:
-  someProperty: foobar
-```
-
-you'll need to add validation rules as described below:
-
-```javascript
-class NewTopLevelPropertyPlugin {
-  constructor(serverless) {
-    this.serverless = serverless;
-
-    // Create schema for your properties. For reference use https://github.com/ajv-validator/ajv
-    const newCustomPropSchema = {
-      type: 'object',
-      properties: {
-        someProperty: { type: 'string' },
-      },
-      required: ['someProperty'],
-    };
-
-    // Attach your piece of schema to main schema at top level
-    serverless.configSchemaHandler.defineTopLevelProperty('yourPlugin', newCustomPropSchema);
-  }
-}
-```
-
-This way, if user sets `someProperty` by mistake to `false`, the Framework would display an error:
-
-```
-Serverless: Configuration error: yourPlugin.someProperty should be string
-```
-
-#### `defineCustomProperties` helper
-
-Let's say your plugin depends on some properties defined in `custom` section of `serverless.yml` file.
-
-```yml
-// serverless.yml
-
-custom:
-  yourPlugin:
-    someProperty: foobar
-```
-
-To add validation rules to these properties, your plugin would look like this:
-
-```javascript
-class NewEventPlugin {
-  constructor(serverless) {
-    this.serverless = serverless;
-
-    // Create schema for your properties. For reference use https://github.com/ajv-validator/ajv
-    const newCustomPropSchema = {
-      type: 'object',
-      properties: {
-        someProperty: { type: 'string' },
-      },
-      required: ['someProperty'],
-    };
-
-    // Attach your piece of schema to main schema
-    serverless.configSchemaHandler.defineCustomProperties(newCustomPropSchema);
-  }
-}
-```
-
-This way, if user sets `someProperty` by mistake to `false`, the Framework would display an error:
-
-```
-Serverless: Configuration error: custom.yourPlugin.someProperty should be string
-```
-
-#### `defineFunctionEvent` helper
-
-Let's say your plugin adds support to a new `yourPluginEvent` function event. To use this event, a user would need to have `serverless.yml` file like this:
-
-```yml
-// serverless.yml
-
-functions:
-  someFunc:
-    handler: handler.main
-    events:
-      - yourPluginEvent:
-          someProp: hello
-          anotherProp: 1
-```
-
-In this case your plugin should add validation rules inside your plugin constructor. Otherwise, the Framework would display an error message saying that your event is not supported:
-
-```
-Serverless: Configuration error: Unsupported function event 'yourPluginEvent'
-```
-
-To fix this error and more importantly to provide validation rules for your event, modify your plugin constructor with code like this:
-
-```javascript
-class NewEventPlugin {
-  constructor(serverless) {
-    this.serverless = serverless;
-
-    // Create schema for your properties. For reference use https://github.com/ajv-validator/ajv
-    serverless.configSchemaHandler.defineFunctionEvent('providerName', 'yourPluginEvent', {
-      type: 'object',
-      properties: {
-        someProp: { type: 'string' },
-        anotherProp: { type: 'number' },
-      },
-      required: ['someProp'],
-      additionalProperties: false,
-    });
-  }
-}
-```
-
-This way, if user sets `anotherProp` by mistake to `some-string`, the Framework would display an error:
-
-```
-Serverless: Configuration error: functions.someFunc.events[0].yourPluginEvent.anotherProp should be number
-```
-
-#### `defineFunctionEventProperties` helper
-
-When your plugin extend other plugin events definition for a specific provider, you can use the `defineFunctionEventProperties` to extend event definition with your custom properties.
-
-For example, if your plugin adds support to a new `documentation` property on `http` event from `aws` provider, you should add validations rules inside your plugin constructor for this new property.
-
-```javascript
-class NewEventPlugin {
-  constructor(serverless) {
-    this.serverless = serverless;
-
-    // Create schema for your properties. For reference use https://github.com/ajv-validator/ajv
-    serverless.configSchemaHandler.defineFunctionEventProperties('aws', 'http', {
-      properties: {
-        documentation: { type: 'object' },
-      },
-      required: ['documentation'],
-    });
-  }
-}
-```
-
-This way, if user sets `documentation` by mistake to `anyString`, the Framework would display an error:
-
-```
-Serverless: Configuration error: functions.someFunc.events[0].http.documentation should be object
-```
-
-#### `defineFunctionProperties` helper
-
-Let's say your plugin adds support to a new `someProperty` function property. To use this property, a user would need to have `serverless.yml` file like this:
-
-```yml
-// serverless.yml
-
-functions:
-  someFunc:
-    handler: handler.main
-    someProperty: my-property-value
-```
-
-In this case your plugin should add validation rules inside your plugin constructor. Otherwise, the Framework would display an error message saying that your property is not supported:
-
-```
-ServerlessError: Configuration error:
-at 'functions.someFunc': unrecognized property 'someProperty'
-```
-
-To fix this error and more importantly to provide validation rules for your property, modify your plugin constructor with code like this:
-
-```javascript
-class NewFunctionPropertiesPlugin {
-  constructor(serverless) {
-    this.serverless = serverless;
-
-    // Create schema for your properties. For reference use https://github.com/ajv-validator/ajv
-    serverless.configSchemaHandler.defineFunctionProperties('providerName', {
-      properties: {
-        someProperty: { type: 'string' },
-        anotherProperty: { type: 'number' },
-      },
-      required: ['someProperty'],
-    });
-  }
-}
-```
-
-This way, if user sets `anotherProperty` by mistake to `hello`, the Framework would display an error:
-
-```
-ServerlessError: Configuration error at 'functions.someFunc.anotherProperty': should be number
-```
-
-#### `defineProvider` helper
-
-In case your plugin provides support for new provider, you would want to adjust validation schema. Here is example:
-
-```javascript
-class NewProviderPlugin {
-  constructor(serverless) {
-    this.serverless = serverless;
-
-    // Create schema for your provider. For reference use https://github.com/ajv-validator/ajv
-    serverless.configSchemaHandler.defineProvider('newProvider', {
-      // Eventual reusable schema definitions (will be put to top level "definitions" object)
-      definitions: {
-        // ...
-      },
-
-      // Top level "provider" properties
-      provider: {
-        properties: {
-          stage: { type: 'string' },
-          remoteFunctionData: { type: 'null' },
-        },
-      },
-
-      // Function level properties
-      function: {
-        properties: { handler: { type: 'string' } },
-      },
-
-      // Function events definitions (can be defined here or via `defineFunctionEvent` helper)
-      functionEvents: {
-        someEvent: {
-          name: 'someEvent',
-          schema: {
-            type: 'object',
-            properties: {
-              someRequiredStringProp: { type: 'string' },
-              someNumberProp: { type: 'number' },
-            },
-            required: ['someRequiredStringProp'],
-            additionalProperties: false,
-          },
-        },
-      },
-
-      // Definition for eventual top level "resources" section
-      resources: {
-        type: 'object',
-        properties: {
-          // ...
-        },
-      },
-
-      // Definition for eventual top level "layers" section
-      layers: {
-        type: 'object',
-        additionalProperties: {
-          type: 'object',
-          properties: {
-            // ...
-          },
-        },
-      },
-    });
-  }
-}
-```
-
-### Extending the `info` command
-
-The `info` command which is used to display information about the deployment has detailed `lifecycleEvents` you can hook into to add and display custom information.
-
-Here's an example overview of the info lifecycle events the AWS implementation exposes:
-
-```
--> info:info
-  -> aws:info:validate
-  -> aws:info:gatherData
-  -> aws:info:displayServiceInfo
-  -> aws:info:displayApiKeys
-  -> aws:info:displayEndpoints
-  -> aws:info:displayFunctions
-  -> aws:info:displayStackOutputs
-```
-
-Here you could e.g. hook into `after:aws:info:gatherData` and implement your own data collection and display it to the user.
-
-**Note:** Every provider implements its own `info` plugin so you might want to take a look into the `lifecycleEvents` the provider `info` plugin exposes.
diff --git a/docs/providers/aws/guide/quick-start.md b/docs/providers/aws/guide/quick-start.md
deleted file mode 100644
index eabf18166d1..00000000000
--- a/docs/providers/aws/guide/quick-start.md
+++ /dev/null
@@ -1,180 +0,0 @@
-<!--
-title: Serverless Framework - AWS Lambda Guide - Quick Start
-menuText: Quick Start
-menuOrder: 1
-description: Getting started with the Serverless Framework on AWS Lambda
-layout: Doc
--->
-
-# Quick Start
-
-Complete the steps in this guide to install the Serverless Framework open-source CLI and deploy a sample Service on AWS that reports deployment information and operational metrics to the Serverless Framework Dashboard.
-
-## Initial Setup
-
-There are a few prerequisites you need to install and configure:
-
-- [Install Node.js 6.x or later on your local machine](#install-nodejs-and-npm)
-- [Install the Serverless Framework open-source CLI version 1.47.0 or later](#install-the-serverless-framework-open-source-cli)
-
-If you already have these prerequisites setup you can skip ahead to deploy an example Service.
-
-### Install Node.js and NPM
-
-- Follow these [installation instructions](https://nodejs.org/en/download/).
-- At the end, you should be able to run `node -v` from your command line and get a result like this...
-
-```sh
-$ node -v
-vx.x.x
-```
-
-- You should also be able to run `npm -v` from your command line and should see...
-
-```sh
-$ npm -v
-x.x.x
-```
-
-### Install the Serverless Framework open-source CLI
-
-- Run this command in your terminal
-
-```sh
-npm install -g serverless
-```
-
-- After install is complete, you should be able to run `serverless -v` from your command line and get a result like this...
-
-```sh
-$ serverless -v
-x.x.x
-```
-
-## Create and deploy a serverless Service
-
-Now that you’ve completed your setup, let’s create and deploy a serverless Service.
-
-### Create a new Service from a Template
-
-Use the Serverless Framework open-source CLI to create a new Service.
-
-```sh
-# Create a new Serverless service/project
-$ serverless
-
-# Change into the newly created directory
-$ cd your-service-name
-```
-
-The `serverless` command will guide you through creating a new Node or Python Service, [configuring your AWS Account](https://serverless.com/framework/docs/providers/aws/guide/credentials/) to work with the Serverless Framework, and setting up a free Serverless Framework Dashboard account so you can monitor, troubleshoot, and test your new service.
-
-Looking to get started with something other than Node or Python? No problem. You can use the [`create`](https://serverless.com/framework/docs/providers/aws/cli-reference/create/) command to get started with a variety of other languages.
-
-### Set up an endpoint
-
-An Event is anything that can trigger your serverless functions. In this case, you need to define an endpoint in your `serverless.yml` that will trigger your serverless function.
-
-```yaml
-functions:
-  hello:
-    handler: handler.hello
-    # Add the following lines:
-    events:
-      - http:
-          path: hello
-          method: post
-```
-
-### Deploy the Service
-
-Use this command to deploy your service for the first time and after you make changes to your Functions, Events or Resources in `serverless.yml` and want to deploy all changes within your Service at the same time.
-
-```bash
-serverless deploy -v
-```
-
-### Test your Service
-
-Replace the URL in the following curl command with your returned endpoint URL, which you can find in the `sls deploy` output, to hit your URL endpoint.
-
-```bash
-$ curl -X POST https://xxxxxxxxxx.execute-api.us-east-1.amazonaws.com/dev/hello
-```
-
-### Invoke your Service's function
-
-Invokes a Function and returns logs.
-
-```bash
-serverless invoke -f hello -l
-```
-
-### Fetch the Function Logs
-
-Open up a separate tab in your console and stream all logs for a specific Function using this command.
-
-```bash
-serverless logs -f hello -t
-```
-
-### Monitor your Service
-
-Use either of the two commands below to generate mock errors that you will then be able to visualize in the Serverless Framework Dashboard. If you use the curl command remember to replace the URL in the command with your returned endpoint URL, which you can find in your `sls deploy` output.
-
-```bash
-serverless invoke -f hello -d '{"body": "not a json string"}' # causes a JSON parsing error so error Insights will populate
-```
-
-```bash
-$ curl https://xxxxxxxxxx.execute-api.us-east-1.amazonaws.com/dev/hello --data-binary 'not a json string' # causes a JSON parsing error so error Insights will populate
-```
-
-## Cleanup
-
-### Remove your Service
-
-If at any point you no longer need your Service, you can run the following command to remove the Functions, Events and Resources that were created. This will delete the AWS resources you created and ensure that you don't incur any unexpected charges. It will also remove the Service from your Serverless Framework Dashboard.
-
-```sh
-serverless remove
-```
-
-## Deploy more Services!
-
-Now you are ready to leverage the hundreds of Service Examples available to you from Serverless, Inc. and our large and growing community to build your own Services.
-
-### Create a new Service from an Example
-
-The `serverless` introduction above guided you through creating a new service for a simple Node.js project. However, if you want to create a project for a more advanced use case and you don’t want to start from scratch, check out the list of available examples.
-
-Clone a Service from the Serverless Inc. repository of [Examples](https://serverless.com/examples/)
-
-```sh
-# replace folder-name below with the folder name of the example you want to use
-$ serverless create -u https://github.com/serverless/examples/tree/master/folder-name -n my-project
-```
-
-Or, clone a Service example from the Serverless open-source community
-
-```sh
-$ serverless create -u https://github.com/author/project -n my-project
-```
-
-### Remember to configure your new Service to work with the Serverless Framework account for monitoring, troubleshooting and testing features.
-
-Run the `serverless` command in your new project to connect it to your Serverless Framework Dashboard account to enable the monitoring, troubleshooting and testing features.
-
-```sh
-$ serverless
-```
-
-Deploy your service
-
-```sh
-$ sls deploy
-```
-
-## Additional Tutorials
-
-Want to learn more? Check out a list of available tutorials [here](https://serverless.com/courses/).
diff --git a/docs/providers/aws/guide/resources.md b/docs/providers/aws/guide/resources.md
index 1b7de0741f4..9f2750ffc4f 100644
--- a/docs/providers/aws/guide/resources.md
+++ b/docs/providers/aws/guide/resources.md
@@ -115,10 +115,7 @@ functions:
   write-post:
     handler: handler.writePost
     events:
-      - http:
-          method: post
-          path: ${self:service}/api/posts/new
-          cors: true
+      - httpApi: 'POST /api/posts/new'
 
 resources:
   extensions:
diff --git a/docs/providers/aws/guide/serverless.yml.md b/docs/providers/aws/guide/serverless.yml.md
index b7eb727ca72..fce4c91ae10 100644
--- a/docs/providers/aws/guide/serverless.yml.md
+++ b/docs/providers/aws/guide/serverless.yml.md
@@ -16,109 +16,268 @@ layout: Doc
 
 Here is a list of all available properties in `serverless.yml` when the provider is set to `aws`.
 
+## Root properties
+
 ```yml
 # serverless.yml
 
-service: myService
+# Service name
+service: myservice
 
-frameworkVersion: '2'
-configValidationMode: warn # Modes for config validation. `error` throws an exception, `warn` logs error to console, `off` disables validation at all. The default is warn.
-enableLocalInstallationFallback: false # If set to 'true', guarantees that it's a locally (for service, in its node_modules) installed framework which processes the command
-useDotenv: false # If set to 'true', environment variables will be automatically loaded from .env files
-variablesResolutionMode: null # To crash on variable resolution errors (as coming from new resolver), set this value to "20210326"
-unresolvedVariablesNotificationMode: warn # If set to 'error', references to variables that cannot be resolved will result in an error being thrown (applies to legacy resolver)
+# Framework version constraint (semver constraint): '3', '^2.33'
+frameworkVersion: '3'
 
-disabledDeprecations: # Disable deprecation logs by their codes. Default is empty.
+# Configuration validation: 'error' (fatal error), 'warn' (logged to the output) or 'off' (default: warn)
+# See https://www.serverless.com/framework/docs/configuration-validation
+configValidationMode: error
+# Load environment variables from .env files (default: false)
+# See https://www.serverless.com/framework/docs/environment-variables
+useDotenv: true
+# 'warn' reports deprecations on the go, 'error' will result with an exception being thrown on first approached deprecation
+deprecationNotificationMode: warn:summary
+# Disable deprecations by their codes (default: empty)
+# See https://www.serverless.com/framework/docs/deprecations
+disabledDeprecations:
   - DEP_CODE_1 # Deprecation code to disable
   - '*' # Disable all deprecation messages
+```
+
+### Parameters
+
+Learn more about stage parameters in the [Parameters documentation](../../../guides/parameters.md).
+
+```yml
+# serverless.yml
+
+# Stage parameters
+params:
+  # Values for the "prod" stage
+  prod:
+    my-parameter: foo
+  # Values for the "dev" stage
+  dev:
+    my-parameter: bar
+```
+
+## Provider
+
+### General settings
+
+```yml
+# serverless.yml
 
 provider:
   name: aws
+  # Default stage (default: dev)
+  stage: dev
+  # Default region (default: us-east-1)
+  region: us-east-1
+  # The AWS profile to use to deploy (default: "default" profile)
+  profile: production
+  # Use a custom name for the CloudFormation stack
+  stackName: custom-stack-name
+  # Optional CloudFormation tags to apply to APIs and functions
+  tags:
+    foo: bar
+    baz: qux
+  # Optional CloudFormation tags to apply to the stack
+  stackTags:
+    key: value
+  # List of existing Amazon SNS topics in the same region where notifications about stack events are sent.
+  notificationArns:
+    - 'arn:aws:sns:us-east-1:XXXXXX:mytopic'
+  stackParameters:
+    - ParameterKey: 'Keyname'
+      ParameterValue: 'Value'
+  # Disable automatic rollback by CloudFormation on failure. To be used for non-production environments.
+  disableRollback: true
+  rollbackConfiguration:
+    MonitoringTimeInMinutes: 20
+    RollbackTriggers:
+      - Arn: arn:aws:cloudwatch:us-east-1:000000000000:alarm:health
+        Type: AWS::CloudWatch::Alarm
+      - Arn: arn:aws:cloudwatch:us-east-1:000000000000:alarm:latency
+        Type: AWS::CloudWatch::Alarm
+  tracing:
+    # Can only be true if API Gateway is inside a stack.
+    apiGateway: true
+    # Optional, can be true (true equals 'Active'), 'Active' or 'PassThrough'
+    lambda: true
+```
+
+### General function settings
+
+Some function settings can be defined for all functions inside the `provider` key:
+
+```yml
+# serverless.yml
+
+provider:
   runtime: nodejs14.x
-  stage: dev # Default stage to be used. Default is "dev"
-  region: us-east-1 # Default region to be used. Default is "us-east-1"
-  stackName: custom-stack-name # Use a custom name for the CloudFormation stack
-  apiName: custom-api-name # Use a custom name for the API Gateway API
-  websocketsApiName: custom-websockets-api-name # Use a custom name for the websockets API
-  websocketsApiRouteSelectionExpression: $request.body.route # custom route selection expression
-  profile: production # The default profile to use with this service
-  memorySize: 512 # Overwrite the default memory size. Default is 1024
-  timeout: 10 # The default is 6 seconds. Note: API Gateway current maximum is 30 seconds
-  logRetentionInDays: 14 # Set the default RetentionInDays for a CloudWatch LogGroup
-  kmsKeyArn: arn:aws:kms:us-east-1:XXXXXX:key/some-hash # KMS key arn which will be used for encryption for all functions
+  # Default memory size for functions (default: 1024MB)
+  memorySize: 512
+  # Default timeout for functions (default: 6 seconds)
+  # Note: API Gateway has a maximum timeout of 30 seconds
+  timeout: 10
+  # Function environment variables
+  environment:
+    APP_ENV_VARIABLE: FOOBAR
+  # Duration for CloudWatch log retention (default: forever)
+  logRetentionInDays: 14
+  # KMS key ARN to use for encryption for all functions
+  kmsKeyArn: arn:aws:kms:us-east-1:XXXXXX:key/some-hash
+  # Version of hashing algorithm used by Serverless Framework for function packaging
+  lambdaHashingVersion: 20201221
+  # Use function versioning (enabled by default)
+  versionFunctions: false
+  # Processor architecture: 'x86_64' or 'arm64' via Graviton2 (default: x86_64)
+  architecture: x86_64
+```
+
+### Deployment bucket
+
+Serverless Framework needs a S3 bucket to store artifacts for deploying. That bucket is automatically created and managed by Serverless, but you can configure it explicitly if needed:
+
+```yaml
+provider:
+  # The S3 prefix under which deployed artifacts are stored (default: serverless)
+  deploymentPrefix: serverless
+  # Configure the S3 bucket used by Serverless Framework to deploy code packages to Lambda
   deploymentBucket:
-    blockPublicAccess: true # Prevents public access via ACLs or bucket policies. Default is false
-    skipPolicySetup: false # Prevents creation of default bucket policy when framework creates the deployment bucket. Default is false
-    name: com.serverless.${self:provider.region}.deploys # Deployment bucket name. Default is generated by the framework
-    maxPreviousDeploymentArtifacts: 10 # On every deployment the framework prunes the bucket to remove artifacts older than this limit. The default is 5
-    serverSideEncryption: AES256 # server-side encryption method
-    sseKMSKeyId: arn:aws:kms:us-east-1:xxxxxxxxxxxx:key/aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa # when using server-side encryption
-    sseCustomerAlgorithim: AES256 # when using server-side encryption and custom keys
-    sseCustomerKey: string # when using server-side encryption and custom keys
-    sseCustomerKeyMD5: md5sum # when using server-side encryption and custom keys
-    tags: # Tags that will be added to each of the deployment resources
+    # Name of an existing bucket to use (default: created by serverless)
+    name: com.serverless.${self:provider.region}.deploys
+    # On deployment, serverless prunes artifacts older than this limit (default: 5)
+    maxPreviousDeploymentArtifacts: 10
+    # Prevents public access via ACLs or bucket policies (default: false)
+    # Note: the deployment bucket is not public by default. These are additional ACLs.
+    blockPublicAccess: true
+    # Skip the creation of a default bucket policy when the deployment bucket is created (default: false)
+    skipPolicySetup: true
+    # Enable bucket versioning (default: false)
+    versioning: true
+    # Server-side encryption method
+    serverSideEncryption: AES256
+    # For server-side encryption
+    sseKMSKeyId: arn:aws:kms:us-east-1:xxxxxxxxxxxx:key/aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa
+    # For server-side encryption with custom keys
+    sseCustomerAlgorithim: AES256
+    sseCustomerKey: string
+    sseCustomerKeyMD5: md5sum
+    # Tags that will be added to each of the deployment resources
+    tags:
       key1: value1
       key2: value2
-  deploymentPrefix: serverless # The S3 prefix under which deployed artifacts should be stored. Default is serverless
-  lambdaHashingVersion: 20201221 # optional, version of hashing algorithm that should be used by the framework
-  ecr:
-    images: # Definitions of images that later can be referenced by key in `function.image`
-      baseimage:
-        uri: 000000000000.dkr.ecr.us-east-1.amazonaws.com/test-image@sha256:6bb600b4d6e1d7cf521097177d111111ea373edb91984a505333be8ac9455d38 # Image uri of existing Docker image in ECR
-      anotherimage:
-        path: ./image/ # Path to Docker context that will be used when building that image locally
-        file: Dockerfile.dev # Name of Dockerfile that should be used when building image locally. Equal to 'Dockerfile' by default
-        buildArgs:
-          STAGE: ${opt:stage}
-        cacheFrom:
-          - my-image:latest
-  cloudFront:
-    myCachePolicy1: # used as a reference in function.events[].cloudfront.cachePolicy.name
-      DefaultTTL: 60
-      MinTTL: 30
-      MaxTTL: 3600
-      Comment: my brand new cloudfront cache policy # optional
-      ParametersInCacheKeyAndForwardedToOrigin:
-        CookiesConfig:
-          CookieBehavior: whitelist # Possible values are 'none', 'whitelist', 'allExcept' and 'all'
-          Cookies:
-            - my-public-cookie
-        EnableAcceptEncodingBrotli: true # optional
-        EnableAcceptEncodingGzip: true
-        HeadersConfig:
-          HeadersBehavior: whitelist # Possible values are 'none' and 'whitelist'
-          Headers:
-            - authorization
-            - content-type
-        QueryStringsConfig:
-          QueryStringBehavior: allExcept # Possible values are 'none', 'whitelist', 'allExcept' and 'all'
-          QueryStrings:
-            - not-cached-query-string
-  versionFunctions: false # Optional function versioning
-  environment: # Service wide environment variables
-    serviceEnvVar: 123456789
-  endpointType: regional # Optional endpoint configuration for API Gateway REST API. Default is Edge.
-  apiGateway: # Optional API Gateway global config
-    restApiId: xxxxxxxxxx # REST API resource ID. Default is generated by the framework
-    restApiRootResourceId: xxxxxxxxxx # Root resource ID, represent as / path
-    restApiResources: # List of existing resources that were created in the REST API. This is required or the stack will be conflicted
-      '/users': xxxxxxxxxx
-      '/users/create': xxxxxxxxxx
-    websocketApiId: # Websocket API resource ID. Default is generated by the framework
-    apiKeySourceType: HEADER # Source of API key for usage plan. HEADER or AUTHORIZER.
-    apiKeys: # List of API keys to be used by your service API Gateway REST API
+```
+
+### API Gateway v2 HTTP API
+
+The `httpApi` settings apply to [API Gateway v2 HTTP APIs](../events/http-api.md):
+
+```yml
+provider:
+  httpApi:
+    # Attach to an externally created HTTP API via its ID:
+    id: xxxx
+    # Set a custom name for the API Gateway API (default: ${sls:stage}-${self:service})
+    name: dev-my-service
+    # Payload format version (note: use quotes in YAML: '1.0' or '2.0') (default: '2.0')
+    payload: '2.0'
+    # Disable the default 'execute-api' HTTP endpoint (default: false)
+    # Useful when using a custom domain.
+    disableDefaultEndpoint: true
+    # Enable detailed CloudWatch metrics (default: false)
+    metrics: true
+    # Enable CORS HTTP headers with default settings (allow all)
+    # Can be fine-tuned with specific options
+    cors: true
+    authorizers:
+      # JWT API authorizer
+      someJwtAuthorizer:
+        identitySource: $request.header.Authorization
+        issuerUrl: https://cognito-idp.us-east-1.amazonaws.com/us-east-1_xxxxx
+        audience:
+          - xxxx
+          - xxxx
+      # Custom Lambda request authorizer
+      someCustomLambdaAuthorizer:
+        # Should be set to 'request' for custom Lambda authorizers
+        type: request
+        # Mutually exclusive with `functionArn`
+        functionName: authorizerFunc
+        # Mutually exclusive with `functionName`
+        functionArn: arn:aws:lambda:us-east-1:11111111111:function:external-authorizer
+        # Optional. Custom name for created authorizer
+        name: customAuthorizerName
+        # Optional. Time to live for cached authorizer results, accepts values from 0 (no caching) to 3600 (1 hour)
+        # When set to non-zero value, 'identitySource' must be defined as well
+        resultTtlInSeconds: 300
+        # Set if authorizer function will return authorization responses in simple format (default: false)
+        enableSimpleResponses: true
+        # Version of payload that will be sent to authorizer function (default: '2.0')
+        payloadVersion: '2.0'
+        # Optional. One or more mapping expressions of the request parameters in form of e.g `$request.header.Auth`.
+        # Specified values are verified to be non-empty and not null by authorizer.
+        # It is a required property when `resultTtlInSeconds` is non-zero as `identitySource` is additionally
+        # used as cache key for authorizer responses caching.
+        identitySource:
+          - $request.header.Auth
+          - $request.header.Authorization
+        # Optional. Applicable only when using externally defined authorizer functions
+        # to prevent creation of permission resource
+        managedExternally: true
+```
+
+### API Gateway v1 REST API
+
+The `apiGateway` settings apply to [API Gateway v1 REST APIs](../events/apigateway.md) and [websocket APIs](../events/websocket.md):
+
+```yml
+provider:
+  # Use a custom name for the API Gateway API
+  apiName: custom-api-name
+  # Endpoint type for API Gateway REST API: edge or regional (default: edge)
+  endpointType: regional
+  # Use a custom name for the websockets API
+  websocketsApiName: custom-websockets-api-name
+  # custom route selection expression
+  websocketsApiRouteSelectionExpression: $request.body.route
+  # Optional API Gateway REST API global config
+  apiGateway:
+    # Attach to an externally created REST API via its ID:
+    restApiId: xxxx
+    # Root resource ID, represent as / path
+    restApiRootResourceId: xxxx
+    # List of existing resources that were created in the REST API. This is required or the stack will be conflicted
+    restApiResources:
+      '/users': xxxx
+      '/users/create': xxxx
+    # Attach to an externally created Websocket API via its ID:
+    websocketApiId: xxxx
+    # Disable the default 'execute-api' HTTP endpoint (default: false)
+    disableDefaultEndpoint: true
+    # Source of API key for usage plan: HEADER or AUTHORIZER
+    apiKeySourceType: HEADER
+    # List of API keys for the REST API
+    apiKeys:
       - myFirstKey
         value: myFirstKeyValue
         description: myFirstKeyDescription
         customerId: myFirstKeyCustomerId
-      - ${opt:stage}-myFirstKey
+        # Can be used to disable the API key without removing it (default: true)
+        enabled: false
+      - ${sls:stage}-myFirstKey
       - ${env:MY_API_KEY} # you can hide it in a serverless variable
-    minimumCompressionSize: 1024 # Compress response when larger than specified size in bytes (must be between 0 and 10485760)
-    description: Some Description # Optional description for the API Gateway stage deployment
-    binaryMediaTypes: # Optional binary media types the API might return
+    # Compress response when larger than specified size in bytes (must be between 0 and 10485760)
+    minimumCompressionSize: 1024
+    # Description for the API Gateway stage deployment
+    description: Some description
+    # Optional binary media types the API might return
+    binaryMediaTypes:
       - '*/*'
-    metrics:  false # Optional detailed Cloud Watch Metrics
-    shouldStartNameWithService: false # Use `${service}-${stage}` naming for API Gateway. Will be `true` by default in next major version.
+    # Optional detailed Cloud Watch Metrics
+    metrics: false
+    # Use `${service}-${stage}` naming for API Gateway. Will be `true` by default in v3.
+    shouldStartNameWithService: false
     resourcePolicy:
       - Effect: Allow
         Principal: '*'
@@ -129,7 +288,8 @@ provider:
           IpAddress:
             aws:SourceIp:
               - '123.123.123.123'
-    usagePlan: # Optional usage plan configuration
+    # Optional usage plan configuration
+    usagePlan:
       quota:
         limit: 5000
         offset: 2
@@ -138,81 +298,154 @@ provider:
         burstLimit: 200
         rateLimit: 100
     request:
-      schemas: # Optional request schema validation models that can be reused in `http` events. It is always defined for `application/json` content type
+      # Request schema validation models that can be reused in `http` events
+      # It is always defined for `application/json` content type
+      schemas:
         global-model:
-          name: GlobalModel # Optional: Name of the API Gateway model
-          description: "A global model that can be referenced in functions" # Optional: Description of the API Gateway model
-          schema: ${file(schema.json)}  # Valid JSON Schema
+          # JSON Schema
+          schema: ${file(schema.json)}
+          # Optional: Name of the API Gateway model
+          name: GlobalModel
+          # Optional: Description of the API Gateway model
+          description: "A global model that can be referenced in functions"
+```
+
+### ALB
+
+Configure [Application Load Balancer](../events/alb.md):
+
+```yml
+provider:
   alb:
-    targetGroupPrefix: xxxxxxxxxx # Optional prefix to prepend when generating names for target groups
+    # Optional prefix to prepend when generating names for target groups
+    targetGroupPrefix: xxxx
     authorizers:
       myFirstAuth:
         type: 'cognito'
-        userPoolArn: 'arn:aws:cognito-idp:us-east-1:123412341234:userpool/us-east-1_123412341', # required
-        userPoolClientId: '1h57kf5cpq17m0eml12EXAMPLE', # required
-        userPoolDomain: 'your-test-domain' # required
-        onUnauthenticatedRequest: 'deny' # If set to 'allow' this allows the request to be forwarded to the target when user is not authenticated. When omitted it defaults 'deny' which makes a HTTP 401 Unauthorized error be returned. Alternatively configure to 'authenticate' to redirect request to IdP authorization endpoint.
-        requestExtraParams: # optional. The query parameters (up to 10) to include in the redirect request to the authorization endpoint
-          prompt: 'login'
+        # Required
+        userPoolArn: 'arn:aws:cognito-idp:us-east-1:123412341234:userpool/us-east-1_123412341'
+        # Required
+        userPoolClientId: '1h57kf5cpq17m0eml12EXAMPLE'
+        # Required
+        userPoolDomain: your-test-domain
+        # If set to 'allow' this allows the request to be forwarded to the target when user is not authenticated.
+        # When omitted it defaults 'deny' which makes a HTTP 401 Unauthorized error be returned.
+        # Alternatively configure to 'authenticate' to redirect request to IdP authorization endpoint.
+        onUnauthenticatedRequest: deny
+        # optional. The query parameters (up to 10) to include in the redirect request to the authorization endpoint
+        requestExtraParams:
+          prompt: login
           redirect: false
-        scope: 'first_name age' # Can be a combination of any system-reserved scopes or custom scopes associated with the client. The default is openid
-        sessionCookieName: '🍪' # The name of the cookie used to maintain session information. The default is AWSELBAuthSessionCookie
-        sessionTimeout: 7000 # The maximum duration of the authentication session, in seconds. The default is 604800 seconds (7 days).
+        # Combination of any system-reserved scopes or custom scopes associated with the client (default: openid)
+        scope: 'first_name age'
+        # Name of the cookie used to maintain session information (default: AWSELBAuthSessionCookie)
+        sessionCookieName: '🍪'
+        # Maximum duration of the authentication session in seconds (default: 604800 seconds/7 days)
+        sessionTimeout: 7000
       mySecondAuth:
-        type: 'oidc'
-        authorizationEndpoint: 'https://example.com', # required. The authorization endpoint of the IdP. Must be a full URL, including the HTTPS protocol, the domain, and the path
-        clientId: 'i-am-client', # required
-        clientSecret: 'i-am-secret', # if creating a rule this is required. If modifying a rule, this can be omitted if you set useExistingClientSecret to true (as below)
-        useExistingClientSecret: true # only required if clientSecret is omitted
-        issuer: 'https://www.iamscam.com', # required. The OIDC issuer identifier of the IdP. This must be a full URL, including the HTTPS protocol, the domain, and the path
-        tokenEndpoint: 'http://somewhere.org', # required
-        userInfoEndpoint: 'https://another-example.com' # required
-        onUnauthenticatedRequest: 'deny' # If set to 'allow' this allows the request to be forwarded to the target when user is not authenticated. Omit or set to 'deny' (default) to make a HTTP 401 Unauthorized error be returned instead. Alternatively configure to 'authenticate' to redirect request to IdP authorization endpoint.
+        type: oidc
+        # Required. The authorization endpoint of the IdP.
+        # Must be a full URL, including the HTTPS protocol, the domain, and the path
+        authorizationEndpoint: 'https://example.com'
+        # Required
+        clientId: i-am-client
+        # If creating a rule this is required
+        # If modifying a rule, this can be omitted if you set useExistingClientSecret to true (as below)
+        clientSecret: i-am-secret
+        # Only required if clientSecret is omitted
+        useExistingClientSecret: true
+        # Required. The OIDC issuer identifier of the IdP
+        # This must be a full URL, including the HTTPS protocol, the domain, and the path
+        issuer: 'https://www.iamscam.com'
+        # Required
+        tokenEndpoint: 'http://somewhere.org'
+        # Required
+        userInfoEndpoint: 'https://another-example.com'
+        # If set to 'allow' this allows the request to be forwarded to the target when user is not authenticated.
+        # Omit or set to 'deny' (default) to make a HTTP 401 Unauthorized error be returned instead.
+        # Alternatively configure to 'authenticate' to redirect request to IdP authorization endpoint.
+        onUnauthenticatedRequest: 'deny'
         requestExtraParams:
-          prompt: 'login'
+          prompt: login
           redirect: false
-        scope: 'first_name age'
+        scope: first_name age
         sessionCookieName: '🍪'
         sessionTimeout: 7000
-  httpApi:
-    id: 'my-id' # If we want to attach to externally created HTTP API its id should be provided here
-    name: 'dev-my-service' # Use custom name for the API Gateway API, default is ${sls:stage}-${self:service}
-    payload: '2.0' # Specify payload format version for Lambda integration ('1.0' or '2.0'), default is '2.0'
-    cors: true # Implies default behavior, can be fine tuned with specific options
-    authorizers:
-      # JWT authorizer to back HTTP API endpoints
-      someJwtAuthorizer:
-        identitySource: $request.header.Authorization
-        issuerUrl: https://cognito-idp.us-east-1.amazonaws.com/us-east-1_xxxxx
-        audience:
-          - xxxx
-          - xxxx
-      # Custom Lambda request authorizer to back HTTP API endpoints
-      someCustomLambdaAuthorizer:
-        type: request # Should be set to `request` for custom Lambda authorizers.
-        functionName: authorizerFunc # Mutually exclusive with `functionArn`
-        functionArn: arn:aws:lambda:us-east-1:11111111111:function:external-authorizer # Mutually exclusive with `functionName`
-        name: customAuthorizerName # Optional. Custom name for created authorizer
-        resultTtlInSeconds: 300 # Optional. Time to live for cached authorizer results, accepts values from 0 (no caching) to 3600 (1 hour). When set to non-zero value, `identitySource` must be defined as well.
-        enableSimpleResponses: true # Optional. Flag that specifies if authorizer function will return authorization responses in simple format. Defaults to `false`.
-        payloadVersion: '2.0' # Optional. Version of payload that will be sent to authorizer function. Defaults to `'2.0'`.
-        identitySource: # Optional. One or more mapping expressions of the request parameters in form of e.g `$request.header.Auth`. Specified values are verified to be non-empty and not null by authorizer. It is a required property when `resultTtlInSeconds` is non-zero as `identitySource` is additionally used as cache key for authorizer responses caching.
-          - $request.header.Auth
-          - $request.header.Authorization
-        managedExternally: true # Optional. Applicable only when using externally defined authorizer functions to prevent creation of permission resource
-  stackTags: # Optional CF stack tags
-    key: value
+```
+
+### Docker image deployments in ECR
+
+Configure [deployment via Docker images](./functions.md#referencing-container-image-as-a-target):
+
+```yaml
+provider:
+  ecr:
+    scanOnPush: true
+    # Definitions of images that later can be referenced by key in `function.image`
+    images:
+      baseimage:
+        # URI of an existing Docker image in ECR
+        uri: 000000000000.dkr.ecr.us-east-1.amazonaws.com/test-image@sha256:6bb600b4d6e1d7cf521097177d111111ea373edb91984a505333be8ac9455d38
+      anotherimage:
+        # Path to the Docker context that will be used when building that image locally (default: '.')
+        path: ./image/
+        # Dockerfile that will be used when building the image locally (default: 'Dockerfile')
+        file: Dockerfile.dev
+        buildArgs:
+          STAGE: ${sls:stage}
+        cacheFrom:
+          - my-image:latest
+```
+
+### CloudFront
+
+Configure the CloudFront distribution used for [CloudFront Lambda@Edge events](../events/cloudfront.md):
+
+```yml
+provider:
+  cloudFront:
+    cachePolicies:
+      # Used as a reference in function.events[].cloudfront.cachePolicy.name
+      myCachePolicy1:
+        DefaultTTL: 60
+        MinTTL: 30
+        MaxTTL: 3600
+        Comment: my brand new cloudfront cache policy # optional
+        ParametersInCacheKeyAndForwardedToOrigin:
+          CookiesConfig:
+            # Possible values are 'none', 'whitelist', 'allExcept' and 'all'
+            CookieBehavior: whitelist
+            Cookies:
+              - my-public-cookie
+          EnableAcceptEncodingBrotli: true # optional
+          EnableAcceptEncodingGzip: true
+          HeadersConfig:
+            # Possible values are 'none' and 'whitelist'
+            HeaderBehavior: whitelist
+            Headers:
+              - authorization
+              - content-type
+          QueryStringsConfig:
+            # Possible values are 'none', 'whitelist', 'allExcept' and 'all'
+            QueryStringBehavior: allExcept
+            QueryStrings:
+              - not-cached-query-string
+```
+
+### IAM permissions
+
+Configure IAM roles and permissions applied to Lambda functions ([complete documentation](./iam.md)):
+
+```yml
+provider:
   iam:
-    # Overwrite the default IAM role which is used for all functions
+    # Instruct Serverless to use an existing IAM role for all Lambda functions
     role: arn:aws:iam::XXXXXX:role/role
-    # .. OR configure logical role
+    # OR configure the role that will be created by Serverless (simplest):
     role:
-      name: your-custom-name-role # Optional custom name for default IAM role
-      managedPolicies: # Optional IAM Managed Policies, which allows to include the policies into IAM Role
-        - arn:aws:iam:*****:policy/some-managed-policy
-      permissionsBoundary: arn:aws:iam::XXXXXX:policy/policy # ARN of an Permissions Boundary for the role.
-      statements: # IAM role statements so that services can be accessed in the AWS account
-        - Effect: 'Allow'
+      # Add statements to the IAM role to give permissions to Lambda functions
+      statements:
+        - Effect: Allow
           Action:
             - 's3:ListBucket'
           Resource:
@@ -220,10 +453,23 @@ provider:
               - ''
               - - 'arn:aws:s3:::'
                 - Ref: ServerlessDeploymentBucket
+      # Optional custom name for default IAM role
+      name: your-custom-name-role
+      # Optional custom path for default IAM role
+      path: /your-custom-path/
+      # Optional IAM Managed Policies to include into the IAM Role
+      managedPolicies:
+        - arn:aws:iam:*****:policy/some-managed-policy
+      # ARN of a Permissions Boundary for the role
+      permissionsBoundary: arn:aws:iam::XXXXXX:policy/policy
+      # CloudFormation tags
       tags:
         key: value
-    deploymentRole: arn:aws:iam::XXXXXX:role/role # ARN of an IAM role for CloudFormation service. If specified, CloudFormation uses the role's credentials
-  stackPolicy: # Optional CF stack policy. The example below allows updates to all resources except deleting/replacing EC2 instances (use with caution!)
+    # ARN of an IAM role for CloudFormation service. If specified, CloudFormation uses the role's credentials
+    deploymentRole: arn:aws:iam::XXXXXX:role/role
+  # Optional CF stack policy to restrict which resources can be updated/deleted on deployment
+  # The example below allows updating all resources in the service except deleting/replacing EC2 instances (use with caution!)
+  stackPolicy:
     - Effect: Allow
       Principal: '*'
       Action: 'Update:*'
@@ -238,167 +484,342 @@ provider:
         StringEquals:
           ResourceType:
             - AWS::EC2::Instance
-  vpc: # Optional VPC. But if you use VPC then both subproperties (securityGroupIds and subnetIds) are required
+```
+
+### VPC
+
+Configure the Lambda functions to run inside a VPC ([complete documentation](./functions.md#vpc-configuration)):
+
+```yml
+provider:
+  # Optional VPC settings
+  # If you use VPC then both securityGroupIds and subnetIds are required
+  vpc:
     securityGroupIds:
       - securityGroupId1
       - securityGroupId2
     subnetIds:
       - subnetId1
       - subnetId2
-  notificationArns: # List of existing Amazon SNS topics in the same region where notifications about stack events are sent.
-    - 'arn:aws:sns:us-east-1:XXXXXX:mytopic'
-  stackParameters:
-    - ParameterKey: 'Keyname'
-      ParameterValue: 'Value'
-  rollbackConfiguration:
-    MonitoringTimeInMinutes: 20
-    RollbackTriggers:
-      - Arn: arn:aws:cloudwatch:us-east-1:000000000000:alarm:health
-        Type: AWS::CloudWatch::Alarm
-      - Arn: arn:aws:cloudwatch:us-east-1:000000000000:alarm:latency
-        Type: AWS::CloudWatch::Alarm
-  tags: # Optional service wide function tags
-    foo: bar
-    baz: qux
-  tracing:
-    apiGateway: true # Can only be true if API Gateway is inside a stack.
-    lambda: true # Optional, can be true (true equals 'Active'), 'Active' or 'PassThrough'
+```
+
+### Logs
+
+Configure logs for the deployed resources:
+
+```yml
+provider:
   logs:
-    restApi: # Optional configuration which specifies if API Gateway logs are used. This can either be set to `true` to use defaults, or configured via subproperties. Can only be configured if API Gateway is inside a stack.
-      accessLogging: true # Optional configuration which enables or disables access logging. Defaults to true.
-      format: 'requestId: $context.requestId' # Optional configuration which specifies the log format to use for access logging.
-      executionLogging: true # Optional configuration which enables or disables execution logging. Defaults to true.
-      level: INFO # Optional configuration which specifies the log level to use for execution logging. May be set to either INFO or ERROR.
-      fullExecutionData: true # Optional configuration which specifies whether or not to log full requests/responses for execution logging. Defaults to true.
-      role: arn:aws:iam::123456:role # Existing IAM role for ApiGateway to use when managing CloudWatch Logs. If 'role' is not configured, a new role is automatically created.
-      roleManagedExternally: false # Specifies whether the ApiGateway CloudWatch Logs role setting is not managed by Serverless. Defaults to false.
-    websocket: # Optional configuration which specifies if Websocket logs are used. This can either be set to `true` to use defaults, or configured via subproperties.
-      level: INFO # Optional configuration which specifies the log level to use for execution logging. May be set to either INFO or ERROR.
-    httpApi: # Optional configuration which specifies if HTTP API logs are used. This can either be set to `true` (to use defaults as below) or specific log format configuration can be provided
+    # Enable HTTP API logs
+    # This can either be set to `httpApi: true` to use defaults, or configured via subproperties
+    # Can only be configured if the API is created by Serverless Framework
+    httpApi:
       format: '{ "requestId":"$context.requestId", "ip": "$context.identity.sourceIp", "requestTime":"$context.requestTime", "httpMethod":"$context.httpMethod","routeKey":"$context.routeKey", "status":"$context.status","protocol":"$context.protocol", "responseLength":"$context.responseLength" }'
 
-    frameworkLambda: true # Optional, whether to write CloudWatch logs for custom resource lambdas as added by the framework
+    # Enable REST API logs
+    # This can either be set to `restApi: true` to use defaults, or configured via subproperties
+    # Can only be configured if the API is created by Serverless Framework
+    restApi:
+      # Enables HTTP access logs (default: true)
+      accessLogging: true
+      # Log format to use for access logs
+      format: 'requestId: $context.requestId'
+      # Enable execution logging (default: true)
+      executionLogging: true
+      # Log level to use for execution logging: INFO or ERROR
+      level: INFO
+      # Log full requests/responses for execution logging (default: true)
+      fullExecutionData: true
+      # Existing IAM role to use for API Gateway when writing CloudWatch Logs (default: automatically created)
+      role: arn:aws:iam::123456:role
+      # Whether the API Gateway CloudWatch Logs role setting is not managed by Serverless (default: false)
+      roleManagedExternally: false
+
+    # Enable Websocket API logs
+    # This can either be set to `websocket: true` to use defaults, or configured via subproperties.
+    websocket:
+      # Log level to use for execution logging: INFO or ERROR.
+      level: INFO
+
+    # Optional, whether to write CloudWatch logs for custom resource lambdas as added by the framework
+    frameworkLambda: true
+```
+
+### S3 buckets
+
+Configure the S3 buckets created for [S3 Lambda events](../events/s3.md):
+
+```yml
+provider:
+  # If you need to configure the bucket itself, you'll need to add s3 resources to the provider configuration
+  s3:
+    # Eventual additional properties in camel case
+    bucketOne:
+      # Supported properties are the same ones as supported by CF resource for S3 bucket
+      # See https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket.html
+      name: my-custom-bucket-name
+      versioningConfiguration:
+        Status: Enabled
+```
+
+## Package
 
-package: # Optional deployment packaging configuration
-  patterns: # Specify the directories and files which should be included in the deployment package
+The `serverless package` or `serverless deploy` commands [package the code of all functions into zip files](./packaging.md).
+These zip files are then used for deployments.
+
+```yml
+# serverless.yml
+
+# Optional deployment packaging configuration
+package:
+  # Directories and files to include in the deployed package
+  patterns:
     - src/**
     - handler.js
     - '!.git/**'
     - '!.travis.yml'
-  excludeDevDependencies: false # Config if Serverless should automatically exclude dev dependencies in the deployment package. Defaults to true
-  artifact: path/to/my-artifact.zip # Own package that should be used. You must provide this file.
-  individually: true # Enables individual packaging for each function. If true you must provide package for each function. Defaults to false
+  # Package each function as an individual artifact (default: false)
+  individually: true
+  # Explicitly set the package artifact to deploy (overrides native packaging behavior)
+  artifact: path/to/my-artifact.zip
+  # Automatically exclude NPM dev dependencies from the deployed package (default: true)
+  excludeDevDependencies: false
+```
+
+## Functions
+
+Configure the Lambda functions to deploy ([complete documentation](./functions.md)):
+
+```yml
+# serverless.yml
 
 functions:
-  usersCreate: # A Function
-    handler: users.create # The file and module for this specific function. Cannot be used when `image` is defined.
-    image: baseimage # Image to be used by function, cannot be used when `handler` is defined. It can be configured as concrete uri of Docker image in ECR or as a reference to image defined in `provider.ecr.images`
-    name: ${sls:stage}-lambdaName # optional, Deployed Lambda name
-    description: My function # The description of your function.
-    memorySize: 512 # memorySize for this specific function.
-    reservedConcurrency: 5 # optional, reserved concurrency limit for this function. By default, AWS uses account concurrency limit
-    provisionedConcurrency: 3 # optional, Count of provisioned lambda instances
-    runtime: nodejs12.x # Runtime for this specific function. Overrides the default which is set on the provider level
-    timeout: 10 # Timeout for this specific function.  Overrides the default set above.
-    role: arn:aws:iam::XXXXXX:role/role # IAM role which will be used for this function
-    onError: arn:aws:sns:us-east-1:XXXXXX:sns-topic # Optional SNS topic / SQS arn (Ref, Fn::GetAtt and Fn::ImportValue are supported as well) which will be used for the DeadLetterConfig
-    kmsKeyArn: arn:aws:kms:us-east-1:XXXXXX:key/some-hash # Optional KMS key arn which will be used for encryption (overwrites the one defined on the provider level)
-    disableLogs: false # Disables creation of CloudWatch Log Group
-    environment: # Function level environment variables
-      functionEnvVar: 12345678
+  # A function
+  hello:
+    # The file and module for this specific function. Cannot be used with 'image'.
+    handler: users.create
+    # Container image to use. Cannot be used with 'handler'.
+    # Can be the URI of an image in ECR, or the name of an image defined in 'provider.ecr.images'
+    image: baseimage
+    runtime: nodejs14.x
+    # Memory size (default: 1024MB)
+    memorySize: 512
+    # Timeout (default: 6 seconds)
+    # Note: API Gateway has a maximum timeout of 30 seconds
+    timeout: 10
+    # Function environment variables
+    environment:
+      APP_ENV_VARIABLE: FOOBAR
+    # Override the Lambda function name
+    name: ${sls:stage}-lambdaName
+    description: My function
+    # Processor architecture: 'x86_64' or 'arm64' via Graviton2 (default: x86_64)
+    architecture: x86_64
+    # Reserve a maximum number of concurrent instances (default: account limit)
+    reservedConcurrency: 5
+    # Provision a minimum number of concurrent instances (default: 0)
+    provisionedConcurrency: 3
+    # Override the IAM role to use for this function
+    role: arn:aws:iam::XXXXXX:role/role
+    # SNS topic or SQS ARN to use for the DeadLetterConfig (failed executions)
+    onError: arn:aws:sns:us-east-1:XXXXXX:sns-topic
+    # KMS key ARN to use for encryption for this function
+    kmsKeyArn: arn:aws:kms:us-east-1:XXXXXX:key/some-hash
+    # Disable the creation of the CloudWatch log group
+    disableLogs: false
     tags: # Function specific tags
       foo: bar
-    vpc: # Optional VPC. But if you use VPC then both subproperties (securityGroupIds and subnetIds) are required
+    # VPC settings for this function
+    # If you use VPC then both subproperties (securityGroupIds and subnetIds) are required
+    # Can be set to '~' to disable the use of a VPC
+    vpc:
       securityGroupIds:
         - securityGroupId1
         - securityGroupId2
       subnetIds:
         - subnetId1
         - subnetId2
+    # Packaging rules specific to this function
     package:
-      patterns: # Specify the directories and files which should be included in the deployment package for this specific function.
+      # Directories and files to include in the deployed package
+      patterns:
         - src/**
         - handler.js
         - '!.git/**'
         - '!.travis.yml'
-      artifact: path/to/my-artifact.zip # Own package that should be use for this specific function. You must provide this file.
-      individually: true # Enables individual packaging for specific function. If true you must provide package for each function. Defaults to false
-    layers: # An optional list Lambda Layers to use
-      - arn:aws:lambda:region:XXXXXX:layer:LayerName:Y # Layer Version ARN
-    tracing: Active # optional, can be 'Active' or 'PassThrough' (overwrites the one defined on the provider level)
-    condition: SomeCondition # optional, adds 'Condition' clause
-    dependsOn: # optional, appends these additional resources to the 'DependsOn' list
+      # Explicitly set the package artifact to deploy (overrides native packaging behavior)
+      artifact: path/to/my-artifact.zip
+      # Package this function as an individual artifact (default: false)
+      individually: true
+    # ARN of Lambda layers to use
+    layers:
+      - arn:aws:lambda:region:XXXXXX:layer:LayerName:Y
+    # Overrides the provider setting. Can be 'Active' or 'PassThrough'
+    tracing: Active
+    # Conditionally deploy the function
+    condition: SomeCondition
+    # CloudFormation 'DependsOn' option
+    dependsOn:
       - MyThing
       - MyOtherThing
-    destinations: # optional, destinations for async invocations
-      onSuccess: functionName # function name or ARN of a target (externally managed lambda, EventBridge event bus, SQS queue or SNS topic)
-      onFailure: xxx:xxx:target # function name or ARN of a target (externally managed lambda, EventBridge event bus, SQS queue or SNS topic)
+    # Lambda destination settings
+    destinations:
+      # Function name or ARN of target (EventBridge/SQS/SNS topic)
+      onSuccess: functionName
+      # Function name or ARN of target (EventBridge/SQS/SNS topic)
+      onFailure: xxx:xxx:target
+    # Mount an EFS filesystem
     fileSystemConfig:
-      arn: arn:aws:elasticfilesystem:us-east-1:111111111111:access-point/fsap-a1a1a1a1a1a1a1a1a # ARN of EFS Access Point
-      localMountPath: /mnt/example # path under which EFS will be mounted and accessible by Lambda function
-    events: # The Events that trigger this Function
-      - http: # This creates an API Gateway HTTP endpoint which can be used to trigger this function.  Learn more in "events/apigateway"
-          path: users/create # Path for this endpoint
-          method: get # HTTP method for this endpoint
-          cors: true # Turn on CORS for this endpoint, but don't forget to return the right header in your response
-          private: true # Requires clients to add API keys values in the `x-api-key` header of their request
-          authorizer: # An AWS API Gateway custom authorizer function
-            name: authorizerFunc # The name of the authorizer function (must be in this service)
-            arn: xxx:xxx:Lambda-Name # Can be used instead of name to reference a function outside of service
+      # ARN of EFS Access Point
+      arn: arn:aws:elasticfilesystem:us-east-1:11111111:access-point/fsap-a1a1a1
+      # Path under which EFS will be mounted and accessible in Lambda
+      localMountPath: /mnt/example
+```
+
+## Lambda events
+
+Reference of [Lambda events](./events.md) that trigger functions:
+
+### API Gateway v2 HTTP API
+
+[API Gateway v2 HTTP API events](../events/http-api.md):
+
+```yaml
+functions:
+  hello:
+    # ...
+    events:
+      # HTTP API endpoint (API Gateway v2)
+      - httpApi:
+          method: GET
+          path: /some-get-path/{param}
+          authorizer: # Optional
+            # Name of an authorizer defined in 'provider.httpApi.authorizers'
+            name: someJwtAuthorizer
+            scopes: # Optional
+              - user.id
+              - user.email
+```
+
+### API Gateway v1 REST API
+
+[API Gateway v1 REST API events](../events/apigateway.md):
+
+```yaml
+functions:
+  hello:
+    # ...
+    events:
+      # REST API endpoint (API Gateway v1)
+      - http:
+          # Path for this endpoint
+          path: users/create
+          # HTTP method for this endpoint
+          method: get
+          # Enable CORS. Don't forget to return the right header in your response
+          cors: true
+          # Requires clients to add API keys values in the `x-api-key` header of their request
+          private: true
+          # An AWS API Gateway custom authorizer function
+          authorizer:
+            # Name of the authorizer function (must be in this service)
+            name: authorizerFunc
+            # Can be used instead of a name to reference a function outside of service
+            arn: xxx:xxx:Lambda-Name
             resultTtlInSeconds: 0
             identitySource: method.request.header.Authorization
             identityValidationExpression: someRegex
-            type: token # token or request. Determines input to the authorizer function, called with the auth token or the entire request event. Defaults to token
-          request: # configure method request and integration request settings
-            uri: http://url/{paramName} # Define http endpoint URL and map path parameters for HTTP and HTTP_PROXY requests
-            parameters: # Optional request parameter configuration
+            # Input of the authorizer function: auth token ('token') or the entire request event ('request') (default: token)
+            type: token
+          # Configure method request and integration request settings
+          request:
+            # HTTP endpoint URL and map path parameters for HTTP and HTTP_PROXY requests
+            uri: http://url/{paramName}
+            # Optional request parameter configuration
+            parameters:
               paths:
                 paramName: true # mark path parameter as required
               headers:
-                headerName: true # mark header required
-                custom-header: # Optional add a new header to the request
+                headerName: true # mark header as required
+                custom-header:
                   required: true
-                  mappedValue: context.requestId # map the header to a static value or integration request variable
+                  # Map the header to a static value or integration request variable
+                  mappedValue: context.requestId
               querystrings:
                 paramName: true # mark query string
-            schema: # Optional request schema validation; mapped by content type
-              application/json: ${file(create_request.json)} # define the valid JSON Schema for a content-type
-            template: # Optional custom request mapping templates that overwrite default templates
+            # Request schema validation mapped by content type
+            schema:
+              # Define the valid JSON Schema for this content-type
+              application/json: ${file(create_request.json)}
+              application/json+abc:
+                # Name of the API Gateway model
+                name: ModelName
+                description: 'Some description'
+                schema: ${file(model_schema.json)}
+            # Custom request mapping templates that overwrite default templates
+            template:
               application/json: '{ "httpMethod" : "$context.httpMethod" }'
-            passThrough: NEVER # Optional define pass through behavior when content-type does not match any of the specified mapping templates
-            schemas: # Optional request schema validation, mapped by content type
-              application/json:
-                name: ModelName  # Optional: Name of the API Gateway model
-                description: "Some description" # Optional: Description of the API Gateway model
-                schema: ${file(model_schema.json)} # Schema for selected content type
-      - httpApi: # HTTP API endpoint
-          method: GET
-          path: /some-get-path/{param}
-          authorizer: # Optional
-            name: someJwtAuthorizer # References by name authorizer defined in provider.httpApi.authorizers section
-            scopes: # Optional
-              - user.id
-              - user.email
+            # Optional define pass through behavior when content-type does not match any of the specified mapping templates
+            passThrough: NEVER
+```
+
+### Websocket API
+
+[API Gateway websocket events](../events/websocket.md):
+
+```yaml
+functions:
+  hello:
+    # ...
+    events:
       - websocket:
           route: $connect
-          routeResponseSelectionExpression: $default # optional, setting this enables callbacks on websocket requests for two-way communication
+          # Optional, setting this enables callbacks on websocket requests for two-way communication
+          routeResponseSelectionExpression: $default
           authorizer:
-            # name: auth    NOTE: you can either use "name" or arn" properties
+            # Use either "name" or arn" properties
+            name: auth
             arn: arn:aws:lambda:us-east-1:1234567890:function:auth
             identitySource:
               - 'route.request.header.Auth'
               - 'route.request.querystring.Auth'
+```
+
+### S3
+
+[S3 events](../events/s3.md):
+
+```yaml
+functions:
+  hello:
+    # ...
+    events:
       - s3:
           bucket: photos
           event: s3:ObjectCreated:*
           rules:
             - prefix: uploads/
             - suffix: .jpg
-          existing: true # optional, if you're using an existing Bucket
+          # Set to 'true' when using an existing bucket
+          # Else the bucket will be automatically created
+          existing: true
+```
+
+### Schedule
+
+[Schedule events](../events/schedule.md):
+
+```yaml
+functions:
+  hello:
+    # ...
+    events:
       - schedule:
           name: my scheduled event
           description: a description of my scheduled event's purpose
+          # Can also be an array of rate/cron expressions
           rate: rate(10 minutes)
+          # (default: true)
           enabled: false
           # Note, you can use only one of input, inputPath, or inputTransformer
           input:
@@ -411,6 +832,17 @@ functions:
             inputPathsMap:
               eventTime: '$.time'
             inputTemplate: '{"time": <eventTime>, "key1": "value1"}'
+```
+
+### SNS
+
+[SNS events](../events/sns.md):
+
+```yaml
+functions:
+  hello:
+    # ...
+    events:
       - sns:
           topicName: aggregate
           displayName: Data aggregation pipeline
@@ -419,44 +851,210 @@ functions:
               - dog
               - cat
           redrivePolicy:
-              # (1) ARN
-              deadLetterTargetArn: arn:aws:sqs:us-east-1:11111111111:myDLQ
-              # (2) Ref (resource defined in same CF stack)
-              deadLetterTargetRef: myDLQ
-              # (3) Import (resource defined in outer CF stack)
-              deadLetterTargetImport:
-                arn: MyShared-DLQArn
-                url: MyShared-DLQUrl
+            # (1) ARN
+            deadLetterTargetArn: arn:aws:sqs:us-east-1:11111111111:myDLQ
+            # (2) Ref (resource defined in same CF stack)
+            deadLetterTargetRef: myDLQ
+            # (3) Import (resource defined in outer CF stack)
+            deadLetterTargetImport:
+              arn: MyShared-DLQArn
+              url: MyShared-DLQUrl
+```
+
+### SQS
+
+[SQS events](../events/sqs.md):
+
+```yaml
+functions:
+  hello:
+    # ...
+    events:
       - sqs:
           arn: arn:aws:sqs:region:XXXXXX:myQueue
+          # Optional
           batchSize: 10
-          maximumBatchingWindow: 10 # optional, minimum is 0 and the maximum is 300 (seconds)
-          enabled: true
+          # Optional, minimum is 0 and the maximum is 300 (seconds)
+          maximumBatchingWindow: 10
+          # (default: true)
+          enabled: false
+          functionResponseType: ReportBatchItemFailures
+          filterPatterns:
+            - a: [1, 2]
+```
+
+### Streams
+
+[Stream events](../events/streams.md):
+
+```yaml
+functions:
+  hello:
+    # ...
+    events:
       - stream:
           arn: arn:aws:kinesis:region:XXXXXX:stream/foo
           batchSize: 100
           maximumRecordAgeInSeconds: 120
           startingPosition: LATEST
-          enabled: true
+          # (default: true)
+          enabled: false
           functionResponseType: ReportBatchItemFailures
+          filterPatterns:
+            - partitionKey: [1]
+```
+
+### MSK
+
+[MSK events](../events/msk.md):
+
+```yaml
+functions:
+  hello:
+    # ...
+    events:
       - msk:
-          arn: arn:aws:kafka:us-east-1:111111111111:cluster/ClusterName/a1a1a1a1a1a1a1a1a # ARN of MSK Cluster
-          topic: kafkaTopic # name of Kafka topic to consume from
-          batchSize: 100 # optional, must be in 1-10000 range
-          startingPosition: LATEST # optional, can be set to LATEST or TRIM_HORIZON
-          enabled: true # optional, true by default, can be used to disable event without deleting resource
+          # ARN of MSK Cluster
+          arn: arn:aws:kafka:us-east-1:111111111:cluster/ClusterName/a1a1a1a1a
+          # name of Kafka topic to consume from
+          topic: kafkaTopic
+          # Optional, must be in 1-10000 range
+          batchSize: 100
+          # Optional, must be in 0-300 range (seconds)
+          maximumBatchingWindow: 30
+          # Optional, can be set to LATEST or TRIM_HORIZON
+          startingPosition: LATEST
+          # (default: true)
+          enabled: false
+```
+
+### ActiveMQ
+
+[ActiveMQ events](../events/activemq.md):
+
+```yaml
+functions:
+  hello:
+    # ...
+    events:
+      - activemq:
+          # ARN of ActiveMQ Broker
+          arn: arn:aws:mq:us-east-1:0000:broker:ExampleMQBroker:b-xxx-xxx
+          # Name of ActiveMQ queue consume from
+          queue: queue-name
+          # Secrets Manager ARN for basic auth credentials
+          basicAuthArn: arn:aws:secretsmanager:us-east-1:01234567890:secret:MySecret
+          # Optional, must be in 1-10000 range
+          batchSize: 100
+          # Optional, must be in 0-300 range (seconds)
+          maximumBatchingWindow: 30
+          # Optional, can be set to LATEST or TRIM_HORIZON
+          startingPosition: LATEST
+          # (default: true)
+          enabled: false
+```
+
+### Kafka
+
+[Kakfa events](../events/kafka.md):
+
+```yaml
+functions:
+  hello:
+    # ...
+    events:
+      - kafka:
+          # See main kafka documentation for various access configuration settings
+          accessConfigurations:
+            # ...
+          # An array of bootstrap server addresses
+          bootstrapServers:
+            - abc3.xyz.com:9092
+            - abc2.xyz.com:9092
+          # name of Kafka topic to consume from
+          topic: MySelfManagedKafkaTopic
+          # Optional, must be in 1-10000 range
+          batchSize: 100
+          # Optional, must be in 0-300 range (seconds)
+          maximumBatchingWindow: 30
+          # Optional, can be set to LATEST or TRIM_HORIZON
+          startingPosition: LATEST
+          # (default: true)
+          enabled: false
+```
+
+### RabbitMQ
+
+[RabbitMQ events](../events/rabbitmq.md):
+
+```yaml
+functions:
+  hello:
+    # ...
+    events:
+      - rabbitmq:
+          # ARN of RabbitMQ Broker
+          arn: arn:aws:mq:us-east-1:0000:broker:ExampleMQBroker:b-xxx-xxx
+          # Name of RabbitMQ queue consume from
+          queue: queue-name
+          # Secrets Manager ARN for basic auth credentials
+          basicAuthArn: arn:aws:secretsmanager:us-east-1:01234567890:secret:MySecret
+          # Optional, must be in 1-10000 range
+          batchSize: 100
+          # Optional, must be in 0-300 range (seconds)
+          maximumBatchingWindow: 30
+          # Optional, can be set to LATEST or TRIM_HORIZON
+          startingPosition: LATEST
+          # (default: true)
+          enabled: false
+```
+
+### Alexa
+
+[Alexa Skill events](../events/alexa-skill.md) and [Alexa Smart Home events](../events/alexa-smart-home.md):
+
+```yaml
+functions:
+  hello:
+    # ...
+    events:
       - alexaSkill:
           appId: amzn1.ask.skill.xx-xx-xx-xx
-          enabled: true
+          # (default: true)
+          enabled: false
       - alexaSmartHome:
           appId: amzn1.ask.skill.xx-xx-xx-xx
-          enabled: true
+          # (default: true)
+          enabled: false
+```
+
+### IOT
+
+[IoT events](../events/iot.md):
+
+```yaml
+functions:
+  hello:
+    # ...
+    events:
       - iot:
           name: myIoTEvent
           description: An IoT event
-          enabled: true
           sql: "SELECT * FROM 'some_topic'"
           sqlVersion: beta
+          # (default: true)
+          enabled: false
+```
+
+### CloudWatch
+
+[CloudWatch events](../events/cloudwatch-event.md) and [CloudWatch logs events](../events/cloudwatch-log.md):
+
+```yaml
+functions:
+  hello:
+    # ...
+    events:
       - cloudwatchEvent:
           event:
             source:
@@ -480,18 +1078,44 @@ functions:
       - cloudwatchLog:
           logGroup: '/aws/lambda/hello'
           filter: '{$.userIdentity.type = Root}'
+```
+
+### Cognito
+
+[Cognito User Pool events](../events/cognito-user-pool.md):
+
+```yaml
+functions:
+  hello:
+    # ...
+    events:
       - cognitoUserPool:
           pool: MyUserPool
           trigger: PreSignUp
-          existing: true # optional, if you're referencing an existing User Pool
+          # Optional, if you're referencing an existing User Pool
+          existing: true
+          # Optional, for forcing deployment of triggers on existing User Pools
+          forceDeploy: true
+```
+
+### ALB
+
+[Application Load Balancer events](../events/alb.md):
+
+```yaml
+functions:
+  hello:
+    # ...
+    events:
       - alb:
-          listenerArn: arn:aws:elasticloadbalancing:us-east-1:12345:listener/app/my-load-balancer/50dc6c495c0c9188/
+          listenerArn: arn:aws:elasticloadbalancing:us-east-1:12345:listener/app/my-load-balancer/50dcc0c9188/
           priority: 1
           targetGroupName: helloTargetGroup # optional
           conditions:
             host: example.com
             path: /hello
-          healthCheck: # optional, can also be set using a boolean value
+          # Optional, can also be set using a boolean value
+          healthCheck:
             path: / # optional
             intervalSeconds: 35 # optional
             timeoutSeconds: 30 # optional
@@ -499,15 +1123,28 @@ functions:
             unhealthyThresholdCount: 5 # optional
             matcher: # optional
               httpCode: '200'
+```
+
+### EventBridge
+
+[EventBridge events](../events/event-bridge.md):
+
+```yaml
+functions:
+  hello:
+    # ...
+    events:
+      # Use the default AWS event bus
       - eventBridge:
-          # using the default AWS event bus
           schedule: rate(10 minutes)
-          # creating an event bus
+      # Create a custom event bus
+      - eventBridge:
           eventBus: custom-saas-events
           pattern:
             source:
               - saas.external
-          # re-using an existing event bus
+      # Re-use an existing event bus
+      - eventBridge:
           eventBus: arn:aws:events:us-east-1:12345:event-bus/custom-private-events
           pattern:
             source:
@@ -516,7 +1153,8 @@ functions:
             inputPathsMap:
               eventTime: '$.time'
             inputTemplate: '{"time": <eventTime>, "key1": "value1"}'
-          # using `inputs`
+      # Using 'inputs'
+      - eventBridge:
           pattern:
             source:
               - 'aws.ec2'
@@ -530,7 +1168,8 @@ functions:
             key2: value2
             stageParams:
               stage: dev
-          # using `inputPath`
+      # Using 'inputPath'
+      - eventBridge:
           pattern:
             source:
               - 'aws.ec2'
@@ -540,7 +1179,8 @@ functions:
               state:
                 - pending
           inputPath: '$.stageVariables'
-          # using `inputTransformer`
+      # Using 'inputTransformer'
+      - eventBridge:
           pattern:
             source:
               - 'aws.ec2'
@@ -553,33 +1193,78 @@ functions:
             inputPathsMap:
               eventTime: '$.time'
             inputTemplate: '{"time": <eventTime>, "key1": "value1"}'
+          retryPolicy:
+            maximumEventAge: 3600
+            maximumRetryAttempts: 3
+          deadLetterQueueArn: !GetAtt QueueName.Arn
+```
+
+### CloudFront
+
+[CloudFront Lambda@Edge events](../events/cloudfront.md):
+
+```yaml
+functions:
+  hello:
+    # ...
+    events:
       - cloudFront:
           eventType: viewer-response
           includeBody: true
           pathPattern: /docs*
           cachePolicy:
-            # Note, you can use only one of name or id
-            name: myCachePolicy1 # Refers to a Cache Policy defined in provider.cloudFront.cachePolicies
-            id: 658327ea-f89d-4fab-a63d-7e88639e58f6 # Refers to any external Cache Policy id
+            # Use either name or id
+            # Refers to a Cache Policy defined in 'provider.cloudFront.cachePolicies'
+            name: myCachePolicy1
+            # Refers to any external Cache Policy ID
+            id: 658327ea-f89d-4fab-a63d-7e88639e58f6
           origin:
             DomainName: serverless.com
             OriginPath: /framework
             CustomOriginConfig:
               OriginProtocolPolicy: match-viewer
+```
+
+## Function layers
+
+Deploy [Lambda function layers](./layers.md):
+
+```yml
+# serverless.yml
 
 layers:
-  hello: # A Lambda layer
-    path: layer-dir # required, path to layer contents on disk
-    name: ${sls:stage}-layerName # optional, Deployed Lambda layer name
-    description: Description of what the lambda layer does # optional, Description to publish to AWS
-    compatibleRuntimes: # optional, a list of runtimes this layer is compatible with
+  # A Lambda layer
+  hello:
+    # required, path to layer contents on disk
+    path: layer-dir
+    # optional, Deployed Lambda layer name
+    name: ${sls:stage}-layerName
+    # optional, Description to publish to AWS
+    description: Description of what the lambda layer does
+    # optional, a list of runtimes this layer is compatible with
+    compatibleRuntimes:
       - python3.8
-    licenseInfo: GPLv3 # optional, a string specifying license information
-    allowedAccounts: # optional, a list of AWS account IDs allowed to access this layer.
+    # optional, a list of architectures this layer is compatible with
+    compatibleArchitectures:
+      - x86_64
+      - arm64
+    # optional, a string specifying license information
+    licenseInfo: GPLv3
+    # optional, a list of AWS account IDs allowed to access this layer.
+    allowedAccounts:
       - '*'
-    retain: false # optional, false by default. If true, layer versions are not deleted as new ones are created
+    # optional, false by default. If true, layer versions are not deleted as new ones are created
+    retain: false
+```
+
+## AWS Resources
+
+[Customize the CloudFormation template](./services.md#serverlessyml), for example to deploy extra CloudFormation resource:
 
-# The "Resources" your "Functions" use.  Raw AWS CloudFormation goes in here.
+```yml
+# serverless.yml
+
+# Insert raw CloudFormation (resources, outputs…) in the deployed template
 resources:
   Resources:
     usersTable:
@@ -595,6 +1280,7 @@ resources:
         ProvisionedThroughput:
           ReadCapacityUnits: 1
           WriteCapacityUnits: 1
+
   extensions:
     # override Properties or other attributes of Framework-created resources.
     # See https://serverless.com/framework/docs/providers/aws/guide/resources#override-aws-cloudformation-resource for more details
@@ -606,8 +1292,9 @@ resources:
   Outputs:
     UsersTableArn:
       Description: The ARN for the User's Table
-      Value:
-        'Fn::GetAtt': [usersTable, Arn]
+      Value: !GetAtt usersTable.Arn
       Export:
-        Name: ${self:service}:${opt:stage}:UsersTableArn # see Fn::ImportValue to use in other services and http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/outputs-section-structure.html for documentation on use.
+        # see Fn::ImportValue to use in other services
+        # and http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/outputs-section-structure.html for documentation on use.
+        Name: ${self:service}:${sls:stage}:UsersTableArn
 ```
diff --git a/docs/providers/aws/guide/services.md b/docs/providers/aws/guide/services.md
index 3e243ae4d03..4bce2d54b4d 100644
--- a/docs/providers/aws/guide/services.md
+++ b/docs/providers/aws/guide/services.md
@@ -24,18 +24,22 @@ In the beginning of an application, many people use a single Service to define a
 
 ```bash
 myService/
-  serverless.yml  # Contains all functions and infrastructure resources
+  # Contains all functions and infrastructure resources
+  serverless.yml
 ```
 
 However, as your application grows, you can break it out into multiple services. A lot of people organize their services by workflows or data models, and group the functions related to those workflows and data models together in the service.
 
 ```bash
 users/
-  serverless.yml # Contains 4 functions that do Users CRUD operations and the Users database
+  # Contains 4 functions that do Users CRUD operations and the Users database
+  serverless.yml
 posts/
-  serverless.yml # Contains 4 functions that do Posts CRUD operations and the Posts database
+  # Contains 4 functions that do Posts CRUD operations and the Posts database
+  serverless.yml
 comments/
-  serverless.yml # Contains 4 functions that do Comments CRUD operations and the Comments database
+  # Contains 4 functions that do Comments CRUD operations and the Comments database
+  serverless.yml
 ```
 
 This makes sense since related functions usually use common infrastructure resources, and you want to keep those functions and resources together as a single unit of deployment, for better organization and separation of concerns.
@@ -141,11 +145,11 @@ functions:
   usersCreate: # A Function
     handler: users.create
     events: # The Events that trigger this Function
-      - http: post users/create
+      - httpApi: 'POST /users/create'
   usersDelete: # A Function
     handler: users.delete
     events: # The Events that trigger this Function
-      - http: delete users/delete
+      - httpApi: 'DELETE /users/delete'
 
 # The "Resources" your "Functions" use.  Raw AWS CloudFormation goes in here.
 resources:
diff --git a/docs/providers/aws/guide/variables.md b/docs/providers/aws/guide/variables.md
index 60e6b2afd6a..012c370fc4f 100644
--- a/docs/providers/aws/guide/variables.md
+++ b/docs/providers/aws/guide/variables.md
@@ -18,9 +18,6 @@ Variables allow users to dynamically replace config values in `serverless.yml` c
 
 They are especially useful when providing secrets for your service to use and when you are working with multiple stages.
 
-If `unresolvedVariablesNotificationMode` is set to `error`, references to variables that cannot be resolved will result in an error being thrown.
-This will become the default behaviour in the next major version.
-
 ## Syntax
 
 To use variables, you will need to reference values enclosed in `${}` brackets.
@@ -38,20 +35,19 @@ You can define your own variable syntax (regex) if it conflicts with CloudFormat
 
 ## Current variable sources:
 
+- [Other properties defined in `serverless.yml`](#reference-properties-in-serverlessyml)
 - [Serverless Core variables](#referencing-serverless-core-variables)
 - [Environment variables](#referencing-environment-variables)
+- [Parameters](#referencing-parameters)
 - [CLI options](#referencing-cli-options)
-- [Other properties defined in `serverless.yml`](#reference-properties-in-serverlessyml)
-- [External YAML/JSON files](#reference-variables-in-other-files)
+- [External YAML/JSON files](#reference-properties-in-other-files)
 - [Variables from S3](#referencing-s3-objects)
 - [Variables from AWS SSM Parameter Store](#reference-variables-using-the-ssm-parameter-store)
 - [Variables from AWS Secrets Manager](#reference-variables-using-aws-secrets-manager)
 - [CloudFormation stack outputs](#reference-cloudformation-outputs)
 - [Properties exported from Javascript files (sync or async)](#reference-variables-in-javascript-files)
-- [Pseudo Parameters Reference](#pseudo-parameters-reference)
 - [Read String Variable Values as Boolean Values](#read-string-variable-values-as-boolean-values)
-
-## Casting string variables to boolean values
+- [Pseudo Parameters Reference](#aws-cloudformation-pseudo-parameters-and-intrinsic-functions)
 
 ## Recursively reference properties
 
@@ -160,9 +156,23 @@ functions:
 
 In the above example you're dynamically adding a prefix to the function names by referencing the `FUNC_PREFIX` env var. So you can easily change that prefix for all functions by changing the `FUNC_PREFIX` env var.
 
+## Referencing Parameters
+
+Parameters can be defined in `serverless.yml` under the `params` key, or in [Serverless Dashboard](https://www.serverless.com/secrets).
+
+To reference parameters, use the `${param:XXX}` syntax in `serverless.yml`.
+
+```yaml
+provider:
+  environment:
+    APP_DOMAIN: ${param:domain}
+```
+
+Read all about parameters in the [Parameters documentation](../../../guides/parameters.md).
+
 ## Referencing CLI Options
 
-To reference CLI options that you passed, use the `${opt:some_option}` syntax in your `serverless.yml` configuration file. It is valid to use the empty string in place of `some_option`. This looks like "`${opt:}`" and the result of declaring this in your `serverless.yml` is to embed the complete `options` object (i.e. all the command line options from your `serverless` command).
+To reference CLI options that you passed, use the `${opt:<option>}` syntax in your `serverless.yml` configuration file. It is valid to use the empty string in place of `<option>`. This looks like "`${opt:}`" and the result of declaring this in your `serverless.yml` is to embed the complete `options` object (i.e. all the command line options from your `serverless` command).
 
 ```yml
 service: new-service
@@ -301,21 +311,49 @@ functions:
     handler: handler.hello
 ```
 
-### Resolution of non plain string types
+## Referencing AWS-specific variables
+
+You can reference AWS-specific values as the source of your variables. Those values are exposed via the Serverless Variables system through the `{aws:}` variable prefix.
+
+The following variables are available:
+
+**accountId**
+
+Account ID of you AWS Account, based on the AWS Credentials that you have configured.
+
+```yml
+service: new-service
+provider:
+  name: aws
+
+functions:
+  func1:
+    name: function-1
+    handler: handler.func1
+    environment:
+      ACCOUNT_ID: ${aws:accountId}
+```
 
-New variable resolver, ensures that automatically other types as `SecureString` and `StringList` are resolved into expected forms.
+**region**
 
-For that please ensure to add `variablesResolutionMode: 20210326` to your service configuration.
+The region used by the Serverless CLI. The `${aws:region}` variable is a shortcut for `${opt:region, self:provider.region, "us-east-1"}`.
+
+### Resolution of non plain string types
+
+Other types as `SecureString` and `StringList` are automatically resolved into expected forms.
 
 #### Auto decrypting of `SecureString` type parameters.
 
 All `SecureString` type parameters are automatically decrypted, and automatically parsed if they export stringified JSON content (Note: you can turn off parsing by passing `raw` instruction into variable as: `${ssm(raw):/path/to/secureparam}`, if you need to also pass custom region, put it first as: `${ssm(eu-west-1, raw):/path/to/secureparam}`)
 
+In order to get the encrypted content, you can pass `noDecrypt` instruction into variable as: `${ssm(noDecrypt):/path/to/secureparam}` (it can be passed aside of region param as e.g.: `${ssm(eu-west-1, noDecrypt):/path/to/secureparam})`
+
+## Reference Variables using AWS Secrets Manager
+
 Variables in [AWS Secrets Manager](https://aws.amazon.com/secrets-manager/) can be referenced [using SSM](https://docs.aws.amazon.com/systems-manager/latest/userguide/integration-ps-secretsmanager.html), just use the `ssm:/aws/reference/secretsmanager/secret_ID_in_Secrets_Manager` syntax. For example:
 
 ```yml
 service: new-service
-variablesResolutionMode: 20210326
 provider: aws
 functions:
   hello:
@@ -345,7 +383,6 @@ variables will be resolved like
 
 ```yml
 service: new-service
-variablesResolutionMode: 20210326
 provider: aws
 functions:
   hello:
@@ -366,7 +403,6 @@ Same `StringList` type parameters are automatically detected and resolved to arr
 
 ```yml
 service: new-service
-variablesResolutionMode: 20210326
 provider: aws
 functions:
   hello:
@@ -376,9 +412,13 @@ custom:
   myArrayVar: ${ssm:/path/to/stringlistparam}
 ```
 
-## Reference Variables in Other Files
+## Reference Properties in Other Files
 
-You can reference variables in other YAML or JSON files. To reference variables in other YAML files use the `${file(./myFile.yml):someProperty}` syntax in your `serverless.yml` configuration file. To reference variables in other JSON files use the `${file(./myFile.json):someProperty}` syntax. It is important that the file you are referencing has the correct suffix, or file extension, for its file type (`.yml` for YAML or `.json` for JSON) in order for it to be interpreted correctly. Here's an example:
+You can reference properties in other YAML or JSON files. To reference properties in other YAML files use the `${file(./myFile.yml):someProperty}` syntax in your `serverless.yml` configuration file.
+
+To reference properties in other JSON files use the `${file(./myFile.json):someProperty}` syntax. It is important that the file you are referencing has the correct suffix, or file extension, for its file type (`.yml` for YAML or `.json` for JSON) in order for it to be interpreted correctly.
+
+Here's an example:
 
 ```yml
 # myCustomFile.yml
@@ -472,115 +512,53 @@ functions:
 
 ### Exporting a function
 
-With a new variables resolver (_which will be the only used resolver in v3 of a Framework, and which can be turned on now by setting `variablesResolutionMode: 20210326` in service config_) functions receives an object, with two properties:
+_Note: the method described below works by default in Serverless v3, but it requires the `variablesResolutionMode: 20210326` option in v2._
+
+A variable resolver function receives an object with the following properties:
 
 - `options` - An object referencing resolved CLI params as passed to the command
+- `resolveVariable(variableString)` - Async function which resolves provided variable string. String should be passed without wrapping (`${` and `}`) braces. Example valid values:
+  - `file(./config.js):SOME_VALUE`
+  - `env:SOME_ENV_VAR, null` (end with `, null`, if missing value at the variable source should be resolved with `null`, and not with a thrown error)
 - `resolveConfigurationProperty([key1, key2, ...keyN])` - Async function which resolves specific service configuration property. It returns a fully resolved value of configuration property. If circular reference is detected resolution will be rejected.
 
-Example, of how to obtain a value of AWS region that will be used by Serverless Framework:
+The resolver function can either be _sync_ or _async_. Note that both `resolveConfigurationProperty` and `resolveVariable` functions are async: if these functions are called, the resolver function must be async.
 
-```js
-// config.js (when relying on new variables resolver)
-module.exports = async ({ options, resolveConfigurationProperty }) => {
-  let region = options.region;
-  if (!region) {
-    region = await resolveConfigurationProperty(['provider', 'region']);
-    if (!region) region = 'us-east-1'; // Framework default
-  }
-  ...
-}
-```
-
-In the old legacy resolver (which is deprecated, but stays as default in v2) function receives a reference to the Serverless object containing your configuration.
-
-_**Notice:** Configuration is yet in unresolved state, so any properties configured with variables may still be presented with variables in it_
+Here is an example of a resolver function:
 
 ```js
-// config.js (when relying on legacy resolver)
-module.exports = (serverless) => {
-  serverless.cli.consoleLog('You can access Serverless config at serverless.configrationInput');
+// config.js
+module.exports = async ({ options, resolveVariable }) => {
+  // We can resolve other variables via `resolveVariable`
+  const stage = await resolveVariable('sls:stage');
+  const region = await resolveVariable('opt:region, self:provider.region, "us-east-1"');
+  ...
 
+  // Resolver may return any JSON value (null, boolean, string, number, array or plain object)
   return {
-    property1: 'some value',
-    property2: 'some other value',
-  };
-};
-```
-
-```yml
-# serverless.yml
-service: new-service
-provider: aws
-
-custom: ${file(./config.js)}
+    prop1: 'someValue',
+    prop2: 'someOther value'
+  }
+}
 ```
 
-You can also return an object and reference a specific property. Just make sure you are returning a valid object and referencing a valid property:
+It is possible to reference the resolver's returned value:
 
 ```yml
 # serverless.yml
 service: new-service
-provider: aws
-functions:
-  scheduledFunction:
-    handler: handler.scheduledFunction
-    events:
-      - schedule: ${file(./myCustomFile.js):schedule.ten}
-```
 
-```js
-// myCustomFile.js
-module.exports.schedule = () => {
-  // Code that generates dynamic data
-  return {
-    ten: 'rate(10 minutes)',
-    twenty: 'rate(20 minutes)',
-    thirty: 'rate(30 minutes)',
-  };
-};
+custom: ${file(./config.js)}
 ```
 
-If your use case requires handling dynamic/async data sources (ie. DynamoDB, API calls...etc), you can also return a Promise that would be resolved as the value of the variable:
+Or a single property (if the resolver returned an object):
 
 ```yml
 # serverless.yml
 service: new-service
-provider: aws
-functions:
-  scheduledFunction:
-    handler: handler.scheduledFunction
-    events:
-      - schedule: ${file(./myCustomFile.js):promised}
-```
-
-```js
-// myCustomFile.js
-module.exports.promised = () => {
-  // Async code that fetches the rate config...
-  return Promise.resolve('rate(10 minutes)');
-};
-```
 
-For example, in such helper you could call AWS SDK to get account details:
-
-```js
-// myCustomFile.js
-const { STS } = require('aws-sdk');
-const sts = new STS();
-
-module.exports.getAccountId = async () => {
-  // Checking AWS user details
-  const { Account } = await sts.getCallerIdentity().promise();
-  return Account;
-};
-```
-
-```yml
-# serverless.yml
-service: new-service
-provider: aws
 custom:
-  accountId: ${file(./myCustomFile.js):getAccountId}
+  foo: ${file(./config.js):prop1}
 ```
 
 ## Multiple Configuration Files
@@ -675,11 +653,15 @@ provider:
     apiGateway: ${strToBool(${ssm:API_GW_DEBUG_ENABLED})}
 ```
 
-These are examples that explain how the conversion works:
+These are examples that explain how the conversion works after first lowercasing the passed string value:
 
 ```plaintext
 ${strToBool(true)} => true
 ${strToBool(false)} => false
+${strToBool(True)} => true
+${strToBool(False)} => false
+${strToBool(TRUE)} => true
+${strToBool(FALSE)} => false
 ${strToBool(0)} => false
 ${strToBool(1)} => true
 ${strToBool(2)} => Error
diff --git a/docs/providers/aws/guide/workflow.md b/docs/providers/aws/guide/workflow.md
index 025b761a7c2..67d72f5a0bb 100644
--- a/docs/providers/aws/guide/workflow.md
+++ b/docs/providers/aws/guide/workflow.md
@@ -45,7 +45,7 @@ A handy list of commands to use when developing with the Serverless Framework.
 
 Creates a new Service
 
-```
+```bash
 serverless create -p [SERVICE NAME] -t aws-nodejs
 ```
 
@@ -53,7 +53,7 @@ serverless create -p [SERVICE NAME] -t aws-nodejs
 
 This is a convenience method to install a pre-made Serverless Service locally by downloading the Github repo and unzipping it.
 
-```
+```bash
 serverless install -u [GITHUB URL OF SERVICE]
 ```
 
@@ -61,7 +61,7 @@ serverless install -u [GITHUB URL OF SERVICE]
 
 Use this when you have made changes to your Functions, Events or Resources in `serverless.yml` or you simply want to deploy all changes within your Service at the same time.
 
-```
+```bash
 serverless deploy -s [STAGE NAME] -r [REGION NAME] -v
 ```
 
@@ -69,7 +69,7 @@ serverless deploy -s [STAGE NAME] -r [REGION NAME] -v
 
 Use this to quickly overwrite your AWS Lambda code on AWS, allowing you to develop faster.
 
-```
+```bash
 serverless deploy function -f [FUNCTION NAME] -s [STAGE NAME] -r [REGION NAME]
 ```
 
@@ -77,14 +77,17 @@ serverless deploy function -f [FUNCTION NAME] -s [STAGE NAME] -r [REGION NAME]
 
 Invokes an AWS Lambda Function on AWS and returns logs.
 
-```
-serverless invoke -f [FUNCTION NAME] -s [STAGE NAME] -r [REGION NAME] -l
+```bash
+serverless invoke -f [FUNCTION NAME] \
+  -s [STAGE NAME] \
+  -r [REGION NAME] \
+  -l
 ```
 
 ##### Streaming Logs
 
 Open up a separate tab in your console and stream all logs for a specific Function using this command.
 
-```
+```bash
 serverless logs -f [FUNCTION NAME] -s [STAGE NAME] -r [REGION NAME]
 ```
diff --git a/docs/providers/azure/cli-reference/deploy.md b/docs/providers/azure/cli-reference/deploy.md
index 19e3657894b..b2099c42e4f 100644
--- a/docs/providers/azure/cli-reference/deploy.md
+++ b/docs/providers/azure/cli-reference/deploy.md
@@ -29,7 +29,6 @@ The `sls deploy apim` command will deploy API management as configured within `s
 - `--region` or `-r` - Specify region name
 - `--subscriptionId` or `-i` - Specify subscription ID
 - `--config` or `-c` Name of your configuration file, if other than `serverless.yml|.yaml|.js|.json`.
-- `--noDeploy` or `-n` Skips the deployment steps and leaves artifacts in the `.serverless` directory
 - `--verbose` or `-v` Shows all stack events during deployment, and display any Stack Output.
 
 ## Artifacts
diff --git a/docs/providers/azure/guide/plugins.md b/docs/providers/azure/guide/plugins.md
deleted file mode 100644
index 17b30fb9859..00000000000
--- a/docs/providers/azure/guide/plugins.md
+++ /dev/null
@@ -1,390 +0,0 @@
-<!--
-title: Serverless Framework - Azure Functions Guide - Plugins
-menuText: Plugins
-menuOrder: 13
-description: How to install and create Plugins to extend or overwrite the functionality of the Serverless Framework
-layout: Doc
--->
-
-<!-- DOCS-SITE-LINK:START automatically generated  -->
-
-### [Read this on the main serverless docs site](https://www.serverless.com/framework/docs/providers/azure/guide/plugins)
-
-<!-- DOCS-SITE-LINK:END -->
-
-# Azure - Plugins
-
-A Plugin is custom JavaScript code that creates new or extends existing commands within the Serverless Framework. The Serverless Framework is merely a group of Plugins that are provided in the core. If you or your organization have a specific workflow, install a pre-written Plugin or write a plugin to customize the Framework to your needs. External Plugins are written exactly the same way as the core Plugins.
-
-- [How to create serverless plugins - Part 1](https://serverless.com/blog/writing-serverless-plugins/)
-- [How to create serverless plugins - Part 2](https://serverless.com/blog/writing-serverless-plugins-2/)
-
-## Installing Plugins
-
-External Plugins are added on a per function app basis and are not applied globally.
-Make sure you are in your function app's root directory, then install the
-corresponding Plugin with the help of npm:
-
-```
-npm i --save custom-serverless-plugin
-```
-
-We need to tell Serverless that we want to use the plugin inside our function app. We do this by adding the name of the Plugin to the `plugins` section in the `serverless.yml` file.
-
-```yml
-# serverless.yml file
-
-plugins:
-  - custom-serverless-plugin
-```
-
-The `plugins` section supports two formats:
-
-Array object:
-
-```yml
-plugins:
-  - plugin1
-  - plugin2
-```
-
-Enhanced plugins object:
-
-```yml
-plugins:
-  localPath: './custom_serverless_plugins'
-  modules:
-    - plugin1
-    - plugin2
-```
-
-Plugins might want to add extra information which should be accessible to Serverless. The `custom` section in the `serverless.yml` file is the place where you can add necessary configurations for your plugins (the plugins author / documentation will tell you if you need to add anything there):
-
-```yml
-plugins:
-  - custom-serverless-plugin
-
-custom:
-  customkey: customvalue
-```
-
-## Service local plugin
-
-If you are working on a plugin or have a plugin that is just designed for one project they can be loaded from the local folder. Local plugins can be added in the `plugins` array in `serverless.yml`.
-
-By default local plugins can be added to the `.serverless_plugins` directory at the root of your service, and in the `plugins` array in `serverless.yml`.
-
-```yml
-plugins:
-  - custom-serverless-plugin
-```
-
-Local plugins folder can be changed by enhancing `plugins` object:
-
-```yml
-plugins:
-  localPath: './custom_serverless_plugins'
-  modules:
-    - custom-serverless-plugin
-```
-
-The `custom-serverless-plugin` will be loaded from the `custom_serverless_plugins` directory at the root of your service. If the `localPath` is not provided or empty `.serverless_plugins` directory will be taken as the `localPath`.
-
-The plugin will be loaded based on being named `custom-serverless-plugin.js` or `custom-serverless-plugin\index.js` in the root of `localPath` folder (`.serverless_plugins` by default).
-
-### Load Order
-
-Keep in mind that the order you define your plugins matters. When Serverless loads all the core plugins and then the custom plugins in the order you've defined them.
-
-```yml
-# serverless.yml
-
-plugins:
-  - plugin1
-  - plugin2
-```
-
-In this case `plugin1` is loaded before `plugin2`.
-
-## Writing Plugins
-
-### Concepts
-
-#### Plugin
-
-Code which defines _Commands_, any _Events_ within a _Command_, and any _Hooks_
-assigned to an _Lifecycle Event_.
-
-- Command // CLI configuration, commands, subcommands, options
-  - LifecycleEvent(s) // Events that happen sequentially when the command is run
-    - Hook(s) // Code that runs when a Lifecycle Event happens during a Command
-
-#### Command
-
-A CLI _Command_ that can be called by a user, e.g. `serverless deploy`. A
-Command has no logic, but simply defines the CLI configuration (e.g. command,
-subcommands, parameters) and the _Lifecycle Events_ for the command. Every
-command defines its own lifecycle events.
-
-```javascript
-'use strict';
-
-class MyPlugin {
-  constructor() {
-    this.commands = {
-      deploy: {
-        lifecycleEvents: ['resources', 'functions'],
-      },
-    };
-  }
-}
-
-module.exports = MyPlugin;
-```
-
-#### Lifecycle Events
-
-Events that fire sequentially during a Command. The above example list two
-Events. However, for each Event, and additional `before` and `after` event is
-created. Therefore, six Events exist in the above example:
-
-- `before:deploy:resources`
-- `deploy:resources`
-- `after:deploy:resources`
-- `before:deploy:functions`
-- `deploy:functions`
-- `after:deploy:functions`
-
-The name of the command in front of lifecycle events when they are used for Hooks.
-
-#### Hooks
-
-A Hook binds code to any lifecycle event from any command.
-
-```javascript
-'use strict';
-
-class Deploy {
-  constructor() {
-    this.commands = {
-      deploy: {
-        lifecycleEvents: ['resources', 'functions'],
-      },
-    };
-
-    this.hooks = {
-      'before:deploy:resources': this.beforeDeployResources,
-      'deploy:resources': this.deployResources,
-      'after:deploy:functions': this.afterDeployFunctions,
-    };
-  }
-
-  beforeDeployResources() {
-    console.log('Before Deploy Resources');
-  }
-
-  deployResources() {
-    console.log('Deploy Resources');
-  }
-
-  afterDeployFunctions() {
-    console.log('After Deploy Functions');
-  }
-}
-
-module.exports = Deploy;
-```
-
-### Nesting Commands
-
-You can also nest commands, e.g. if you want to provide a command `serverless deploy single`. Those nested commands have their own lifecycle events and do not
-inherit them from their parents.
-
-```javascript
-'use strict';
-
-class MyPlugin {
-  constructor() {
-    this.commands = {
-      deploy: {
-        lifecycleEvents: ['resources', 'functions'],
-        commands: {
-          function: {
-            lifecycleEvents: ['package', 'deploy'],
-          },
-        },
-      },
-    };
-  }
-}
-
-module.exports = MyPlugin;
-```
-
-### Defining Options
-
-Each (sub)command can have multiple Options.
-
-Options are passed in with a double dash (`--`) like this: `serverless function deploy --function functionName`.
-
-Option Shortcuts are passed in with a single dash (`-`) like this: `serverless function deploy -f functionName`.
-
-The `options` object will be passed in as the second parameter to the constructor
-of your plugin.
-
-In it, you can optionally add a `shortcut` property, as well as a `required`
-property. The Framework will return an error if a `required` Option is not
-included.
-
-**Note:** At this time, the Serverless Framework does not use parameters.
-
-```javascript
-'use strict';
-
-class Deploy {
-  constructor(serverless, options) {
-    this.serverless = serverless;
-    this.options = options;
-
-    this.commands = {
-      deploy: {
-        lifecycleEvents: ['functions'],
-        options: {
-          function: {
-            usage: 'Specify the function you want to deploy (e.g. "--function myFunction")',
-            shortcut: 'f',
-            required: true,
-          },
-        },
-      },
-    };
-
-    this.hooks = {
-      'deploy:functions': this.deployFunction.bind(this),
-    };
-  }
-
-  deployFunction() {
-    console.log('Deploying function: ', this.options.function);
-  }
-}
-
-module.exports = Deploy;
-```
-
-### Provider Specific Plugins
-
-Plugins can be provider specific which means that they are bound to a provider.
-
-**Note:** Binding a plugin to a provider is optional. Serverless will always
-consider your plugin if you don't specify a `provider`.
-
-The provider definition should be added inside the plugins constructor:
-
-```javascript
-'use strict';
-
-class ProviderDeploy {
-  constructor(serverless, options) {
-    this.serverless = serverless;
-    this.options = options;
-
-    // set the providers name here
-    this.provider = this.serverless.getProvider('providerName');
-
-    this.commands = {
-      deploy: {
-        lifecycleEvents: ['functions'],
-        options: {
-          function: {
-            usage: 'Specify the function you want to deploy (e.g. "--function myFunction")',
-            required: true,
-          },
-        },
-      },
-    };
-
-    this.hooks = {
-      'deploy:functions': this.deployFunction.bind(this),
-    };
-  }
-
-  deployFunction() {
-    console.log('Deploying function: ', this.options.function);
-  }
-}
-
-module.exports = ProviderDeploy;
-```
-
-The Plugin's functionality will now only be executed when the Serverless
-Service's provider matches the provider name which is defined inside the plugins
-constructor.
-
-### Serverless Instance
-
-The `serverless` instance which enables access to global service config during
-runtime is passed in as the first parameter to the plugin constructor.
-
-```javascript
-'use strict';
-
-class MyPlugin {
-  constructor(serverless, options) {
-    this.serverless = serverless;
-    this.options = options;
-
-    this.commands = {
-      log: {
-        lifecycleEvents: ['serverless'],
-      },
-    };
-
-    this.hooks = {
-      'log:serverless': this.logServerless.bind(this),
-    };
-  }
-
-  logServerless() {
-    console.log('Serverless instance: ', this.serverless);
-  }
-}
-
-module.exports = MyPlugin;
-```
-
-**Note:** [Variable references](./variables.md#reference-properties-in-serverlessyml) in the `serverless` instance are not resolved before a Plugin's constructor is called, so if you need these, make sure to wait to access those from your [hooks](#hooks).
-
-### Command Naming
-
-Command names need to be unique. If we load two commands and both want to specify
-the same command (e.g. we have an integrated command `deploy` and an external
-command also wants to use `deploy`) the Serverless CLI will print an error and
-exit. If you want to have your own `deploy` command you need to name it something
-different like `myCompanyDeploy` so they don't clash with existing plugins.
-
-### Extending the `info` command
-
-The `info` command which is used to display information about the deployment has
-detailed `lifecycleEvents` you can hook into to add and display custom
-information.
-
-Here's an example overview of the info lifecycle events the AWS implementation
-exposes:
-
-```
--> info:info
-  -> aws:info:validate
-  -> aws:info:gatherData
-  -> aws:info:displayServiceInfo
-  -> aws:info:displayApiKeys
-  -> aws:info:displayEndpoints
-  -> aws:info:displayFunctions
-  -> aws:info:displayStackOutputs
-```
-
-Here you could e.g. hook into `after:aws:info:gatherData` and implement your own
-data collection and display it to the user.
-
-**Note:** Every provider implements its own `info` plugin so you might want to
-take a look into the `lifecycleEvents` the provider `info` plugin exposes.
diff --git a/docs/providers/azure/guide/serverless.yml.md b/docs/providers/azure/guide/serverless.yml.md
index 9b4f01c0b78..60fbce9825e 100644
--- a/docs/providers/azure/guide/serverless.yml.md
+++ b/docs/providers/azure/guide/serverless.yml.md
@@ -20,7 +20,7 @@ Here is a list of all available properties in `serverless.yml` when the provider
 # serverless.yml
 service: azure-nodejs
 
-frameworkVersion: '2'
+frameworkVersion: '3'
 
 provider:
   name: azure
diff --git a/docs/providers/fn/cli-reference/invoke.md b/docs/providers/fn/cli-reference/invoke.md
index 89fdf3d6100..086bcaf4d20 100644
--- a/docs/providers/fn/cli-reference/invoke.md
+++ b/docs/providers/fn/cli-reference/invoke.md
@@ -14,7 +14,7 @@ layout: Doc
 
 # Fn - Invoke
 
-Invokes deployed function. It allows to send event data to the function, read logs and display other important information of the function invocation.
+Invokes a deployed function. You can send event data, read logs and display other important information of the function invocation.
 
 ```bash
 serverless invoke --function functionName
diff --git a/docs/providers/google/cli-reference/create.md b/docs/providers/google/cli-reference/create.md
index c94ea9a932d..d8516d65cf7 100644
--- a/docs/providers/google/cli-reference/create.md
+++ b/docs/providers/google/cli-reference/create.md
@@ -43,6 +43,7 @@ To see a list of available templates run `serverless create --help`
 Most commonly used templates:
 
 - google-nodejs
+- google-nodejs-typescript
 - google-go
 - google-python
 
diff --git a/docs/providers/google/cli-reference/invoke-local.md b/docs/providers/google/cli-reference/invoke-local.md
index 4dcc28c3d41..8c53345670b 100644
--- a/docs/providers/google/cli-reference/invoke-local.md
+++ b/docs/providers/google/cli-reference/invoke-local.md
@@ -50,18 +50,72 @@ serverless invoke local -f functionName -d '{ "data": "hello world" }'
 
 ```bash
 serverless invoke local -f functionName -p path/to/file.json
-
 # OR
-
 serverless invoke local -f functionName -p path/to/file.yaml
 ```
 
 ### Local function invocation, setting environment variables
 
-```bash
+````bash
 serverless invoke local -f functionName -e VAR1=value1
-
 # Or more than one variable
-
 serverless invoke local -f functionName -e VAR1=value1 -e VAR2=value2
+
+## Event vs Http
+
+Cloud functions can be triggered by events or http. Those two types of functions have different signatures.
+The data you can provide to a local invocation of a function are also different according to their types.
+
+### Event
+
+The signature of the function is
+```js
+function eventHandler (event, context, callback) {}
 ```
+
+The data provided through `data` or loaded through `path` will be in `event`.
+
+The data provided through `context` or loaded through `contextPath` will be in `context`.
+
+### Http
+
+The function use express, its signature is
+
+```js
+function httpHandler(req, res) {}
+```
+
+The data provided through `data` or loaded through `path` will be merged in `req`.
+
+The data provided through `context` or loaded through `contextPath` will be ignored.
+
+Example:
+
+```json
+# mocks/postHelloWorld.json
+{
+  "method": "POST",
+  "headers": {
+    "content-type": "application/json"
+  },
+  "body": {
+    "message": "Hello World"
+  }
+}
+```
+
+```bash
+serverless invoke local -f httpHandler -p mocks/postHelloWorld.json
+```
+will invoke `httpHandler` with an express request with the provided headers and body
+
+## Resource permissions
+
+When a cloud function is executed in the cloud, the Google SDK will implicitly resolve its [runtime service account](https://cloud.google.com/functions/docs/concepts/iam#runtime_service_accounts).
+which will be used to interact with the other GCP services.
+
+When you locally invoke a cloud function, the Google SDK will also implicitly resolve a service account or a user.
+Make sure you are authenticated with your user or a service account following the [authentication procedure](https://www.serverless.com/framework/docs/providers/google/guide/credentials/)
+and that the authenticated account have the necessary rights to access to all services you want your function to access
+
+````
diff --git a/docs/providers/google/cli-reference/invoke.md b/docs/providers/google/cli-reference/invoke.md
index ec17e40fcd4..706f46d188e 100644
--- a/docs/providers/google/cli-reference/invoke.md
+++ b/docs/providers/google/cli-reference/invoke.md
@@ -14,7 +14,7 @@ layout: Doc
 
 # Google - Invoke
 
-Invokes deployed function. It allows to send event data to the function, read logs and display other important information of the function invocation.
+Invokes a deployed function. You can send event data, read logs and display other important information of the function invocation.
 
 ```bash
 serverless invoke --function functionName
diff --git a/docs/providers/google/cli-reference/login.md b/docs/providers/google/cli-reference/login.md
index a0977cebc9b..f47d956f35e 100644
--- a/docs/providers/google/cli-reference/login.md
+++ b/docs/providers/google/cli-reference/login.md
@@ -1,7 +1,7 @@
 <!--
 title: Serverless Framework Commands - Login
 menuText: login
-menuOrder: 7
+menuOrder: 8
 description: Login to the serverless platform
 layout: Doc
 -->
diff --git a/docs/providers/google/cli-reference/logs.md b/docs/providers/google/cli-reference/logs.md
index 7afb0e7a626..87a7e2a8447 100644
--- a/docs/providers/google/cli-reference/logs.md
+++ b/docs/providers/google/cli-reference/logs.md
@@ -1,7 +1,7 @@
 <!--
 title: Google Cloud Functions Serverless logs command
 menuText: logs
-menuOrder: 8
+menuOrder: 9
 description: View logs of your Google Cloud Functions Function within your terminal using the Serverless Framework
 layout: Doc
 -->
diff --git a/docs/providers/google/cli-reference/plugin-install.md b/docs/providers/google/cli-reference/plugin-install.md
index 5270a9346d4..2d297737866 100644
--- a/docs/providers/google/cli-reference/plugin-install.md
+++ b/docs/providers/google/cli-reference/plugin-install.md
@@ -1,7 +1,7 @@
 <!--
 title: Serverless Framework Commands - Google Cloud Functions - Plugin Install
 menuText: Plugin Install
-menuOrder: 12
+menuOrder: 13
 description: Install a Serverless plugin
 layout: Doc
 -->
diff --git a/docs/providers/google/cli-reference/plugin-list.md b/docs/providers/google/cli-reference/plugin-list.md
index 67cdf426caf..cd16e451ece 100644
--- a/docs/providers/google/cli-reference/plugin-list.md
+++ b/docs/providers/google/cli-reference/plugin-list.md
@@ -1,7 +1,7 @@
 <!--
 title: Serverless Framework Commands - Google Cloud Functions - Plugin List
 menuText: Plugin List
-menuOrder: 10
+menuOrder: 11
 description: List all available Serverless plugins
 layout: Doc
 -->
diff --git a/docs/providers/google/cli-reference/plugin-search.md b/docs/providers/google/cli-reference/plugin-search.md
index c1c13282bdb..90d968b0542 100644
--- a/docs/providers/google/cli-reference/plugin-search.md
+++ b/docs/providers/google/cli-reference/plugin-search.md
@@ -1,7 +1,7 @@
 <!--
 title: Serverless Framework Commands - Google Cloud Functions - Plugin Search
 menuText: Plugin Search
-menuOrder: 11
+menuOrder: 12
 description: Search through all available Serverless plugins
 layout: Doc
 -->
diff --git a/docs/providers/google/cli-reference/plugin-uninstall.md b/docs/providers/google/cli-reference/plugin-uninstall.md
index 81d5e86bcc0..140c28a9b04 100644
--- a/docs/providers/google/cli-reference/plugin-uninstall.md
+++ b/docs/providers/google/cli-reference/plugin-uninstall.md
@@ -1,7 +1,7 @@
 <!--
 title: Serverless Framework Commands - Google Cloud Functions - Plugin Uninstall
 menuText: Plugin Uninstall
-menuOrder: 12
+menuOrder: 14
 description: Uninstall a Serverless plugin
 layout: Doc
 -->
diff --git a/docs/providers/google/cli-reference/print.md b/docs/providers/google/cli-reference/print.md
index d47f768c189..3a599e34db1 100644
--- a/docs/providers/google/cli-reference/print.md
+++ b/docs/providers/google/cli-reference/print.md
@@ -1,7 +1,7 @@
 <!--
 title: Serverless Framework Commands - Google Cloud Functions - Print
 menuText: Print
-menuOrder: 13
+menuOrder: 15
 description: Print your config with all variables resolved for debugging
 layout: Doc
 -->
diff --git a/docs/providers/google/guide/credentials.md b/docs/providers/google/guide/credentials.md
index 8ed710c5b03..16322390dea 100644
--- a/docs/providers/google/guide/credentials.md
+++ b/docs/providers/google/guide/credentials.md
@@ -35,7 +35,7 @@ A Google Cloud Project is required to use Google Cloud Functions. Here's how to
 3. Enter a Project name and select the Billing Account you created in the steps above (or any Billing Account with a valid credit card attached).
 4. Click on "Create" to start the creation process.
 5. Wait until the Project was successfully created and Google will redirect you to your new Project.
-6. Verify your currently within your new Project by looking at the dropdown next to the search bar. This should mark your new Project as selected.
+6. Verify you're currently within your new Project by looking at the dropdown next to the search bar. This should mark your new Project as selected.
 
 ## Enable the necessary APIs
 
@@ -49,9 +49,39 @@ Go to the <a href="https://console.cloud.google.com/apis/dashboard" target="_bla
 - Cloud Storage
 - Cloud Logging API
 
-## Get credentials & assign roles
+## Set up a user & assign roles
 
-You need to create credentials with appropriate roles Serverless can use to create resources in your Project.
+You can either use a **Service Account** or directly your **Google Account**
+with appropriate roles that Serverless can use to create resources in your project.
+
+### Google Account
+
+(<a href="https://cloud.google.com/iam/docs/overview#google_account" target="_blank">Google Accounts</a> are real users who can be authenticated by the Google SSO)
+
+This method is the most convenient to allow developers to develop and deploy a Serverless application locally.
+
+If you are owner of the project you have nothing to do.
+Otherwise, make sure your user has at least the following roles:
+
+- `Deployment Manager Editor`
+- `Storage Admin`
+- `Logging Admin`
+- `Cloud Functions Developer`
+
+### Service Account
+
+(<a href="https://cloud.google.com/iam/docs/overview#service_account" target="_blank">Service accounts</a> are accounts for applications instead of individuals end users)
+
+This method is useful for to authenticate a CI/CD or to assume a specific role without changing the roles of a **Google Account**.
+
+Create a **Service Account** with at least the following roles:
+
+- `Deployment Manager Editor`
+- `Storage Admin`
+- `Logging Admin`
+- `Cloud Functions Developer`
+
+How to create a **Service Account**:
 
 1. Go to the <a href="https://console.cloud.google.com" target="_blank">Google Cloud Console</a>.
 2. Choose the project that you are working on from the top drop down
@@ -60,21 +90,43 @@ You need to create credentials with appropriate roles Serverless can use to crea
 5. Click `CREATE SERVICE ACCOUNT` button on the top
 6. Input Service account name and Service account ID will be generated automatically for you. Change it if you wish to.
 7. Click `Create` button
-8. Add `Deployment Manager Editor`, `Storage Admin`, `Logging Admin`, `Cloud Functions Developer` roles and click `Continue`
-9. Click `+CREATE KEY` button and select `JSON` key type and click `Create` button
-10. You will see a json (AKA `keyfile`) file downloaded
-11. Click `Done` button
-12. Save the `keyfile` somewhere secure. We recommend making a folder in your root folder and putting it there. Like this, `~/.gcloud/keyfile.json`. You can change the file name from `keyfile` to anything. Remember the path you saved it to.
+8. Add `Deployment Manager Editor`, `Storage Admin`, `Logging Admin`, `Cloud Functions Developer` roles
+9. Click `Done` button
 
-## Update the `provider` config in `serverless.yml`
+## Authenticate
 
-Open up your `serverless.yml` file and update the `provider` section with your Google Cloud Project id and
-the path to your `keyfile.json` file (this path needs to be absolute!). It should look something like this:
+The Serverless Google Cloud plugin supports several authentication methods.
+
+### Application Default Credentials
+
+The plugin will let Google find the **Application Default Credentials** and implicitly authenticate.
+
+To authenticate with a **Google Account** use <a href="https://cloud.google.com/sdk/gcloud/reference/auth/application-default/login" target="_blank">gcloud cli login</a>
+
+```shell
+gcloud auth application-default login
+```
+
+To authenticate with a **Service Account**:
+
+1. Go on the Service Account panel of `IAM & admin`
+2. Select a Service Account and click on `manage keys`
+3. Create a JSON credentials keyfile
+4. Download and store the keyfile
+5. expose the absolute path of the keyfile in the environment variable `GOOGLE_APPLICATION_CREDENTIALS`
+
+### Explicitly provide the path of a credentials keyfile
+
+1. Get a credentials keyfile as explained above.
+2. In the `provider` config in `serverless.yml`, add a `credentials` attribute with the absolute path of the credentials keyfile:
 
 ```yml
 provider:
   name: google
   runtime: nodejs
   project: my-serverless-project-1234
-  credentials: ~/.gcloud/keyfile.json
+
+  credentials: ~/.gcloud/keyfile.json # <- the path must be absolute
 ```
+
+If `provider.credentials` is provided in the `serverless.yml`, the **Application Default Credentials** will be ignored.
diff --git a/docs/providers/google/guide/plugins.md b/docs/providers/google/guide/plugins.md
deleted file mode 100644
index e7095ee0e96..00000000000
--- a/docs/providers/google/guide/plugins.md
+++ /dev/null
@@ -1,365 +0,0 @@
-<!--
-title: Serverless Framework - Google Cloud Functions Guide - Plugins
-menuText: Plugins
-menuOrder: 13
-description: How to install and create Plugins to extend or overwrite the functionality of the Serverless Framework
-layout: Doc
--->
-
-<!-- DOCS-SITE-LINK:START automatically generated  -->
-
-### [Read this on the main serverless docs site](https://www.serverless.com/framework/docs/providers/google/guide/plugins)
-
-<!-- DOCS-SITE-LINK:END -->
-
-# Google - Plugins
-
-A Plugin is custom Javascript code that creates new or extends existing commands within the Serverless Framework. The Serverless Framework is merely a group of Plugins that are provided in the core. If you or your organization have a specific workflow, install a pre-written Plugin or write a plugin to customize the Framework to your needs. External Plugins are written exactly the same way as the core Plugins.
-
-- [How to create serverless plugins - Part 1](https://serverless.com/blog/writing-serverless-plugins/)
-- [How to create serverless plugins - Part 2](https://serverless.com/blog/writing-serverless-plugins-2/)
-
-## Installing Plugins
-
-External Plugins are added on a per service basis and are not applied globally. Make sure you are in your Service's root directory, then install the corresponding Plugin with the help of npm:
-
-```
-npm install --save custom-serverless-plugin
-```
-
-We need to tell Serverless that we want to use the plugin inside our service. We do this by adding the name of the Plugin to the `plugins` section in the `serverless.yml` file.
-
-```yml
-# serverless.yml file
-
-plugins:
-  - custom-serverless-plugin
-```
-
-The `plugins` section supports two formats:
-
-Array object:
-
-```yml
-plugins:
-  - plugin1
-  - plugin2
-```
-
-Enhanced plugins object:
-
-```yml
-plugins:
-  localPath: './custom_serverless_plugins'
-  modules:
-    - plugin1
-    - plugin2
-```
-
-Plugins might want to add extra information which should be accessible to Serverless. The `custom` section in the `serverless.yml` file is the place where you can add necessary configurations for your plugins (the plugins author / documentation will tell you if you need to add anything there):
-
-```yml
-plugins:
-  - custom-serverless-plugin
-
-custom:
-  customkey: customvalue
-```
-
-## Service local plugin
-
-If you are working on a plugin or have a plugin that is just designed for one project they can be loaded from the local folder. Local plugins can be added in the `plugins` array in `serverless.yml`.
-
-By default local plugins can be added to the `.serverless_plugins` directory at the root of your service, and in the `plugins` array in `serverless.yml`.
-
-```yml
-plugins:
-  - custom-serverless-plugin
-```
-
-Local plugins folder can be changed by enhancing `plugins` object:
-
-```yml
-plugins:
-  localPath: './custom_serverless_plugins'
-  modules:
-    - custom-serverless-plugin
-```
-
-The `custom-serverless-plugin` will be loaded from the `custom_serverless_plugins` directory at the root of your service. If the `localPath` is not provided or empty `.serverless_plugins` directory will be taken as the `localPath`.
-
-The plugin will be loaded based on being named `custom-serverless-plugin.js` or `custom-serverless-plugin\index.js` in the root of `localPath` folder (`.serverless_plugins` by default).
-
-### Load Order
-
-Keep in mind that the order you define your plugins matters. When Serverless loads all the core plugins and then the custom plugins in the order you've defined them.
-
-```yml
-# serverless.yml
-
-plugins:
-  - plugin1
-  - plugin2
-```
-
-In this case `plugin1` is loaded before `plugin2`.
-
-## Writing Plugins
-
-### Concepts
-
-#### Plugin
-
-Code which defines _Commands_, any _Events_ within a _Command_, and any _Hooks_ assigned to an _Lifecycle Event_.
-
-- Command // CLI configuration, commands, subcommands, options
-  - LifecycleEvent(s) // Events that happen sequentially when the command is run
-    - Hook(s) // Code that runs when a Lifecycle Event happens during a Command
-
-#### Command
-
-A CLI _Command_ that can be called by a user, e.g. `serverless deploy`. A Command has no logic, but simply defines the CLI configuration (e.g. command, subcommands, parameters) and the _Lifecycle Events_ for the command. Every command defines its own lifecycle events.
-
-```javascript
-'use strict';
-
-class MyPlugin {
-  constructor() {
-    this.commands = {
-      deploy: {
-        lifecycleEvents: ['resources', 'functions'],
-      },
-    };
-  }
-}
-
-module.exports = MyPlugin;
-```
-
-#### Lifecycle Events
-
-Events that fire sequentially during a Command. The above example list two Events. However, for each Event, and additional `before` and `after` event is created. Therefore, six Events exist in the above example:
-
-- `before:deploy:resources`
-- `deploy:resources`
-- `after:deploy:resources`
-- `before:deploy:functions`
-- `deploy:functions`
-- `after:deploy:functions`
-
-The name of the command in front of lifecycle events when they are used for Hooks.
-
-#### Hooks
-
-A Hook binds code to any lifecycle event from any command.
-
-```javascript
-'use strict';
-
-class Deploy {
-  constructor() {
-    this.commands = {
-      deploy: {
-        lifecycleEvents: ['resources', 'functions'],
-      },
-    };
-
-    this.hooks = {
-      'before:deploy:resources': this.beforeDeployResources,
-      'deploy:resources': this.deployResources,
-      'after:deploy:functions': this.afterDeployFunctions,
-    };
-  }
-
-  beforeDeployResources() {
-    console.log('Before Deploy Resources');
-  }
-
-  deployResources() {
-    console.log('Deploy Resources');
-  }
-
-  afterDeployFunctions() {
-    console.log('After Deploy Functions');
-  }
-}
-
-module.exports = Deploy;
-```
-
-### Nesting Commands
-
-You can also nest commands, e.g. if you want to provide a command `serverless deploy single`. Those nested commands have their own lifecycle events and do not inherit them from their parents.
-
-```javascript
-'use strict';
-
-class MyPlugin {
-  constructor() {
-    this.commands = {
-      deploy: {
-        lifecycleEvents: ['resources', 'functions'],
-        commands: {
-          function: {
-            lifecycleEvents: ['package', 'deploy'],
-          },
-        },
-      },
-    };
-  }
-}
-
-module.exports = MyPlugin;
-```
-
-### Defining Options
-
-Each (sub)command can have multiple Options.
-
-Options are passed in with a double dash (`--`) like this: `serverless function deploy --function functionName`.
-
-Option Shortcuts are passed in with a single dash (`-`) like this: `serverless function deploy -f functionName`.
-
-The `options` object will be passed in as the second parameter to the constructor of your plugin.
-
-In it, you can optionally add a `shortcut` property, as well as a `required` property. The Framework will return an error if a `required` Option is not included.
-
-**Note:** At this time, the Serverless Framework does not use parameters.
-
-```javascript
-'use strict';
-
-class Deploy {
-  constructor(serverless, options) {
-    this.serverless = serverless;
-    this.options = options;
-
-    this.commands = {
-      deploy: {
-        lifecycleEvents: ['functions'],
-        options: {
-          function: {
-            usage: 'Specify the function you want to deploy (e.g. "--function myFunction")',
-            shortcut: 'f',
-            required: true,
-          },
-        },
-      },
-    };
-
-    this.hooks = {
-      'deploy:functions': this.deployFunction.bind(this),
-    };
-  }
-
-  deployFunction() {
-    console.log('Deploying function: ', this.options.function);
-  }
-}
-
-module.exports = Deploy;
-```
-
-### Provider Specific Plugins
-
-Plugins can be provider specific which means that they are bound to a provider.
-
-**Note:** Binding a plugin to a provider is optional. Serverless will always consider your plugin if you don't specify a `provider`.
-
-The provider definition should be added inside the plugins constructor:
-
-```javascript
-'use strict';
-
-class ProviderDeploy {
-  constructor(serverless, options) {
-    this.serverless = serverless;
-    this.options = options;
-
-    // set the providers name here
-    this.provider = this.serverless.getProvider('providerName');
-
-    this.commands = {
-      deploy: {
-        lifecycleEvents: ['functions'],
-        options: {
-          function: {
-            usage: 'Specify the function you want to deploy (e.g. "--function myFunction")',
-            required: true,
-          },
-        },
-      },
-    };
-
-    this.hooks = {
-      'deploy:functions': this.deployFunction.bind(this),
-    };
-  }
-
-  deployFunction() {
-    console.log('Deploying function: ', this.options.function);
-  }
-}
-
-module.exports = ProviderDeploy;
-```
-
-The Plugin's functionality will now only be executed when the Serverless Service's provider matches the provider name which is defined inside the plugins constructor.
-
-### Serverless Instance
-
-The `serverless` instance which enables access to global service config during runtime is passed in as the first parameter to the plugin constructor.
-
-```javascript
-'use strict';
-
-class MyPlugin {
-  constructor(serverless, options) {
-    this.serverless = serverless;
-    this.options = options;
-
-    this.commands = {
-      log: {
-        lifecycleEvents: ['serverless'],
-      },
-    };
-
-    this.hooks = {
-      'log:serverless': this.logServerless.bind(this),
-    };
-  }
-
-  logServerless() {
-    console.log('Serverless instance: ', this.serverless);
-  }
-}
-
-module.exports = MyPlugin;
-```
-
-**Note:** [Variable references](./variables.md#reference-properties-in-serverlessyml) in the `serverless` instance are not resolved before a Plugin's constructor is called, so if you need these, make sure to wait to access those from your [hooks](#hooks).
-
-### Command Naming
-
-Command names need to be unique. If we load two commands and both want to specify the same command (e.g. we have an integrated command `deploy` and an external command also wants to use `deploy`) the Serverless CLI will print an error and exit. If you want to have your own `deploy` command you need to name it something different like `myCompanyDeploy` so they don't clash with existing plugins.
-
-### Extending the `info` command
-
-The `info` command which is used to display information about the deployment has detailed `lifecycleEvents` you can hook into to add and display custom information.
-
-Here's an example overview of the info lifecycle events the Google implementation exposes:
-
-```
--> info:info
-  -> aws:info:validate
-  -> aws:info:gatherData
-  -> aws:info:displayServiceInfo
-  -> aws:info:displayApiKeys
-  -> aws:info:displayEndpoints
-  -> aws:info:displayFunctions
-  -> aws:info:displayStackOutputs
-```
-
-Here you could e.g. hook into `after:aws:info:gatherData` and implement your own data collection and display it to the user.
-
-**Note:** Every provider implements its own `info` plugin so you might want to take a look into the `lifecycleEvents` the provider `info` plugin exposes.
diff --git a/docs/providers/knative/guide/plugins.md b/docs/providers/knative/guide/plugins.md
deleted file mode 100644
index e67f5c98c73..00000000000
--- a/docs/providers/knative/guide/plugins.md
+++ /dev/null
@@ -1,420 +0,0 @@
-<!--
-title: Knative - Knative Guide - Plugins | Serverless Framework
-menuText: Plugins
-menuOrder: 11
-description: How to install and create Plugins to extend or overwrite the functionality of the Serverless Framework
-layout: Doc
--->
-
-<!-- DOCS-SITE-LINK:START automatically generated  -->
-
-### [Read this on the main serverless docs site](https://www.serverless.com/framework/docs/providers/knative/guide/plugins/)
-
-<!-- DOCS-SITE-LINK:END -->
-
-# Plugins
-
-A Plugin is custom Javascript code that creates new or extends existing commands within the Serverless Framework. The Serverless Framework is merely a group of Plugins that are provided in the core. If you or your organization have a specific workflow, install a pre-written Plugin or write a plugin to customize the Framework to your needs. External Plugins are written exactly the same way as the core Plugins.
-
-- [How to create serverless plugins - Part 1](https://serverless.com/blog/writing-serverless-plugins/)
-- [How to create serverless plugins - Part 2](https://serverless.com/blog/writing-serverless-plugins-2/)
-
-## Installing Plugins
-
-External Plugins are added on a per service basis and are not applied globally. Make sure you are in your Service's root directory, then install the corresponding Plugin with the help of NPM:
-
-```
-npm install --save custom-serverless-plugin
-```
-
-We need to tell Serverless that we want to use the plugin inside our service. We do this by adding the name of the Plugin to the `plugins` section in the `serverless.yml` file.
-
-```yaml
-# serverless.yml file
-
-plugins:
-  - custom-serverless-plugin
-```
-
-The `plugins` section supports two formats:
-
-Array object:
-
-```yaml
-plugins:
-  - plugin1
-  - plugin2
-```
-
-Enhanced plugins object:
-
-```yaml
-plugins:
-  localPath: './custom_serverless_plugins'
-  modules:
-    - plugin1
-    - plugin2
-```
-
-Plugins might want to add extra information which should be accessible to Serverless. The `custom` section in the `serverless.yml` file is the place where you can add necessary configurations for your plugins (the plugins author / documentation will tell you if you need to add anything there):
-
-```yaml
-plugins:
-  - custom-serverless-plugin
-
-custom:
-  customkey: customvalue
-```
-
-## Service local plugin
-
-If you are working on a plugin or have a plugin that is just designed for one project, it can be loaded from the local `.serverless_plugins` folder at the root of your service. Local plugins can be added in the `plugins` array in `serverless.yml`.
-
-```yaml
-plugins:
-  - custom-serverless-plugin
-```
-
-Local plugins folder can be changed by enhancing `plugins` object:
-
-```yaml
-plugins:
-  localPath: './custom_serverless_plugins'
-  modules:
-    - custom-serverless-plugin
-```
-
-The `custom-serverless-plugin` will be loaded from the `custom_serverless_plugins` directory at the root of your service. If the `localPath` is not provided or empty, the `.serverless_plugins` directory will be used.
-
-The plugin will be loaded based on being named `custom-serverless-plugin.js` or `custom-serverless-plugin\index.js` in the root of `localPath` folder (`.serverless_plugins` by default).
-
-If you want to load a plugin from a specific directory without affecting other plugins, you can also specify a path relative to the root of your service:
-
-```yaml
-plugins:
-  # This plugin will be loaded from the `.serverless_plugins/` or `node_modules/` directories
-  - custom-serverless-plugin
-  # This plugin will be loaded from the `sub/directory/` directory
-  - ./sub/directory/another-custom-plugin
-```
-
-### Load Order
-
-Keep in mind that the order you define your plugins matters. When Serverless loads all the core plugins and then the custom plugins in the order you've defined them.
-
-```yaml
-# serverless.yml
-
-plugins:
-  - plugin1
-  - plugin2
-```
-
-In this case `plugin1` is loaded before `plugin2`.
-
-## Writing Plugins
-
-### Concepts
-
-#### Plugin
-
-Code which defines _Commands_, any _Events_ within a _Command_, and any _Hooks_ assigned to a _Lifecycle Event_.
-
-- Command // CLI configuration, commands, subcommands, options
-  - LifecycleEvent(s) // Events that happen sequentially when the command is run
-    - Hook(s) // Code that runs when a Lifecycle Event happens during a Command
-
-#### Command
-
-A CLI _Command_ that can be called by a user, e.g. `serverless deploy`. A Command has no logic, but simply defines the CLI configuration (e.g. command, subcommands, parameters) and the _Lifecycle Events_ for the command. Every command defines its own lifecycle events.
-
-```javascript
-'use strict';
-
-class MyPlugin {
-  constructor() {
-    this.commands = {
-      deploy: {
-        lifecycleEvents: ['resources', 'functions'],
-      },
-    };
-  }
-}
-
-module.exports = MyPlugin;
-```
-
-#### Lifecycle Events
-
-Events that fire sequentially during a Command. The above example lists two Events. However, for each Event, an additional `before` and `after` event is created. Therefore, six Events exist in the above example:
-
-- `before:deploy:resources`
-- `deploy:resources`
-- `after:deploy:resources`
-- `before:deploy:functions`
-- `deploy:functions`
-- `after:deploy:functions`
-
-The name of the command in front of lifecycle events when they are used for Hooks.
-
-#### Hooks
-
-A Hook binds code to any lifecycle event from any command.
-
-```javascript
-'use strict';
-
-class Deploy {
-  constructor() {
-    this.commands = {
-      deploy: {
-        lifecycleEvents: ['resources', 'functions'],
-      },
-    };
-
-    this.hooks = {
-      'before:deploy:resources': this.beforeDeployResources,
-      'deploy:resources': this.deployResources,
-      'after:deploy:functions': this.afterDeployFunctions,
-    };
-  }
-
-  beforeDeployResources() {
-    console.log('Before Deploy Resources');
-  }
-
-  deployResources() {
-    console.log('Deploy Resources');
-  }
-
-  afterDeployFunctions() {
-    console.log('After Deploy Functions');
-  }
-}
-
-module.exports = Deploy;
-```
-
-### Custom Variable Types
-
-As of version 1.52.0 of the Serverless framework, plugins can officially implement their own
-variable types for use in serverless config files.
-
-Example:
-
-```javascript
-'use strict';
-
-class EchoTestVarPlugin {
-  constructor() {
-    getEchoTestValue(src) {
-      return src.slice(5);
-    }
-    getDependentEchoTestValue(src) {
-      return src.slice(5);
-    }
-    this.variableResolvers = {
-      echo: this.getEchoTestValue,
-      // if a variable type depends on profile/stage/credentials, to avoid infinite loops in
-      // trying to resolve variables that depend on themselves, specify as such by setting a
-      // dependendServiceName property on the variable getter
-      echoStageDependent: {
-        resolver: this.getDependentEchoTestValue,
-        serviceName: 'echo that isnt prepopulated',
-        isDisabledAtPrepopulation: true
-    };
-  }
-}
-```
-
-The above plugin will add support for variables like `${echo:foobar}` and resolve to the key. EG:
-`${echo:foobar}` will resolve to `'foobar'`.
-
-#### `this.variableResolvers` structure
-
-The data structure of `this.variableResolvers` is an `Object` with keys that are either a
-`function` or `Object`.
-
-The keys are used to generate the regex which matches the variable type. Eg, a key of `test` will
-match variables like `${test:foobar}`.
-
-If the value is a `function` it is used to resolve variables matched. It must be `async` or return
-a `Promise` and accepts the variable string(with prefix but not the wrapping variable syntax,
-eg `test:foobar`) as it's only argument.
-
-If the value is an `Object`, it can have the following keys:
-
-- `resolver` - required, a function, same requirements as described above.
-- `isDisabledAtPrepopulation` - optional, a boolean, disable this variable type when populating
-  stage and credentials. This is important for variable types that depend on Knative or other
-  service that depend on those variables
-- `serviceName` - required if `isDisabledAtPrepopulation === true`, a string to display to users
-  if they try to use the variable type in one of the fields disabled for populating
-  stage / credentials.
-
-### Nesting Commands
-
-You can also nest commands, e.g. if you want to provide a command `serverless deploy function`. Those nested commands have their own lifecycle events and do not inherit them from their parents.
-
-```javascript
-'use strict';
-
-class MyPlugin {
-  constructor() {
-    this.commands = {
-      deploy: {
-        lifecycleEvents: ['resources', 'functions'],
-        commands: {
-          function: {
-            lifecycleEvents: ['package', 'deploy'],
-          },
-        },
-      },
-    };
-  }
-}
-
-module.exports = MyPlugin;
-```
-
-### Defining Options
-
-Each (sub)command can have multiple Options.
-
-Options are passed in with a double dash (`--`) like this: `serverless function deploy --function functionName`.
-
-Option Shortcuts are passed in with a single dash (`-`) like this: `serverless function deploy -f functionName`.
-
-The `options` object will be passed in as the second parameter to the constructor of your plugin.
-
-In it, you can optionally add a `shortcut` property, as well as a `required` property. The Framework will return an error if a `required` Option is not included. You can also set a `default` property if your option is not required.
-
-**Note:** At this time, the Serverless Framework does not use parameters.
-
-```javascript
-'use strict';
-
-class Deploy {
-  constructor(serverless, options) {
-    this.serverless = serverless;
-    this.options = options;
-
-    this.commands = {
-      deploy: {
-        lifecycleEvents: ['functions'],
-        options: {
-          function: {
-            usage: 'Specify the function you want to deploy (e.g. "--function myFunction")',
-            shortcut: 'f',
-            required: true,
-          },
-          stage: {
-            usage: 'Specify the stage you want to deploy to. (e.g. "--stage prod")',
-            shortcut: 's',
-            default: 'dev',
-          },
-        },
-      },
-    };
-
-    this.hooks = {
-      'deploy:functions': this.deployFunction.bind(this),
-    };
-  }
-
-  deployFunction() {
-    console.log('Deploying function: ', this.options.function);
-  }
-}
-
-module.exports = Deploy;
-```
-
-### Provider Specific Plugins
-
-Plugins can be provider specific which means that they are bound to a provider.
-
-**Note:** Binding a plugin to a provider is optional. Serverless will always consider your plugin if you don't specify a `provider`.
-
-The provider definition should be added inside the plugins constructor:
-
-```javascript
-'use strict';
-
-class ProviderDeploy {
-  constructor(serverless, options) {
-    this.serverless = serverless;
-    this.options = options;
-
-    // set the providers name here
-    this.provider = this.serverless.getProvider('providerName');
-
-    this.commands = {
-      deploy: {
-        lifecycleEvents: ['functions'],
-        options: {
-          function: {
-            usage: 'Specify the function you want to deploy (e.g. "--function myFunction")',
-            required: true,
-          },
-        },
-      },
-    };
-
-    this.hooks = {
-      'deploy:functions': this.deployFunction.bind(this),
-    };
-  }
-
-  deployFunction() {
-    console.log('Deploying function: ', this.options.function);
-  }
-}
-
-module.exports = ProviderDeploy;
-```
-
-The Plugin's functionality will now only be executed when the Serverless Service's provider matches the provider name which is defined inside the plugins constructor.
-
-### Serverless Instance
-
-The `serverless` instance which enables access to global service config during runtime is passed in as the first parameter to the plugin constructor.
-
-```javascript
-'use strict';
-
-class MyPlugin {
-  constructor(serverless, options) {
-    this.serverless = serverless;
-    this.options = options;
-
-    this.commands = {
-      log: {
-        lifecycleEvents: ['serverless'],
-      },
-    };
-
-    this.hooks = {
-      'log:serverless': this.logServerless.bind(this),
-    };
-  }
-
-  logServerless() {
-    console.log('Serverless instance: ', this.serverless);
-  }
-}
-
-module.exports = MyPlugin;
-```
-
-**Note:** [Variable references](./variables.md#reference-properties-in-serverlessyml) in the `serverless` instance are not resolved before a Plugin's constructor is called, so if you need these, make sure to wait to access those from your [hooks](#hooks).
-
-### Command Naming
-
-Command names need to be unique. If we load two commands and both want to specify the same command (e.g. we have an integrated command `deploy` and an external command also wants to use `deploy`) the Serverless CLI will print an error and exit. If you want to have your own `deploy` command you need to name it something different like `myCompanyDeploy` so they don't clash with existing plugins.
-
-### Extending the `info` command
-
-The `info` command which is used to display information about the deployment has detailed `lifecycleEvents` you can hook into to add and display custom information.
-
-**Note:** Every provider implements its own `info` plugin so you might want to take a look into the `lifecycleEvents` the provider `info` plugin exposes.
diff --git a/docs/providers/kubeless/cli-reference/deploy.md b/docs/providers/kubeless/cli-reference/deploy.md
index ec43d318e07..38766ccad4c 100644
--- a/docs/providers/kubeless/cli-reference/deploy.md
+++ b/docs/providers/kubeless/cli-reference/deploy.md
@@ -27,7 +27,6 @@ This is the simplest deployment usage possible. With this command Serverless wil
 ## Options
 
 - `--config` or `-c` Name of your configuration file, if other than `serverless.yml|.yaml|.js|.json`.
-- `--noDeploy` or `-n` Skips the deployment steps and leaves artifacts in the `.serverless` directory.
 - `--verbose` or `-v` Shows all stack events during deployment, and display any Stack Output.
 - `--package` or `-p` The path of a previously packaged deployment to get deployed (skips packaging step).
 - `--function` or `-f` Invoke `deploy function` (see above). Convenience shortcut - cannot be used with `--package`.
diff --git a/docs/providers/kubeless/cli-reference/invoke.md b/docs/providers/kubeless/cli-reference/invoke.md
index 792cf6e00ba..34892401707 100644
--- a/docs/providers/kubeless/cli-reference/invoke.md
+++ b/docs/providers/kubeless/cli-reference/invoke.md
@@ -14,7 +14,7 @@ layout: Doc
 
 # Kubeless - Invoke
 
-Invokes deployed function. It allows to send event data to the function, read logs and display other important information of the function invocation.
+Invokes a deployed function. You can send event data, read logs and display other important information of the function invocation.
 
 ```bash
 serverless invoke --function functionName
diff --git a/docs/providers/openwhisk/cli-reference/invoke.md b/docs/providers/openwhisk/cli-reference/invoke.md
index 8435db20ac3..a85837cf638 100644
--- a/docs/providers/openwhisk/cli-reference/invoke.md
+++ b/docs/providers/openwhisk/cli-reference/invoke.md
@@ -14,7 +14,7 @@ layout: Doc
 
 # OpenWhisk - Invoke
 
-Invokes deployed function. It allows to send event data to the function, read logs and display other important information of the function invocation.
+Invokes a deployed function. You can send event data, read logs and display other important information of the function invocation.
 
 ```bash
 serverless invoke [local] --function functionName
diff --git a/docs/providers/openwhisk/guide/plugins.md b/docs/providers/openwhisk/guide/plugins.md
deleted file mode 100644
index a0b769921a0..00000000000
--- a/docs/providers/openwhisk/guide/plugins.md
+++ /dev/null
@@ -1,365 +0,0 @@
-<!--
-title: Serverless Framework - Apache OpenWhisk Guide - Plugins
-menuText: Plugins
-menuOrder: 13
-description: How to install and create Plugins to extend or overwrite the functionality of the Serverless Framework
-layout: Doc
--->
-
-<!-- DOCS-SITE-LINK:START automatically generated  -->
-
-### [Read this on the main serverless docs site](https://www.serverless.com/framework/docs/providers/openwhisk/guide/plugins)
-
-<!-- DOCS-SITE-LINK:END -->
-
-# OpenWhisk - Plugins
-
-A Plugin is custom Javascript code that creates new or extends existing commands within the Serverless Framework. The Serverless Framework is merely a group of Plugins that are provided in the core. If you or your organization have a specific workflow, install a pre-written Plugin or write a plugin to customize the Framework to your needs. External Plugins are written exactly the same way as the core Plugins.
-
-- [How to create serverless plugins - Part 1](https://serverless.com/blog/writing-serverless-plugins/)
-- [How to create serverless plugins - Part 2](https://serverless.com/blog/writing-serverless-plugins-2/)
-
-## Installing Plugins
-
-External Plugins are added on a per service basis and are not applied globally. Make sure you are in your Service's root directory, then install the corresponding Plugin with the help of NPM:
-
-```
-npm install --save custom-serverless-plugin
-```
-
-We need to tell Serverless that we want to use the plugin inside our service. We do this by adding the name of the Plugin to the `plugins` section in the `serverless.yml` file.
-
-```yml
-# serverless.yml file
-
-plugins:
-  - custom-serverless-plugin
-```
-
-The `plugins` section supports two formats:
-
-Array object:
-
-```yml
-plugins:
-  - plugin1
-  - plugin2
-```
-
-Enhanced plugins object:
-
-```yml
-plugins:
-  localPath: './custom_serverless_plugins'
-  modules:
-    - plugin1
-    - plugin2
-```
-
-Plugins might want to add extra information which should be accessible to Serverless. The `custom` section in the `serverless.yml` file is the place where you can add necessary configurations for your plugins (the plugins author / documentation will tell you if you need to add anything there):
-
-```yml
-plugins:
-  - custom-serverless-plugin
-
-custom:
-  customkey: customvalue
-```
-
-## Service local plugin
-
-If you are working on a plugin or have a plugin that is just designed for one project they can be loaded from the local folder. Local plugins can be added in the `plugins` array in `serverless.yml`.
-
-By default local plugins can be added to the `.serverless_plugins` directory at the root of your service, and in the `plugins` array in `serverless.yml`.
-
-```yml
-plugins:
-  - custom-serverless-plugin
-```
-
-Local plugins folder can be changed by enhancing `plugins` object:
-
-```yml
-plugins:
-  localPath: './custom_serverless_plugins'
-  modules:
-    - custom-serverless-plugin
-```
-
-The `custom-serverless-plugin` will be loaded from the `custom_serverless_plugins` directory at the root of your service. If the `localPath` is not provided or empty `.serverless_plugins` directory will be taken as the `localPath`.
-
-The plugin will be loaded based on being named `custom-serverless-plugin.js` or `custom-serverless-plugin\index.js` in the root of `localPath` folder (`.serverless_plugins` by default).
-
-### Load Order
-
-Keep in mind that the order you define your plugins matters. When Serverless loads all the core plugins and then the custom plugins in the order you've defined them.
-
-```yml
-# serverless.yml
-
-plugins:
-  - plugin1
-  - plugin2
-```
-
-In this case `plugin1` is loaded before `plugin2`.
-
-## Writing Plugins
-
-### Concepts
-
-#### Plugin
-
-Code which defines _Commands_, any _Events_ within a _Command_, and any _Hooks_ assigned to an _Lifecycle Event_.
-
-- Command // CLI configuration, commands, subcommands, options
-  - LifecycleEvent(s) // Events that happen sequentially when the command is run
-    - Hook(s) // Code that runs when a Lifecycle Event happens during a Command
-
-#### Command
-
-A CLI _Command_ that can be called by a user, e.g. `serverless deploy`. A Command has no logic, but simply defines the CLI configuration (e.g. command, subcommands, parameters) and the _Lifecycle Events_ for the command. Every command defines its own lifecycle events.
-
-```javascript
-'use strict';
-
-class MyPlugin {
-  constructor() {
-    this.commands = {
-      deploy: {
-        lifecycleEvents: ['resources', 'functions'],
-      },
-    };
-  }
-}
-
-module.exports = MyPlugin;
-```
-
-#### Lifecycle Events
-
-Events that fire sequentially during a Command. The above example list two Events. However, for each Event, and additional `before` and `after` event is created. Therefore, six Events exist in the above example:
-
-- `before:deploy:resources`
-- `deploy:resources`
-- `after:deploy:resources`
-- `before:deploy:functions`
-- `deploy:functions`
-- `after:deploy:functions`
-
-The name of the command in front of lifecycle events when they are used for Hooks.
-
-#### Hooks
-
-A Hook binds code to any lifecycle event from any command.
-
-```javascript
-'use strict';
-
-class Deploy {
-  constructor() {
-    this.commands = {
-      deploy: {
-        lifecycleEvents: ['resources', 'functions'],
-      },
-    };
-
-    this.hooks = {
-      'before:deploy:resources': this.beforeDeployResources,
-      'deploy:resources': this.deployResources,
-      'after:deploy:functions': this.afterDeployFunctions,
-    };
-  }
-
-  beforeDeployResources() {
-    console.log('Before Deploy Resources');
-  }
-
-  deployResources() {
-    console.log('Deploy Resources');
-  }
-
-  afterDeployFunctions() {
-    console.log('After Deploy Functions');
-  }
-}
-
-module.exports = Deploy;
-```
-
-### Nesting Commands
-
-You can also nest commands, e.g. if you want to provide a command `serverless deploy single`. Those nested commands have their own lifecycle events and do not inherit them from their parents.
-
-```javascript
-'use strict';
-
-class MyPlugin {
-  constructor() {
-    this.commands = {
-      deploy: {
-        lifecycleEvents: ['resources', 'functions'],
-        commands: {
-          function: {
-            lifecycleEvents: ['package', 'deploy'],
-          },
-        },
-      },
-    };
-  }
-}
-
-module.exports = MyPlugin;
-```
-
-### Defining Options
-
-Each (sub)command can have multiple Options.
-
-Options are passed in with a double dash (`--`) like this: `serverless function deploy --function functionName`.
-
-Option Shortcuts are passed in with a single dash (`-`) like this: `serverless function deploy -f functionName`.
-
-The `options` object will be passed in as the second parameter to the constructor of your plugin.
-
-In it, you can optionally add a `shortcut` property, as well as a `required` property. The Framework will return an error if a `required` Option is not included.
-
-**Note:** At this time, the Serverless Framework does not use parameters.
-
-```javascript
-'use strict';
-
-class Deploy {
-  constructor(serverless, options) {
-    this.serverless = serverless;
-    this.options = options;
-
-    this.commands = {
-      deploy: {
-        lifecycleEvents: ['functions'],
-        options: {
-          function: {
-            usage: 'Specify the function you want to deploy (e.g. "--function myFunction")',
-            shortcut: 'f',
-            required: true,
-          },
-        },
-      },
-    };
-
-    this.hooks = {
-      'deploy:functions': this.deployFunction.bind(this),
-    };
-  }
-
-  deployFunction() {
-    console.log('Deploying function: ', this.options.function);
-  }
-}
-
-module.exports = Deploy;
-```
-
-### Provider Specific Plugins
-
-Plugins can be provider specific which means that they are bound to a provider.
-
-**Note:** Binding a plugin to a provider is optional. Serverless will always consider your plugin if you don't specify a `provider`.
-
-The provider definition should be added inside the plugins constructor:
-
-```javascript
-'use strict';
-
-class ProviderDeploy {
-  constructor(serverless, options) {
-    this.serverless = serverless;
-    this.options = options;
-
-    // set the providers name here
-    this.provider = this.serverless.getProvider('providerName');
-
-    this.commands = {
-      deploy: {
-        lifecycleEvents: ['functions'],
-        options: {
-          function: {
-            usage: 'Specify the function you want to deploy (e.g. "--function myFunction")',
-            required: true,
-          },
-        },
-      },
-    };
-
-    this.hooks = {
-      'deploy:functions': this.deployFunction.bind(this),
-    };
-  }
-
-  deployFunction() {
-    console.log('Deploying function: ', this.options.function);
-  }
-}
-
-module.exports = ProviderDeploy;
-```
-
-The Plugin's functionality will now only be executed when the Serverless Service's provider matches the provider name which is defined inside the plugins constructor.
-
-### Serverless Instance
-
-The `serverless` instance which enables access to global service config during runtime is passed in as the first parameter to the plugin constructor.
-
-```javascript
-'use strict';
-
-class MyPlugin {
-  constructor(serverless, options) {
-    this.serverless = serverless;
-    this.options = options;
-
-    this.commands = {
-      log: {
-        lifecycleEvents: ['serverless'],
-      },
-    };
-
-    this.hooks = {
-      'log:serverless': this.logServerless.bind(this),
-    };
-  }
-
-  logServerless() {
-    console.log('Serverless instance: ', this.serverless);
-  }
-}
-
-module.exports = MyPlugin;
-```
-
-**Note:** [Variable references](./variables.md#reference-properties-in-serverlessyml) in the `serverless` instance are not resolved before a Plugin's constructor is called, so if you need these, make sure to wait to access those from your [hooks](#hooks).
-
-### Command Naming
-
-Command names need to be unique. If we load two commands and both want to specify the same command (e.g. we have an integrated command `deploy` and an external command also wants to use `deploy`) the Serverless CLI will print an error and exit. If you want to have your own `deploy` command you need to name it something different like `myCompanyDeploy` so they don't clash with existing plugins.
-
-### Extending the `info` command
-
-The `info` command which is used to display information about the deployment has detailed `lifecycleEvents` you can hook into to add and display custom information.
-
-Here's an example overview of the info lifecycle events the AWS implementation exposes:
-
-```
--> info:info
-  -> aws:info:validate
-  -> aws:info:gatherData
-  -> aws:info:displayServiceInfo
-  -> aws:info:displayApiKeys
-  -> aws:info:displayEndpoints
-  -> aws:info:displayFunctions
-  -> aws:info:displayStackOutputs
-```
-
-Here you could e.g. hook into `after:aws:info:gatherData` and implement your own data collection and display it to the user.
-
-**Note:** Every provider implements its own `info` plugin so you might want to take a look into the `lifecycleEvents` the provider `info` plugin exposes.
diff --git a/docs/providers/openwhisk/guide/serverless.yml.md b/docs/providers/openwhisk/guide/serverless.yml.md
index 4e18c0de3ca..aa3257cb90f 100644
--- a/docs/providers/openwhisk/guide/serverless.yml.md
+++ b/docs/providers/openwhisk/guide/serverless.yml.md
@@ -21,7 +21,7 @@ Here is a list of all available properties in `serverless.yml` when the provider
 
 service: myService
 
-frameworkVersion: '2'
+frameworkVersion: '3'
 
 provider:
   name: openwhisk
diff --git a/docs/providers/spotinst/cli-reference/invoke.md b/docs/providers/spotinst/cli-reference/invoke.md
index 67cbaf2462c..72fae2abb22 100755
--- a/docs/providers/spotinst/cli-reference/invoke.md
+++ b/docs/providers/spotinst/cli-reference/invoke.md
@@ -14,7 +14,7 @@ layout: Doc
 
 # Spotinst Functions - Invoke
 
-Invokes deployed function. It allows to send event data to the function, read logs and display other important information of the function invocation.
+Invokes a deployed function. You can send event data, read logs and display other important information of the function invocation.
 
 ```bash
 serverless invoke -f functionName
diff --git a/docs/providers/spotinst/guide/IAM-roles.md b/docs/providers/spotinst/guide/iam-roles.md
similarity index 100%
rename from docs/providers/spotinst/guide/IAM-roles.md
rename to docs/providers/spotinst/guide/iam-roles.md
diff --git a/docs/providers/spotinst/guide/intro.md b/docs/providers/spotinst/guide/intro.md
index 3eac3d1b0fc..4d8921e91dd 100644
--- a/docs/providers/spotinst/guide/intro.md
+++ b/docs/providers/spotinst/guide/intro.md
@@ -14,7 +14,7 @@ layout: Doc
 
 # Spotinst - Introduction
 
-Spotinst Functions is a Multi-Cloud Functions as a Service (FaaS) platform that utilizes affordable compute and network infrastracture.
+Spotinst Functions is a Multi-Cloud Functions as a Service (FaaS) platform that utilizes affordable compute and network infrastructure.
 Spotinst will take care of everything required to run and scale your code with high availability, advanced analytics and monitoring, and in low execution prices by finding the best available compute possible based on **Spot Pricing** across all cloud providers (Amazon Web Services, Microsoft Azure, Google Cloud, IBM Cloud, Oracle and even Bare-metal servers on Equinix).
 
 When creating a `Function`, you can specify your desired `Cloud providers`, as well as the `geographical location` (for example `US East` or `Europe`). In addition you can defines triggers to execute the functions.
diff --git a/docs/providers/tencent/cli-reference/invoke.md b/docs/providers/tencent/cli-reference/invoke.md
index c1105b34128..75855d89678 100644
--- a/docs/providers/tencent/cli-reference/invoke.md
+++ b/docs/providers/tencent/cli-reference/invoke.md
@@ -14,7 +14,7 @@ layout: Doc
 
 # Tencent-SCF - Invoke
 
-Invokes deployed function. It allows to send event data to the function, read logs and display other important information of the function invocation.
+Invokes a deployed function. You can send event data, read logs and display other important information of the function invocation.
 
 ```bash
 serverless invoke --function functionName
diff --git a/docs/providers/tencent/events/CMQ.md b/docs/providers/tencent/events/cmq.md
similarity index 100%
rename from docs/providers/tencent/events/CMQ.md
rename to docs/providers/tencent/events/cmq.md
diff --git a/docs/providers/tencent/events/COS.md b/docs/providers/tencent/events/cos.md
similarity index 98%
rename from docs/providers/tencent/events/COS.md
rename to docs/providers/tencent/events/cos.md
index 932b08aab4a..8158c70e71c 100644
--- a/docs/providers/tencent/events/COS.md
+++ b/docs/providers/tencent/events/cos.md
@@ -69,7 +69,7 @@ When an object creation or deletion event occurs in the specified COS bucket, ev
           "name": "testpic",
           "appid": "1253970026"
         },
-        "cosNotificationId": "unkown"
+        "cosNotificationId": "unknown"
       },
       "event": {
         "eventName": "cos:ObjectCreated:*",
diff --git a/docs/providers/tencent/guide/plugins.md b/docs/providers/tencent/guide/plugins.md
deleted file mode 100644
index b429521a38d..00000000000
--- a/docs/providers/tencent/guide/plugins.md
+++ /dev/null
@@ -1,420 +0,0 @@
-<!--
-title: Tencent Cloud - Serverless Cloud Function (SCF) Guide - Plugins | Serverless Framework
-menuText: Plugins
-menuOrder: 13
-description: How to install and create Plugins to extend or overwrite the functionality of the Serverless Framework
-layout: Doc
--->
-
-<!-- DOCS-SITE-LINK:START automatically generated  -->
-
-### [Read this on the main serverless docs site](https://www.serverless.com/framework/docs/providers/tencent/guide/plugins/)
-
-<!-- DOCS-SITE-LINK:END -->
-
-# Plugins
-
-A Plugin is custom Javascript code that creates new or extends existing commands within the Serverless Framework. The Serverless Framework is merely a group of Plugins that are provided in the core. If you or your organization have a specific workflow, install a pre-written Plugin or write a plugin to customize the Framework to your needs. External Plugins are written exactly the same way as the core Plugins.
-
-- [How to create serverless plugins - Part 1](https://serverless.com/blog/writing-serverless-plugins/)
-- [How to create serverless plugins - Part 2](https://serverless.com/blog/writing-serverless-plugins-2/)
-
-## Installing Plugins
-
-External Plugins are added on a per service basis and are not applied globally. Make sure you are in your Service's root directory, then install the corresponding Plugin with the help of NPM:
-
-```
-npm install --save custom-serverless-plugin
-```
-
-We need to tell Serverless that we want to use the plugin inside our service. We do this by adding the name of the Plugin to the `plugins` section in the `serverless.yml` file.
-
-```yml
-# serverless.yml file
-
-plugins:
-  - custom-serverless-plugin
-```
-
-The `plugins` section supports two formats:
-
-Array object:
-
-```yml
-plugins:
-  - plugin1
-  - plugin2
-```
-
-Enhanced plugins object:
-
-```yml
-plugins:
-  localPath: './custom_serverless_plugins'
-  modules:
-    - plugin1
-    - plugin2
-```
-
-Plugins might want to add extra information which should be accessible to Serverless. The `custom` section in the `serverless.yml` file is the place where you can add necessary configurations for your plugins (the plugins author / documentation will tell you if you need to add anything there):
-
-```yml
-plugins:
-  - custom-serverless-plugin
-
-custom:
-  customkey: customvalue
-```
-
-## Service local plugin
-
-If you are working on a plugin or have a plugin that is just designed for one project, it can be loaded from the local `.serverless_plugins` folder at the root of your service. Local plugins can be added in the `plugins` array in `serverless.yml`.
-
-```yml
-plugins:
-  - custom-serverless-plugin
-```
-
-Local plugins folder can be changed by enhancing `plugins` object:
-
-```yml
-plugins:
-  localPath: './custom_serverless_plugins'
-  modules:
-    - custom-serverless-plugin
-```
-
-The `custom-serverless-plugin` will be loaded from the `custom_serverless_plugins` directory at the root of your service. If the `localPath` is not provided or empty, the `.serverless_plugins` directory will be used.
-
-The plugin will be loaded based on being named `custom-serverless-plugin.js` or `custom-serverless-plugin\index.js` in the root of `localPath` folder (`.serverless_plugins` by default).
-
-If you want to load a plugin from a specific directory without affecting other plugins, you can also specify a path relative to the root of your service:
-
-```yaml
-plugins:
-  # This plugin will be loaded from the `.serverless_plugins/` or `node_modules/` directories
-  - custom-serverless-plugin
-  # This plugin will be loaded from the `sub/directory/` directory
-  - ./sub/directory/another-custom-plugin
-```
-
-### Load Order
-
-Keep in mind that the order you define your plugins matters. When Serverless loads all the core plugins and then the custom plugins in the order you've defined them.
-
-```yml
-# serverless.yml
-
-plugins:
-  - plugin1
-  - plugin2
-```
-
-In this case `plugin1` is loaded before `plugin2`.
-
-## Writing Plugins
-
-### Concepts
-
-#### Plugin
-
-Code which defines _Commands_, any _Events_ within a _Command_, and any _Hooks_ assigned to a _Lifecycle Event_.
-
-- Command // CLI configuration, commands, subcommands, options
-  - LifecycleEvent(s) // Events that happen sequentially when the command is run
-    - Hook(s) // Code that runs when a Lifecycle Event happens during a Command
-
-#### Command
-
-A CLI _Command_ that can be called by a user, e.g. `serverless deploy`. A Command has no logic, but simply defines the CLI configuration (e.g. command, subcommands, parameters) and the _Lifecycle Events_ for the command. Every command defines its own lifecycle events.
-
-```javascript
-'use strict';
-
-class MyPlugin {
-  constructor() {
-    this.commands = {
-      deploy: {
-        lifecycleEvents: ['resources', 'functions'],
-      },
-    };
-  }
-}
-
-module.exports = MyPlugin;
-```
-
-#### Lifecycle Events
-
-Events that fire sequentially during a Command. The above example lists two Events. However, for each Event, an additional `before` and `after` event is created. Therefore, six Events exist in the above example:
-
-- `before:deploy:resources`
-- `deploy:resources`
-- `after:deploy:resources`
-- `before:deploy:functions`
-- `deploy:functions`
-- `after:deploy:functions`
-
-The name of the command in front of lifecycle events when they are used for Hooks.
-
-#### Hooks
-
-A Hook binds code to any lifecycle event from any command.
-
-```javascript
-'use strict';
-
-class Deploy {
-  constructor() {
-    this.commands = {
-      deploy: {
-        lifecycleEvents: ['resources', 'functions'],
-      },
-    };
-
-    this.hooks = {
-      'before:deploy:resources': this.beforeDeployResources,
-      'deploy:resources': this.deployResources,
-      'after:deploy:functions': this.afterDeployFunctions,
-    };
-  }
-
-  beforeDeployResources() {
-    console.log('Before Deploy Resources');
-  }
-
-  deployResources() {
-    console.log('Deploy Resources');
-  }
-
-  afterDeployFunctions() {
-    console.log('After Deploy Functions');
-  }
-}
-
-module.exports = Deploy;
-```
-
-### Custom Variable Types
-
-As of version 1.52.0 of the Serverless framework, plugins can officially implement their own
-variable types for use in serverless config files.
-
-Example:
-
-```javascript
-'use strict';
-
-class EchoTestVarPlugin {
-  constructor() {
-    getEchoTestValue(src) {
-      return src.slice(5);
-    }
-    getDependentEchoTestValue(src) {
-      return src.slice(5);
-    }
-    this.variableResolvers = {
-      echo: this.getEchoTestValue,
-      // if a variable type depends on profile/stage/region/credentials, to avoid infinite loops in
-      // trying to resolve variables that depend on themselves, specify as such by setting a
-      // dependendServiceName property on the variable getter
-      echoStageDependent: {
-        resolver: this.getDependentEchoTestValue,
-        serviceName: 'echo that isnt prepopulated',
-        isDisabledAtPrepopulation: true
-    };
-  }
-}
-```
-
-The above plugin will add support for variables like `${echo:foobar}` and resolve to the key. EG:
-`${echo:foobar}` will resolve to `'foobar'`.
-
-#### `this.variableResolvers` structure
-
-The data structure of `this.variableResolvers` is an `Object` with keys that are either a
-`function` or `Object`.
-
-The keys are used to generate the regex which matches the variable type. Eg, a key of `test` will
-match variables like `${test:foobar}`.
-
-If the value is a `function` it is used to resolve variables matched. It must be `async` or return
-a `Promise` and accepts the variable string(with prefix but not the wrapping variable syntax,
-eg `test:foobar`) as it's only argument.
-
-If the value is an `Object`, it can have the following keys:
-
-- `resolver` - required, a function, same requirements as described above.
-- `isDisabledAtPrepopulation` - optional, a boolean, disable this variable type when populating
-  stage, region, and credentials. This is important for variable types that depend on Tencent Cloud or other
-  service that depend on those variables
-- `serviceName` - required if `isDisabledAtPrepopulation === true`, a string to display to users
-  if they try to use the variable type in one of the fields disabled for populating
-  stage/region/credentials.
-
-### Nesting Commands
-
-You can also nest commands, e.g. if you want to provide a command `serverless deploy function`. Those nested commands have their own lifecycle events and do not inherit them from their parents.
-
-```javascript
-'use strict';
-
-class MyPlugin {
-  constructor() {
-    this.commands = {
-      deploy: {
-        lifecycleEvents: ['resources', 'functions'],
-        commands: {
-          function: {
-            lifecycleEvents: ['package', 'deploy'],
-          },
-        },
-      },
-    };
-  }
-}
-
-module.exports = MyPlugin;
-```
-
-### Defining Options
-
-Each (sub)command can have multiple Options.
-
-Options are passed in with a double dash (`--`) like this: `serverless function deploy --function functionName`.
-
-Option Shortcuts are passed in with a single dash (`-`) like this: `serverless function deploy -f functionName`.
-
-The `options` object will be passed in as the second parameter to the constructor of your plugin.
-
-In it, you can optionally add a `shortcut` property, as well as a `required` property. The Framework will return an error if a `required` Option is not included. You can also set a `default` property if your option is not required.
-
-**Note:** At this time, the Serverless Framework does not use parameters.
-
-```javascript
-'use strict';
-
-class Deploy {
-  constructor(serverless, options) {
-    this.serverless = serverless;
-    this.options = options;
-
-    this.commands = {
-      deploy: {
-        lifecycleEvents: ['functions'],
-        options: {
-          function: {
-            usage: 'Specify the function you want to deploy (e.g. "--function myFunction")',
-            shortcut: 'f',
-            required: true,
-          },
-          stage: {
-            usage: 'Specify the stage you want to deploy to. (e.g. "--stage prod")',
-            shortcut: 's',
-            default: 'dev',
-          },
-        },
-      },
-    };
-
-    this.hooks = {
-      'deploy:functions': this.deployFunction.bind(this),
-    };
-  }
-
-  deployFunction() {
-    console.log('Deploying function: ', this.options.function);
-  }
-}
-
-module.exports = Deploy;
-```
-
-### Provider Specific Plugins
-
-Plugins can be provider specific which means that they are bound to a provider.
-
-**Note:** Binding a plugin to a provider is optional. Serverless will always consider your plugin if you don't specify a `provider`.
-
-The provider definition should be added inside the plugins constructor:
-
-```javascript
-'use strict';
-
-class ProviderDeploy {
-  constructor(serverless, options) {
-    this.serverless = serverless;
-    this.options = options;
-
-    // set the providers name here
-    this.provider = this.serverless.getProvider('providerName');
-
-    this.commands = {
-      deploy: {
-        lifecycleEvents: ['functions'],
-        options: {
-          function: {
-            usage: 'Specify the function you want to deploy (e.g. "--function myFunction")',
-            required: true,
-          },
-        },
-      },
-    };
-
-    this.hooks = {
-      'deploy:functions': this.deployFunction.bind(this),
-    };
-  }
-
-  deployFunction() {
-    console.log('Deploying function: ', this.options.function);
-  }
-}
-
-module.exports = ProviderDeploy;
-```
-
-The Plugin's functionality will now only be executed when the Serverless Service's provider matches the provider name which is defined inside the plugins constructor.
-
-### Serverless Instance
-
-The `serverless` instance which enables access to global service config during runtime is passed in as the first parameter to the plugin constructor.
-
-```javascript
-'use strict';
-
-class MyPlugin {
-  constructor(serverless, options) {
-    this.serverless = serverless;
-    this.options = options;
-
-    this.commands = {
-      log: {
-        lifecycleEvents: ['serverless'],
-      },
-    };
-
-    this.hooks = {
-      'log:serverless': this.logServerless.bind(this),
-    };
-  }
-
-  logServerless() {
-    console.log('Serverless instance: ', this.serverless);
-  }
-}
-
-module.exports = MyPlugin;
-```
-
-**Note:** [Variable references](./variables.md#reference-properties-in-serverlessyml) in the `serverless` instance are not resolved before a Plugin's constructor is called, so if you need these, make sure to wait to access those from your [hooks](#hooks).
-
-### Command Naming
-
-Command names need to be unique. If we load two commands and both want to specify the same command (e.g. we have an integrated command `deploy` and an external command also wants to use `deploy`) the Serverless CLI will print an error and exit. If you want to have your own `deploy` command you need to name it something different like `myCompanyDeploy` so they don't clash with existing plugins.
-
-### Extending the `info` command
-
-The `info` command which is used to display information about the deployment has detailed `lifecycleEvents` you can hook into to add and display custom information.
-
-**Note:** Every provider implements its own `info` plugin so you might want to take a look into the `lifecycleEvents` the provider `info` plugin exposes.
diff --git a/docs/telemetry.md b/docs/telemetry.md
index fbe7f330681..e81394476a6 100644
--- a/docs/telemetry.md
+++ b/docs/telemetry.md
@@ -38,16 +38,17 @@ In addition to telemetry, Serverless Framework occasionally informs you about ne
 
 ### Adjusting/disabling notifications
 
-Notifications can be configured by `SLS_NOTIFICATIONS_MODE` environment variable. If accepts three distinct values:
+Notifications can be configured by `SLS_NOTIFICATIONS_MODE` environment variable. If accepts following distinct values:
 
-- `0` - in this mode all notifications will be disabled
-- `1` - in this mode only notifications about minor and major version upgrades will be visible
-- `2` - in this mode all notifications will be visible
+- `off` (in older versions `0`) - No notifications will be shown
+- `upgrades-only` (in older versions `1`) - Only notifications about minor and major version upgrades will be visible
+- `on` (in older versions `2`) - All notifications will be visible
+- `force` (in older versions `3`) - All notifications will be visible and will be presented constantly ignoring the visibility threshold setting
 
-By default, the notifications are turned on (use mode `'2'`), with the exception of CI environments where the default mode is set to `'1'`.
+By default, the notifications are turned on (mode `'on'`), with the exception of CI environments where the default mode is set to `'upgrades-only'`.
 
 To adjust the notifications, set the `SLS_NOTIFICATIONS_MODE` to one of the values above, e.g.:
 
 ```
-SLS_NOTIFICATIONS_MODE=0 sls deploy
+SLS_NOTIFICATIONS_MODE=upgrades-only sls deploy
 ```
diff --git a/lib/Serverless.js b/lib/Serverless.js
deleted file mode 100644
index 0864eededb9..00000000000
--- a/lib/Serverless.js
+++ /dev/null
@@ -1,349 +0,0 @@
-'use strict';
-
-const path = require('path');
-const os = require('os');
-const ensureString = require('type/string/ensure');
-const ensureArray = require('type/array/ensure');
-const ensurePlainObject = require('type/plain-object/ensure');
-const CLI = require('./classes/CLI');
-const Config = require('./classes/Config');
-const YamlParser = require('./classes/YamlParser');
-const PluginManager = require('./classes/PluginManager');
-const Utils = require('./classes/Utils');
-const Service = require('./classes/Service');
-const Variables = require('./classes/Variables');
-const ConfigSchemaHandler = require('./classes/ConfigSchemaHandler');
-const ServerlessError = require('./serverless-error');
-const version = require('./../package.json').version;
-const isStandaloneExecutable = require('./utils/isStandaloneExecutable');
-const resolveConfigurationPath = require('./cli/resolve-configuration-path');
-const logDeprecation = require('./utils/logDeprecation');
-const eventuallyUpdate = require('./utils/eventuallyUpdate');
-const resolveLocalServerlessPath = require('./cli/resolve-local-serverless-path');
-const commmandsSchema = require('./cli/commands-schema');
-const resolveCliInput = require('./cli/resolve-input');
-const readConfiguration = require('./configuration/read');
-const conditionallyLoadDotenv = require('./cli/conditionally-load-dotenv');
-
-class Serverless {
-  constructor(config) {
-    let configObject = config;
-    configObject = configObject || {};
-    this._isInvokedByGlobalInstallation = Boolean(configObject._isInvokedByGlobalInstallation);
-
-    if (configObject.serviceDir != null) {
-      // Modern intialization way, to be the only supported way with v3
-      this.serviceDir = path.resolve(
-        ensureString(configObject.serviceDir, {
-          name: 'config.serviceDir',
-          Error: ServerlessError,
-        })
-      );
-      this.configurationFilename = ensureString(configObject.configurationFilename, {
-        name: 'config.configurationFilename',
-        Error: ServerlessError,
-      });
-      if (path.isAbsolute(this.configurationFilename)) {
-        throw new ServerlessError(
-          `"config.configurationFilename" cannot be absolute path. Received: ${configObject.configurationFilename}`
-        );
-      }
-      this.configurationInput = ensurePlainObject(configObject.configuration, {
-        name: 'config.configuration',
-        Error: ServerlessError,
-      });
-      this.isConfigurationInputResolved = Boolean(configObject.isConfigurationResolved);
-    } else if (configObject.configurationPath != null) {
-      // Semi-modern initialization way, mid-step introduced over the course of v2 refactor
-      const configurationPath = path.resolve(
-        ensureString(configObject.configurationPath, {
-          name: 'config.configurationPath',
-          Error: ServerlessError,
-        })
-      );
-      this.serviceDir = process.cwd();
-      this.configurationFilename = configurationPath.slice(this.serviceDir.length + 1);
-      this.configurationInput = ensurePlainObject(configObject.configuration, {
-        isOptional: true,
-        name: 'config.configuration',
-        Error: ServerlessError,
-      });
-      if (this.configurationInput) {
-        this.isConfigurationInputResolved = Boolean(configObject.isConfigurationResolved);
-      }
-      this._shouldReportMissingServiceDeprecation = true;
-    } else if (
-      configObject.configurationPath === undefined &&
-      configObject.serviceDir === undefined
-    ) {
-      // Old intialization way
-      this._shouldResolveConfigurationInternally = true;
-      this._shouldReportMissingServiceDeprecation = true;
-    }
-    const commands = ensureArray(configObject.commands, { isOptional: true });
-    const options = ensurePlainObject(configObject.options, { isOptional: true });
-    if (!commands || !options) {
-      this._shouldReportCommandsDeprecation = true;
-      this.processedInput = resolveCliInput();
-    } else {
-      this.processedInput = { commands, options };
-    }
-    this.hasResolvedCommandsExternally = Boolean(configObject.hasResolvedCommandsExternally);
-
-    // Due to design flaw properties of configObject (which is to be merged onto `this.config`)
-    // also are subject to variables resolution.
-    // To avoid that we clear configObject after consuming it's properties.
-    // Once new variables engine is in, we can remove that patch
-    delete configObject.configurationPath;
-    delete configObject.configuration;
-    delete configObject.serviceDir;
-    delete configObject._isInvokedByGlobalInstallation;
-    delete configObject.commands;
-    delete configObject.isConfigurationResolved;
-    delete configObject.hasResolvedCommandsExternally;
-    delete configObject.options;
-
-    this.providers = {};
-
-    this.version = version;
-
-    this.yamlParser = new YamlParser(this);
-    this.utils = new Utils(this);
-    this.service = new Service(this);
-    this.variables = new Variables(this);
-    this.pluginManager = new PluginManager(this);
-    this.configSchemaHandler = new ConfigSchemaHandler(this);
-
-    this.config = new Config(this, configObject);
-
-    this.classes = {};
-    this.classes.CLI = CLI;
-    this.classes.YamlParser = YamlParser;
-    this.classes.Utils = Utils;
-    this.classes.Service = Service;
-    this.classes.Variables = Variables;
-    this.classes.Error = ServerlessError;
-    this.classes.PluginManager = PluginManager;
-    this.classes.ConfigSchemaHandler = ConfigSchemaHandler;
-
-    this.serverlessDirPath = path.join(os.homedir(), '.serverless');
-    this.isStandaloneExecutable = isStandaloneExecutable;
-    this.isLocallyInstalled = false;
-    this.triggeredDeprecations = logDeprecation.triggeredDeprecations;
-
-    // TODO: Remove once "@serverless/enterprise-plugin" is integrated into this repository
-    this._commandsSchema = commmandsSchema;
-  }
-
-  async init() {
-    if (!this._isInvokedByGlobalInstallation) {
-      if (this._shouldReportMissingServiceDeprecation) {
-        this._logDeprecation(
-          'MISSING_SERVICE_CONFIGURATION',
-          'Serverless constructor expects service configuration details to be provided.\n' +
-            'Starting from next major Serverless will no longer auto resolve it internally.'
-        );
-      }
-      if (this._shouldReportCommandsDeprecation) {
-        this._logDeprecation(
-          'MISSING_COMMANDS_OR_OPTIONS_AT_CONSTRUCTION',
-          'Serverless constructor expects resolved CLI commands and options to be provided ' +
-            'via "config.commands" and "config.options".\n' +
-            'Starting from next major Serverless will no longer auto resolve CLI arguments internally.'
-        );
-      }
-    }
-    if (this._shouldResolveConfigurationInternally) {
-      const configurationPath = await resolveConfigurationPath();
-      if (configurationPath) {
-        this.serviceDir = process.cwd();
-        this.configurationFilename = configurationPath.slice(this.serviceDir.length + 1);
-      }
-    }
-    if (this.configurationFilename && !this.configurationInput) {
-      this.configurationInput = await (async () => {
-        try {
-          return await readConfiguration(path.resolve(this.serviceDir, this.configurationFilename));
-        } catch (error) {
-          if (resolveCliInput().isHelpRequest) return null;
-          throw error;
-        }
-      })();
-    }
-
-    // create an instanceId (can be e.g. used when a predictable random value is needed)
-    this.instanceId = new Date().getTime().toString();
-
-    // create a new CLI instance
-    this.cli = new this.classes.CLI(this);
-
-    await this.eventuallyFallbackToLocal();
-    if (this.isOverridenByLocal) return;
-    eventuallyUpdate(this);
-    // set the options and commands which were processed by the CLI
-    this.pluginManager.setCliOptions(this.processedInput.options);
-    this.pluginManager.setCliCommands(this.processedInput.commands);
-
-    // TODO: Remove with next major
-    await this.loadEnvVariables();
-
-    await this.service.load(this.processedInput.options);
-    // load all plugins
-    await this.pluginManager.loadAllPlugins(this.service.plugins);
-    // give the CLI the plugins and commands so that it can print out
-    // information such as options when the user enters --help
-    this.cli.setLoadedPlugins(this.pluginManager.getPlugins());
-    this.cli.setLoadedCommands(this.pluginManager.getCommands());
-    await this.pluginManager.updateAutocompleteCacheFile();
-  }
-  async eventuallyFallbackToLocal() {
-    if (
-      this.configurationInput &&
-      this.configurationInput.enableLocalInstallationFallback != null
-    ) {
-      this._logDeprecation(
-        'DISABLE_LOCAL_INSTALLATION_FALLBACK_SETTING',
-        'Starting with next major version, "enableLocalInstallationFallback" setting will no longer be supported.' +
-          'CLI will unconditionally fallback to service local installation when its found.\n' +
-          'Remove this setting to clear this deprecation warning'
-      );
-    }
-    if (this.isLocallyInstalled) return;
-    const localServerlessPath = await resolveLocalServerlessPath();
-    if (!localServerlessPath) return;
-    if (localServerlessPath === __filename) {
-      this.isLocallyInstalled = true;
-      return;
-    }
-    if (
-      this.configurationInput &&
-      this.configurationInput.enableLocalInstallationFallback != null &&
-      !this.configurationInput.enableLocalInstallationFallback
-    ) {
-      return;
-    }
-    this.cli.log('Running "serverless" installed locally (in service node_modules)');
-    // TODO: Replace below fallback logic with more straightforward one at top of the CLI
-    // when we willl drop support for the "disableLocalInstallationFallback" setting
-    this.isOverridenByLocal = true;
-    const ServerlessLocal = require(localServerlessPath);
-    const serverlessLocal = new ServerlessLocal({
-      serviceDir: this.serviceDir || null,
-      configurationFilename: this.configurationFilename,
-      configurationPath:
-        (this.configurationFilename && path.resolve(this.serviceDir, this.configurationFilename)) ||
-        null,
-      configuration: this.configurationInput,
-      isConfigurationResolved: this.isConfigurationInputResolved,
-      hasResolvedCommandsExternally: this.hasResolvedCommandsExternally,
-      commands: this.processedInput.commands,
-      options: this.processedInput.options,
-      _isInvokedByGlobalInstallation: true,
-    });
-    serverlessLocal.isLocallyInstalled = true;
-    if (!serverlessLocal._isInvokedByGlobalInstallation) {
-      // if we fallback to older version it may recognize "isInvokedByGlobalInstallation" instead
-      // of "_isInvokedByGlobalInstallation". Ensure to set it, in such case
-      serverlessLocal.isInvokedByGlobalInstallation = true;
-    }
-    this.invokedInstance = serverlessLocal;
-    await serverlessLocal.init();
-  }
-
-  async loadEnvVariables() {
-    const configurationInput = this.configurationInput;
-    if (this.configurationInput == null) return;
-    await conditionallyLoadDotenv(this.processedInput.options, configurationInput);
-  }
-
-  async run() {
-    if (!this.hasResolvedCommandsExternally) {
-      // Invoked by older global version. Ensure to have command schema saturated
-      // which is needed for complete help output
-      // TODO: Remove with next major
-      const commandsSchema = require('./cli/commands-schema/resolve-final')(
-        this.pluginManager.externalPlugins,
-        {
-          providerName: this.service.providerName,
-        }
-      );
-      const resolveInput = require('./cli/resolve-input');
-      resolveInput.clear();
-      resolveInput(commandsSchema);
-    }
-    if (this.cli.displayHelp(this.processedInput)) {
-      return;
-    }
-    this.cli.suppressLogIfPrintCommand(this.processedInput);
-
-    // make sure the command exists before doing anything else
-    this.pluginManager.validateCommand(this.processedInput.commands);
-
-    if (!this.isConfigurationInputResolved) {
-      // populate variables after --help, otherwise help may fail to print
-      // (https://github.com/serverless/serverless/issues/2041)
-      await this.variables.populateService(this.pluginManager.cliOptions);
-    } else {
-      // Some plugins resolve additional variables on their own by runnning `variables.populateObject`
-      // e.g. https://github.com/serverless-operations/serverless-step-functions/blob/016da8db78f1972ba80d37941c34c8fd038fd8ca/lib/yamlParser.js#L26
-      // and that requires `variableSyntax` and `options` initizalization which is guaranteed by
-      // `variables.populateService`. Below lines ensure they're set
-      this.variables.loadVariableSyntax();
-      this.variables.options = this.pluginManager.cliOptions;
-      if (process.env.SLS_DEBUG) {
-        this.cli.log(
-          'Skipping variables resolution with old resolver ' +
-            '(new resolver reported no more variables to resolve)'
-        );
-      }
-    }
-
-    // merge arrays after variables have been populated
-    // (https://github.com/serverless/serverless/issues/3511)
-    this.service.mergeArrays();
-
-    // populate function names after variables are loaded in case functions were externalized
-    // (https://github.com/serverless/serverless/issues/2997)
-    this.service.setFunctionNames(this.processedInput.options);
-
-    // If in context of service, validate the service configuration
-    if (this.serviceDir) this.service.validate();
-
-    // trigger the plugin lifecycle when there's something which should be processed
-    await this.pluginManager.run(this.processedInput.commands);
-  }
-
-  setProvider(name, provider) {
-    this.providers[name] = provider;
-  }
-
-  getProvider(name) {
-    return this.providers[name] ? this.providers[name] : false;
-  }
-
-  getVersion() {
-    return this.version;
-  }
-
-  // Only for internal use
-  _logDeprecation(code, message) {
-    return logDeprecation(code, message, { serviceConfig: this.service });
-  }
-
-  // To be used by external plugins
-  logDeprecation(code, message) {
-    return this._logDeprecation(`EXT_${ensureString(code)}`, ensureString(message));
-  }
-
-  // If this instance is initialized by older version of the Framework,
-  // it may set "isInvokedByGlobalInstallation" directly.
-  // This fallback ensures it ends at "_isInvokedByGlobalInstallation"
-  set isInvokedByGlobalInstallation(value) {
-    this._isInvokedByGlobalInstallation = value;
-  }
-  get isInvokedByGlobalInstallation() {
-    return this._isInvokedByGlobalInstallation;
-  }
-}
-
-module.exports = Serverless;
diff --git a/lib/aws/has-local-credentials.js b/lib/aws/has-local-credentials.js
new file mode 100644
index 00000000000..94e23cb9a5e
--- /dev/null
+++ b/lib/aws/has-local-credentials.js
@@ -0,0 +1,7 @@
+'use strict';
+
+const AWS = require('aws-sdk');
+
+module.exports = () => {
+  return Boolean(new AWS.S3().config.credentials);
+};
diff --git a/lib/aws/request.js b/lib/aws/request.js
index 211e7ed5d83..e07c4289548 100644
--- a/lib/aws/request.js
+++ b/lib/aws/request.js
@@ -5,21 +5,24 @@ const memoize = require('memoizee');
 const PromiseQueue = require('promise-queue');
 const sdk = require('aws-sdk');
 const ServerlessError = require('../../lib/serverless-error');
-const log = require('@serverless/utils/log');
+const { log } = require('@serverless/utils/log');
 const HttpsProxyAgent = require('https-proxy-agent');
 const url = require('url');
 const https = require('https');
 const fs = require('fs');
-const deepSortObjectByKey = require('../../lib/utils/deepSortObjectByKey');
+const deepSortObjectByKey = require('../utils/deep-sort-object-by-key');
 const ensureString = require('type/string/ensure');
 const isObject = require('type/object/is');
 const wait = require('timers-ext/promise/sleep');
 const chalk = require('chalk');
 
 // Activate AWS SDK logging
-if (process.env.SLS_DEBUG) {
-  sdk.config.logger = log;
-}
+const awsLog = log.get('aws');
+sdk.config.logger = {
+  log: (...args) => {
+    awsLog.debug(...args);
+  },
+};
 
 // Use HTTPS Proxy (Optional)
 const proxy =
@@ -92,7 +95,7 @@ const shouldS3Accelerate = (method, params) => {
     params &&
     params.isS3TransferAccelerationEnabled
   ) {
-    log('Using S3 Transfer Acceleration Endpoint...');
+    log.notice('Using S3 Transfer Acceleration Endpoint...');
     return true;
   }
   return false;
@@ -115,6 +118,11 @@ const getServiceInstance = memoize(
   }
 );
 
+const normalizerPattern = /(?<!^)([A-Z])/g;
+const normalizeErrorCodePostfix = (name) => {
+  return name.replace(normalizerPattern, '_$1').toUpperCase();
+};
+
 /** Execute request to AWS service
  * @param {Object|string} [service] - Description of the service to call
  * @prop [service.name] - Name of the service to call, support subclasses
@@ -145,14 +153,15 @@ async function awsRequest(service, method, ...args) {
         providerError &&
         ((providerError.retryable &&
           providerError.statusCode !== 403 &&
-          providerError.code !== 'CredentialsError') ||
+          providerError.code !== 'CredentialsError' &&
+          providerError.code !== 'ExpiredTokenException') ||
           providerError.statusCode === 429)
       ) {
         const nextTryNum = numTry + 1;
         const jitter = Math.random() * 3000 - 1000;
         // backoff is between 4 and 7 seconds
         const backOff = BASE_BACKOFF + jitter;
-        log(
+        log.info(
           [
             `Recoverable error occurred (${e.message}), sleeping for ~${Math.round(
               backOff / 1000
@@ -194,17 +203,28 @@ async function awsRequest(service, method, ...args) {
             : bottomError.message;
           message = errorMessage;
           // We do not want to trigger the retry mechanism for credential errors
-          throw Object.assign(new ServerlessError(errorMessage), {
+          throw Object.assign(new ServerlessError(errorMessage, 'AWS_CREDENTIALS_NOT_FOUND'), {
             providerError: Object.assign({}, err, { retryable: false }),
           });
         }
+        const providerErrorCodeExtension = (() => {
+          if (!err.code) return 'ERROR';
+          if (typeof err.code === 'number') return `HTTP_${err.code}_ERROR`;
+          return normalizeErrorCodePostfix(err.code);
+        })();
+        if (err.stack) {
+          log.debug(`${err.stack}\n${'-'.repeat(100)}`);
+        }
         throw Object.assign(
           new ServerlessError(
-            process.env.SLS_DEBUG && err.stack ? `${err.stack}\n${'-'.repeat(100)}` : message,
-            err.code
+            message,
+            `AWS_${normalizeErrorCodePostfix(service.name)}_${normalizeErrorCodePostfix(
+              method
+            )}_${providerErrorCodeExtension}`
           ),
           {
             providerError: err,
+            providerErrorCodeExtension,
           }
         );
       }
diff --git a/lib/classes/ConfigSchemaHandler/resolveDataPathSize.js b/lib/classes/ConfigSchemaHandler/resolveDataPathSize.js
deleted file mode 100644
index beeccbc0e95..00000000000
--- a/lib/classes/ConfigSchemaHandler/resolveDataPathSize.js
+++ /dev/null
@@ -1,41 +0,0 @@
-'use strict';
-
-const memoizee = require('memoizee');
-
-module.exports = memoizee(
-  (dataPath) => {
-    let index;
-    let size = 0;
-    let mode = 'literal';
-    let char;
-    for (index = 0; (char = dataPath[index]); ++index) {
-      switch (mode) {
-        case 'literal':
-          if (char === '.') {
-            ++size;
-          } else if (char === '[') {
-            ++size;
-            mode = 'openBracket';
-          }
-          break;
-        case 'openBracket':
-          mode = char === "'" ? 'string' : 'number';
-          break;
-        case 'string':
-          if (char === "'") mode = 'stringQuote';
-          break;
-        case 'stringQuote':
-          if (char === ']') mode = 'literal';
-          else if (char !== "'") mode = 'string';
-          break;
-        case 'number':
-          if (char === ']') mode = 'literal';
-          break;
-        default:
-          throw new Error(`Unexpected mode ${mode}`);
-      }
-    }
-    return size;
-  },
-  { primitive: true }
-);
diff --git a/lib/classes/Error.js b/lib/classes/Error.js
deleted file mode 100644
index 6533823e0a0..00000000000
--- a/lib/classes/Error.js
+++ /dev/null
@@ -1,42 +0,0 @@
-'use strict';
-
-const chalk = require('chalk');
-const ServerlessError = require('../serverless-error');
-
-const consoleLog = (message) => {
-  process.stdout.write(`${message}\n`);
-};
-
-const writeMessage = (title, message) => {
-  let line = '';
-  while (line.length < 56 - title.length) {
-    line = `${line}-`;
-  }
-
-  consoleLog(' ');
-  consoleLog(chalk.yellow(` ${title} ${line}`));
-  consoleLog(' ');
-
-  if (message) {
-    consoleLog(`  ${message.split('\n').join('\n  ')}`);
-  }
-
-  consoleLog(' ');
-};
-
-module.exports.ServerlessError = ServerlessError;
-
-// Deprecated - use ServerlessError instead
-module.exports.SError = ServerlessError;
-
-module.exports.logWarning = (message) => {
-  if (process.env.SLS_WARNING_DISABLE) {
-    return;
-  }
-
-  writeMessage('Serverless Warning', message);
-};
-
-module.exports.logInfo = (message) => {
-  writeMessage('Serverless Information', message);
-};
diff --git a/lib/classes/PromiseTracker.js b/lib/classes/PromiseTracker.js
deleted file mode 100644
index 1e15942d7b3..00000000000
--- a/lib/classes/PromiseTracker.js
+++ /dev/null
@@ -1,102 +0,0 @@
-'use strict';
-
-const logInfo = require('./Error').logInfo;
-
-const constants = {
-  pending: 'pending',
-  rejected: 'rejected',
-  resolved: 'resolved',
-};
-
-class PromiseTracker {
-  constructor() {
-    this.reset();
-  }
-  reset() {
-    this.promiseList = [];
-    this.promiseMap = {};
-    this.startTime = Date.now();
-    this.reported = false;
-  }
-  start() {
-    this.reset();
-    this.interval = setInterval(this.report.bind(this), 15000);
-  }
-  report() {
-    const delta = Date.now() - this.startTime;
-    const pending = this.getPending();
-    logInfo(
-      [
-        '############################################################################################',
-        `# ${delta}: ${this.getSettled().length} of ${this.getAll().length} promises have settled`,
-        `# ${delta}: ${pending.length} are taking longer than expected:`,
-      ]
-        .concat(pending.map((promise) => `# ${delta}:   ${promise.waitList}`))
-        .concat([
-          '# This can result from latent connections but may represent a cyclic variable dependency',
-          '##########################################################################################',
-        ])
-        .join('\n  ')
-    );
-    this.reported = true;
-  }
-  stop() {
-    clearInterval(this.interval);
-    if (this.reported) {
-      logInfo(
-        [
-          '############################################################################################',
-          `# Completed after ${Date.now() - this.startTime}ms`,
-          `# ${this.getAll().length} promises are in the following states:`,
-          `#   ${constants.resolved}: ${this.getResolved().length}`,
-          `#   ${constants.rejected}: ${this.getRejected().length}`,
-          `#   ${constants.pending}:  ${this.getPending().length}`,
-          '##########################################################################################',
-        ].join('\n  ')
-      );
-    }
-    this.reset();
-  }
-  add(variable, prms, specifier) {
-    const promise = prms;
-    promise.waitList = `${variable} waited on by: ${specifier}`;
-    promise.state = constants.pending;
-    promise.then(
-      // creates a promise with the following effects but that we otherwise ignore
-      () => {
-        promise.state = constants.resolved;
-      },
-      () => {
-        promise.state = constants.rejected;
-      }
-    );
-    this.promiseList.push(promise);
-    this.promiseMap[variable] = promise;
-    return promise;
-  }
-  contains(variable) {
-    return variable in this.promiseMap;
-  }
-  get(variable, specifier) {
-    const promise = this.promiseMap[variable];
-    promise.waitList += ` ${specifier}`;
-    return promise;
-  }
-  getPending() {
-    return this.promiseList.filter((p) => p.state === constants.pending);
-  }
-  getSettled() {
-    return this.promiseList.filter((p) => p.state !== constants.pending);
-  }
-  getResolved() {
-    return this.promiseList.filter((p) => p.state === constants.resolved);
-  }
-  getRejected() {
-    return this.promiseList.filter((p) => p.state === constants.rejected);
-  }
-  getAll() {
-    return this.promiseList;
-  }
-}
-
-module.exports = PromiseTracker;
diff --git a/lib/classes/Variables.js b/lib/classes/Variables.js
deleted file mode 100644
index 6e276ad8175..00000000000
--- a/lib/classes/Variables.js
+++ /dev/null
@@ -1,995 +0,0 @@
-'use strict';
-
-const _ = require('lodash');
-const BbPromise = require('bluebird');
-const os = require('os');
-const path = require('path');
-const replaceall = require('replaceall');
-
-const fse = require('fs-extra');
-const logWarning = require('./Error').logWarning;
-const PromiseTracker = require('./PromiseTracker');
-const ServerlessError = require('../serverless-error');
-
-const resolvedValuesWeak = new WeakSet();
-
-// Used when resolving variables from a JS file
-const unsupportedJsTypes = new Set(['undefined', 'symbol', 'function']);
-
-/**
- * Maintainer's notes:
- *
- * This is a tricky class to modify and maintain.  A few rules on how it works...
- *
- * 0. The population of a service consists of pre-population, followed by population.  Pre-
- *   population consists of populating only those settings which are required for variable
- *   resolution.  Current examples include region and stage as they must be resolved to a
- *   concrete value before they can be used in the provider's `request` method (used by
- *   `getValueFromCf`, `getValueFromS3`, and `getValueFromSsm`) to resolve the associated values.
- *   Original issue: #4725
- * 1. All variable populations occur in generations.  Each of these generations resolves each
- *   present variable in the given object or property (i.e. terminal string properties and/or
- *   property parts) once.  This is to say that recursive resolutions should not be made.  This is
- *   because cyclic references are allowed [i.e. ${self:} and the like]) and doing so leads to
- *   dependency and dead-locking issues.  This leads to a problem with deep value population (i.e.
- *   populating ${self:foo.bar} when ${self:foo} has a value of {opt:bar}).  To pause that, one must
- *   pause population, noting the continued depth to traverse.  This motivated "deep" variables.
- *   Original issue #4687
- * 2. The resolution of variables can get very confusing if the same object is used multiple times.
- *   An example of this is the print command which *implicitly/invisibly* populates the
- *   serverless.yml and then *explicitly/visibly* renders the same file again, without the
- *   adornments that the framework's components make to the originally loaded service.  As a result,
- *   it is important to reset this object for each use.
- * 3. Note that despite some AWS code herein that this class is used in all plugins.  Obviously
- *   users avoid the AWS-specific variable types when targeting other clouds.
- */
-class Variables {
-  constructor(serverless) {
-    this.serverless = serverless;
-    this.service = this.serverless.service;
-    this.tracker = new PromiseTracker();
-
-    this.deep = [];
-    this.deepRefSyntax = RegExp(/(\${)?deep:\d+(\.[^}]+)*()}?/);
-    this.overwriteSyntax = RegExp(/\s*(?:,\s*)+/g);
-    this.fileRefSyntax = RegExp(/^file\(([^?%*:|"<>]+?)\)/g);
-    this.slsRefSyntax = RegExp(/^sls:/g);
-    this.envRefSyntax = RegExp(/^env:/g);
-    this.optRefSyntax = RegExp(/^opt:/g);
-    this.selfRefSyntax = RegExp(/^self:/g);
-    this.stringRefSyntax = RegExp(/(?:^('|").*?\1$)/g);
-    this.boolRefSyntax = RegExp(/(?:^(true|false)$)/g);
-    this.intRefSyntax = RegExp(/(?:^\d+$)/g);
-    this.s3RefSyntax = RegExp(/^(?:\${)?s3:(.+?)\/(.+)$/);
-    this.cfRefSyntax = RegExp(/^(?:\${)?cf(?:\.([a-zA-Z0-9-]+))?:(.+?)\.(.+)$/);
-    this.ssmRefSyntax = RegExp(
-      /^(?:\${)?ssm(?:\.([a-zA-Z0-9-]+))?:([a-zA-Z0-9_.\-/]+)[~]?(true|false|split)?/
-    );
-    this.strToBoolRefSyntax = RegExp(/^(?:\${)?strToBool\(([a-zA-Z0-9_.\-/]+)\)/);
-
-    this.variableResolvers = [
-      { regex: this.slsRefSyntax, resolver: this.getValueFromSls.bind(this) },
-      { regex: this.envRefSyntax, resolver: this.getValueFromEnv.bind(this) },
-      { regex: this.optRefSyntax, resolver: this.getValueFromOptions.bind(this) },
-      { regex: this.selfRefSyntax, resolver: this.getValueFromSelf.bind(this) },
-      { regex: this.fileRefSyntax, resolver: this.getValueFromFile.bind(this) },
-      {
-        regex: this.cfRefSyntax,
-        resolver: this.getValueFromCf.bind(this),
-        isDisabledAtPrepopulation: true,
-        serviceName: 'CloudFormation',
-      },
-      {
-        regex: this.s3RefSyntax,
-        resolver: this.getValueFromS3.bind(this),
-        isDisabledAtPrepopulation: true,
-        serviceName: 'S3',
-      },
-      { regex: this.stringRefSyntax, resolver: this.getValueFromString.bind(this) },
-      { regex: this.boolRefSyntax, resolver: this.getValueFromBool.bind(this) },
-      { regex: this.intRefSyntax, resolver: this.getValueFromInt.bind(this) },
-      {
-        regex: this.ssmRefSyntax,
-        resolver: this.getValueFromSsm.bind(this),
-        isDisabledAtPrepopulation: true,
-        serviceName: 'SSM',
-      },
-      {
-        regex: this.strToBoolRefSyntax,
-        resolver: this.getValueStrToBool.bind(this),
-      },
-      { regex: this.deepRefSyntax, resolver: this.getValueFromDeep.bind(this) },
-    ];
-  }
-
-  loadVariableSyntax() {
-    this.variableSyntax = RegExp(this.service.provider.variableSyntax, 'g');
-  }
-
-  initialCall(func) {
-    this.deep = [];
-    this.tracker.start();
-    return func().finally(() => {
-      this.tracker.stop();
-      this.deep = [];
-    });
-  }
-
-  // #############
-  // ## SERVICE ##
-  // #############
-  disableDepedentServices(func) {
-    const dependencyMessage = (configValue, serviceName) =>
-      `Variable dependency failure: variable '${configValue}' references ${serviceName} but using that service requires a concrete value to be called.`;
-    // replace and then restore the methods for obtaining values from dependent services.  the
-    // replacement naturally rejects dependencies on these services that occur during pre-population.
-    // pre-population is, of course, the process of obtaining the required configuration for using
-    // these services.
-    for (const resolver of this.variableResolvers) {
-      if (resolver.isDisabledAtPrepopulation) {
-        // save original
-        resolver.original = resolver.resolver;
-        // knock out
-        resolver.resolver = (variableString) =>
-          BbPromise.reject(dependencyMessage(variableString, resolver.serviceName));
-      }
-    }
-    return func().finally(() => {
-      // restore
-      for (const resolver of this.variableResolvers) {
-        if (resolver.isDisabledAtPrepopulation) {
-          resolver.resolver = resolver.original;
-        }
-      }
-    });
-  }
-  prepopulateService() {
-    const provider = this.serverless.getProvider('aws');
-    if (provider) {
-      const requiredConfigs = [
-        Object.assign({ name: 'region' }, provider.getRegionSourceValue()),
-        Object.assign({ name: 'stage' }, provider.getStageSourceValue()),
-        {
-          name: 'profile',
-          value: this.service.provider.profile,
-          path: 'serverless.service.provider.profile',
-        },
-      ];
-      return this.disableDepedentServices(() => {
-        const prepopulations = requiredConfigs.map((config) =>
-          this.populateValue(config.value, true) // populate
-            .then((populated) => Object.assign(config, { populated }))
-        );
-        return this.assignProperties(provider, prepopulations);
-      });
-    }
-    return BbPromise.resolve();
-  }
-  /**
-   * Populate all variables in the service, conveniently remove and restore the service attributes
-   * that confuse the population methods.
-   * @param processedOptions An options hive to use for ${opt:...} variables.
-   * @returns {Promise.<TResult>|*} A promise resolving to the populated service.
-   */
-  populateService(processedOptions) {
-    // #######################################################################
-    // ## KEEP SYNCHRONIZED WITH EQUIVALENT IN ~/lib/plugins/print/print.js ##
-    // #######################################################################
-    this.options = processedOptions || {};
-
-    this.loadVariableSyntax();
-    // store
-    const variableSyntaxProperty = this.service.provider.variableSyntax;
-    // remove
-    this.service.provider.variableSyntax = undefined; // otherwise matches itself
-    this.service.serverless = undefined;
-    return this.initialCall(() =>
-      this.prepopulateService()
-        .then(() =>
-          this.populateObjectImpl(this.service).finally(() => {
-            // restore
-            this.service.serverless = this.serverless;
-            this.service.provider.variableSyntax = variableSyntaxProperty;
-          })
-        )
-        .then(() => this.service)
-    );
-  }
-  // ############
-  // ## OBJECT ##
-  // ############
-  /**
-   * The declaration of a terminal property.  This declaration includes the path and value of the
-   * property.
-   * Example Input:
-   * {
-   *   foo: {
-   *     bar: 'baz'
-   *   }
-   * }
-   * Example Result:
-   * [
-   *   {
-   *     path: ['foo', 'bar']
-   *     value: 'baz
-   *   }
-   * ]
-   * @typedef {Object} TerminalProperty
-   * @property {String[]} path The path to the terminal property
-   * @property {Date|RegEx|String} The value of the terminal property
-   */
-  /**
-   * Generate an array of objects noting the terminal properties of the given root object and their
-   * paths
-   * @param root The object to generate a terminal property path/value set for
-   * @param initCurrent The current part of the given root that terminal properties are being sought
-   * within
-   * @param [context] An array containing the path to the current object root (intended for internal
-   * use)
-   * @param [results] An array of current results (intended for internal use)
-   * @returns {TerminalProperty[]} The terminal properties of the given root object, with the path
-   * and value of each
-   */
-  getProperties(root, initAtRoot, initCurrent, initContext, initResults) {
-    const processedMap = new WeakMap();
-    return (function self(atRoot, current, context, results) {
-      if (processedMap.has(current)) return processedMap.get(current);
-      if (!context) context = [];
-      if (!results) results = [];
-      if (_.isObject(current)) processedMap.set(current, results);
-      const addContext = (value, key) => self(false, value, context.concat(key), results);
-      if (Array.isArray(current)) {
-        current.map(addContext);
-      } else if (
-        _.isObject(current) &&
-        !_.isDate(current) &&
-        !_.isRegExp(current) &&
-        typeof current !== 'function'
-      ) {
-        if (atRoot || current !== root) {
-          _.mapValues(current, addContext);
-        }
-      } else {
-        results.push({ path: context, value: current });
-      }
-      return results;
-    })(initAtRoot, initCurrent, initContext, initResults);
-  }
-
-  /**
-   * @typedef {TerminalProperty} TerminalPropertyPopulated
-   * @property {Object} populated The populated value of the value at the path
-   */
-  /**
-   * Populate the given terminal properties, returning promises to do so
-   * @param properties The terminal properties to populate
-   * @returns {Promise<TerminalPropertyPopulated[]>[]} The promises that will resolve to the
-   * populated values of the given terminal properties
-   */
-  populateVariables(properties) {
-    const variables = properties.filter(
-      (property) => typeof property.value === 'string' && property.value.match(this.variableSyntax)
-    );
-    return variables.map((variable) =>
-      this.populateValue(variable.value, false).then((populated) =>
-        Object.assign({}, variable, { populated })
-      )
-    );
-  }
-  /**
-   * Assign the populated values back to the target object
-   * @param target The object to which the given populated terminal properties should be applied
-   * @param populations The fully populated terminal properties
-   * @returns {Promise<number>} resolving with the number of changes that were applied to the given
-   * target
-   */
-  assignProperties(target, populations) {
-    return BbPromise.all(populations).then((results) =>
-      results.forEach((result) => {
-        if (result.value !== result.populated) {
-          const pathArray = Array.isArray(result.path) ? result.path : result.path.split('.');
-          let obj = target;
-          for (const property of pathArray.slice(0, -1)) obj = obj[property];
-          obj[_.last(pathArray)] = result.populated;
-        }
-      })
-    );
-  }
-  /**
-   * Populate the variables in the given object.
-   * @param objectToPopulate The object to populate variables within.
-   * @returns {Promise.<TResult>|*} A promise resolving to the in-place populated object.
-   */
-  populateObject(objectToPopulate) {
-    return this.initialCall(() => this.populateObjectImpl(objectToPopulate));
-  }
-  populateObjectImpl(objectToPopulate) {
-    const leaves = this.getProperties(objectToPopulate, true, objectToPopulate);
-    const populations = this.populateVariables(leaves);
-    if (populations.length === 0) {
-      return BbPromise.resolve(objectToPopulate);
-    }
-    return this.assignProperties(objectToPopulate, populations).then(() =>
-      this.populateObjectImpl(objectToPopulate)
-    );
-  }
-  // ##############
-  // ## PROPERTY ##
-  // ##############
-  /**
-   * Standard logic for cleaning a variable
-   * Example: cleanVariable('${opt:foo}') => 'opt:foo'
-   * @param match The variable match instance variable part
-   * @returns {string} The cleaned variable match
-   */
-  cleanVariable(match) {
-    let cleaned = match.replace(this.variableSyntax, (context, contents) => contents.trim());
-    if (!cleaned.match(/".*"|'.*'/)) {
-      cleaned = cleaned.replace(/\s/g, '');
-    }
-    return cleaned;
-  }
-  /**
-   * @typedef {Object} MatchResult
-   * @property {String} match The original property value that matched the variable syntax
-   * @property {String} variable The cleaned variable string that specifies the origin for the
-   * property value
-   */
-  /**
-   * Get matches against the configured variable syntax
-   * @param property The property value to attempt extracting matches from
-   * @returns {Object|String|MatchResult[]} The given property or the identified matches
-   */
-  getMatches(property) {
-    if (typeof property !== 'string') {
-      return property;
-    }
-    const matches = property.match(this.variableSyntax);
-    if (!matches || !matches.length) {
-      return property;
-    }
-    return matches.map((match) => ({
-      match,
-      variable: this.cleanVariable(match),
-    }));
-  }
-  /**
-   * Populate the given matches, returning an array of Promises which will resolve to the populated
-   * values of the given matches
-   * @param {MatchResult[]} matches The matches to populate
-   * @returns {Promise[]} Promises for the eventual populated values of the given matches
-   */
-  populateMatches(matches, property) {
-    return matches.map((match) => this.splitAndGet(match, property));
-  }
-  /**
-   * Render the given matches and their associated results to the given value
-   * @param value The value into which to render the given results
-   * @param matches The matches on the given value where the results are to be rendered
-   * @param results The results that are to be rendered to the given value
-   * @returns {*} The populated value with the given results rendered according to the given matches
-   */
-  renderMatches(value, matches, results) {
-    let result = value;
-    for (let i = 0; i < matches.length; i += 1) {
-      this.handleUnresolved(matches[i].variable, results[i]);
-      result = this.populateVariable(result, matches[i].match, results[i]);
-    }
-    return result;
-  }
-  /**
-   * Populate the given value, recursively if root is true
-   * @param valueToPopulate The value to populate variables within
-   * @param root Whether the caller is the root populator and thereby whether to recursively
-   * populate
-   * @returns {PromiseLike<T>} A promise that resolves to the populated value, recursively if root
-   * is true
-   */
-  populateValue(valueToPopulate, root) {
-    const property = valueToPopulate;
-    const matches = this.getMatches(property);
-    if (!Array.isArray(matches)) {
-      return BbPromise.resolve(property);
-    }
-    const populations = this.populateMatches(matches, valueToPopulate);
-    return BbPromise.all(populations)
-      .then((results) => this.renderMatches(property, matches, results))
-      .then((result) => {
-        if (root && matches.length) {
-          return this.populateValue(result, root);
-        }
-        return result;
-      });
-  }
-  /**
-   * Populate variables in the given property.
-   * @param propertyToPopulate The property to populate (replace variables with their values).
-   * @returns {Promise.<TResult>|*} A promise resolving to the populated result.
-   */
-  populateProperty(propertyToPopulate) {
-    return this.initialCall(() => this.populateValue(propertyToPopulate, true));
-  }
-
-  /**
-   * Split the cleaned variable string containing one or more comma delimited variables and get a
-   * final value for the entirety of the string
-   * @param match The regex match containing both the variable string to split and get a final
-   * value for as well as the originally matched string
-   * @param property The original property string the given variable was extracted from
-   * @returns {Promise} A promise resolving to the final value of the given variable
-   */
-  splitAndGet(match, property) {
-    const parts = this.splitByComma(match.variable);
-    if (parts.length > 1) {
-      return this.overwrite(parts, match.match, property);
-    }
-    return this.getValueFromSource(parts[0], property);
-  }
-  /**
-   * Populate a given property, given the matched string to replace and the value to replace the
-   * matched string with.
-   * @param propertyParam The property to replace the matched string with the value.
-   * @param matchedString The string in the given property that was matched and is to be replaced.
-   * @param valueToPopulate The value to replace the given matched string in the property with.
-   * @returns {Promise.<TResult>|*} A promise resolving to the property populated with the given
-   *  value for all instances of the given matched string.
-   */
-  populateVariable(propertyParam, matchedString, valueToPopulate) {
-    let property = propertyParam;
-    if (property === matchedString) {
-      // total replacement
-      property = valueToPopulate;
-    } else if (typeof valueToPopulate === 'string') {
-      // partial replacement, string
-      property = replaceall(matchedString, valueToPopulate, property);
-    } else if (_.isNumber(valueToPopulate)) {
-      // partial replacement, number
-      property = replaceall(matchedString, String(valueToPopulate), property);
-    } else {
-      const errorMessage = [
-        'Trying to populate non string value into',
-        ` a string for variable ${matchedString}.`,
-        ' Please make sure the value of the property is a string.',
-      ].join('');
-      throw new ServerlessError(errorMessage);
-    }
-    return property;
-  }
-  // ###############
-  // ## VARIABLES ##
-  // ###############
-  /**
-   * Split a given string by whitespace padded commas excluding those within single or double quoted
-   * strings.
-   * @param string The string to split by comma.
-   */
-  splitByComma(string) {
-    const quotedWordSyntax = RegExp(/(?:('|").*?\1)/g);
-    const input = string.trim();
-    const stringMatches = [];
-    let match = quotedWordSyntax.exec(input);
-    while (match) {
-      stringMatches.push({
-        start: match.index,
-        end: quotedWordSyntax.lastIndex,
-      });
-      match = quotedWordSyntax.exec(input);
-    }
-    const commaReplacements = [];
-    const contained = (
-      commaMatch // curry the current commaMatch
-    ) => (
-      stringMatch // check whether stringMatch containing the commaMatch
-    ) => stringMatch.start < commaMatch.index && this.overwriteSyntax.lastIndex < stringMatch.end;
-    match = this.overwriteSyntax.exec(input);
-    while (match) {
-      const matchContained = contained(match);
-      const containedBy = stringMatches.find(matchContained);
-      if (!containedBy) {
-        // if uncontained, this comma represents a splitting location
-        commaReplacements.push({
-          start: match.index,
-          end: this.overwriteSyntax.lastIndex,
-        });
-      }
-      match = this.overwriteSyntax.exec(input);
-    }
-    let prior = 0;
-    const results = [];
-    commaReplacements.forEach((replacement) => {
-      results.push(input.slice(prior, replacement.start));
-      prior = replacement.end;
-    });
-    results.push(input.slice(prior));
-    return results;
-  }
-  /**
-   * Resolve the given variable string that expresses a series of fallback values in case the
-   * initial values are not valid, resolving each variable and resolving to the first valid value.
-   * @param variableStrings The overwrite variables to populate and choose from.
-   * @param variableMatch The original string from which the variables were extracted.
-   * @returns {Promise.<TResult>|*} A promise resolving to the first validly populating variable
-   *  in the given variable strings string.
-   */
-  overwrite(variableStrings, variableMatch, propertyString) {
-    // A sentinel to rid rejected Promises, so any of resolved value can be used as fallback.
-    const FAIL_TOKEN = {};
-    const variableValues = variableStrings.map((variableString) =>
-      this.getValueFromSource(variableString, propertyString).catch(() => FAIL_TOKEN)
-    );
-
-    const validValue = (value) =>
-      value !== null &&
-      typeof value !== 'undefined' &&
-      (Array.isArray(value) || !(typeof value === 'object' && !Object.keys(value).length));
-
-    return BbPromise.all(variableValues)
-      .then((values) => values.filter((v) => v !== FAIL_TOKEN))
-      .then((values) => {
-        let deepPropertyString = variableMatch;
-        let deepProperties = 0;
-        values.forEach((value, index) => {
-          if (typeof value === 'string' && value.match(this.variableSyntax)) {
-            deepProperties += 1;
-            const deepVariable = this.makeDeepVariable(value);
-            deepPropertyString = deepPropertyString.replace(
-              variableStrings[index],
-              this.cleanVariable(deepVariable)
-            );
-          }
-        });
-        return deepProperties > 0
-          ? BbPromise.resolve(deepPropertyString) // return deep variable replacement of original
-          : BbPromise.resolve(values.find(validValue)); // resolve first valid value, else undefined
-      });
-  }
-  /**
-   * Given any variable string, return the value it should be populated with.
-   * @param variableString The variable string to retrieve a value for.
-   * @returns {Promise.<TResult>|*} A promise resolving to the given variables value.
-   */
-  getValueFromSource(variableString, propertyString) {
-    let ret;
-    if (this.tracker.contains(variableString)) {
-      ret = this.tracker.get(variableString, propertyString);
-    } else {
-      for (const { regex, resolver } of this.variableResolvers) {
-        if (variableString.match(regex)) {
-          ret = resolver(variableString);
-          break;
-        }
-      }
-      if (!ret) {
-        const errorMessage = [
-          `Invalid variable reference syntax for variable ${variableString}.`,
-          ' You can only reference env vars, options, & files.',
-          ' You can check our docs for more info.',
-        ].join('');
-        ret = BbPromise.reject(new ServerlessError(errorMessage));
-      }
-      ret = this.tracker.add(variableString, ret, propertyString);
-    }
-    return ret.then((resolvedValue) => {
-      if (!Array.isArray(resolvedValue) && !_.isPlainObject(resolvedValue)) return resolvedValue;
-      if (resolvedValuesWeak.has(resolvedValue)) {
-        try {
-          return _.cloneDeep(resolvedValue);
-        } catch (error) {
-          return resolvedValue;
-        }
-      }
-      resolvedValuesWeak.add(resolvedValue);
-      return resolvedValue;
-    });
-  }
-
-  getValueFromSls(variableString) {
-    let valueToPopulate = {};
-    const requestedSlsVar = variableString.split(':')[1];
-    if (requestedSlsVar === 'instanceId') {
-      valueToPopulate = this.serverless.instanceId;
-    }
-    return BbPromise.resolve(valueToPopulate);
-  }
-
-  getValueFromEnv(variableString) {
-    const requestedEnvVar = variableString.split(':')[1];
-    let valueToPopulate;
-    if (requestedEnvVar !== '' || '' in process.env) {
-      valueToPopulate = process.env[requestedEnvVar];
-    } else {
-      valueToPopulate = process.env;
-    }
-    return BbPromise.resolve(valueToPopulate);
-  }
-
-  getValueFromString(variableString) {
-    const valueToPopulate = variableString.replace(/^['"]|['"]$/g, '');
-    return BbPromise.resolve(valueToPopulate);
-  }
-
-  getValueFromBool(variableString) {
-    const valueToPopulate = variableString === 'true';
-    return BbPromise.resolve(valueToPopulate);
-  }
-
-  getValueFromInt(variableString) {
-    const valueToPopulate = parseInt(variableString, 10);
-    return BbPromise.resolve(valueToPopulate);
-  }
-
-  getValueFromOptions(variableString) {
-    const requestedOption = variableString.split(':')[1];
-    let valueToPopulate;
-    if (requestedOption !== '' || '' in this.options) {
-      valueToPopulate = this.options[requestedOption];
-    } else {
-      valueToPopulate = this.options;
-    }
-    return BbPromise.resolve(valueToPopulate);
-  }
-
-  getValueFromSelf(variableString) {
-    const selfServiceRex = /self:service\./;
-    let variable = variableString;
-    // ###################################################################
-    // ## KEEP SYNCHRONIZED WITH EQUIVALENT IN ~/lib/classes/Service.js ##
-    // ##   there, see `loadServiceFileParam`                           ##
-    // ###################################################################
-    // The loaded service is altered during load in ~/lib/classes/Service (see loadServiceFileParam)
-    // Account for these so that user's reference to their file populate properly
-    if (variable === 'self:service.name') {
-      variable = 'self:service';
-    } else if (variable.match(selfServiceRex)) {
-      variable = variable.replace(selfServiceRex, 'self:serviceObject.');
-    } else if (variable === 'self:provider') {
-      variable = 'self:provider.name';
-    }
-    const valueToPopulate = this.service;
-    const deepProperties = variable
-      .split(':')[1]
-      .split('.')
-      .filter((property) => property);
-    return this.getDeeperValue(deepProperties, valueToPopulate);
-  }
-
-  getValueFromFile(variableString) {
-    const matchedFileRefString = variableString.match(this.fileRefSyntax)[0];
-    const referencedFileRelativePath = matchedFileRefString
-      .replace(this.fileRefSyntax, (match, varName) => varName.trim())
-      .replace('~', os.homedir());
-
-    let referencedFileFullPath = path.isAbsolute(referencedFileRelativePath)
-      ? referencedFileRelativePath
-      : path.join(this.serverless.serviceDir, referencedFileRelativePath);
-
-    // Get real path to handle potential symlinks (but don't fatal error)
-    referencedFileFullPath = fse.existsSync(referencedFileFullPath)
-      ? fse.realpathSync(referencedFileFullPath)
-      : referencedFileFullPath;
-
-    let fileExtension = referencedFileRelativePath.split('.');
-    fileExtension = fileExtension[fileExtension.length - 1];
-    // Validate file exists
-    if (!this.serverless.utils.fileExistsSync(referencedFileFullPath)) {
-      return BbPromise.resolve(undefined);
-    }
-
-    let valueToPopulate;
-
-    // Process JS files
-    if (fileExtension === 'js') {
-      const jsFile = require(referencedFileFullPath);
-      const variableArray = variableString.split(':');
-      let returnValue;
-      if (variableArray[1]) {
-        let jsModule = variableArray[1];
-        jsModule = jsModule.split('.')[0];
-        returnValue = jsFile[jsModule];
-      } else {
-        returnValue = jsFile;
-      }
-
-      if (typeof returnValue === 'function') {
-        valueToPopulate = returnValue.call(jsFile, this.serverless);
-      } else {
-        valueToPopulate = returnValue;
-      }
-
-      return BbPromise.resolve(valueToPopulate).then((valueToPopulateResolved) => {
-        let deepProperties = variableString.replace(matchedFileRefString, '');
-        deepProperties = deepProperties.slice(1).split('.');
-        deepProperties.splice(0, 1);
-        return this.getDeeperValue(deepProperties, valueToPopulateResolved).then(
-          (deepValueToPopulateResolved) => {
-            if (unsupportedJsTypes.has(typeof deepValueToPopulateResolved)) {
-              const errorMessage = [
-                'Invalid variable syntax when referencing',
-                ` file "${referencedFileRelativePath}".`,
-                ' Check if your javascript is returning the correct data.',
-              ].join('');
-              return BbPromise.reject(new ServerlessError(errorMessage));
-            }
-            return BbPromise.resolve(deepValueToPopulateResolved);
-          }
-        );
-      });
-    }
-
-    // Process everything except JS
-    if (fileExtension !== 'js') {
-      valueToPopulate = this.serverless.utils.readFileSync(referencedFileFullPath);
-      if (matchedFileRefString !== variableString) {
-        let deepProperties = variableString.replace(matchedFileRefString, '');
-        if (deepProperties.substring(0, 1) !== ':') {
-          const errorMessage = [
-            'Invalid variable syntax when referencing',
-            ` file "${referencedFileRelativePath}" sub properties`,
-            ' Please use ":" to reference sub properties.',
-          ].join('');
-          return BbPromise.reject(new ServerlessError(errorMessage));
-        }
-        deepProperties = deepProperties.slice(1).split('.');
-        return this.getDeeperValue(deepProperties, valueToPopulate);
-      }
-    }
-    return BbPromise.resolve(valueToPopulate);
-  }
-
-  buildOptions(regionSuffix) {
-    const options = { useCache: true };
-    if (regionSuffix) {
-      options.region = regionSuffix;
-    }
-    return options;
-  }
-
-  getValueFromCf(variableString) {
-    const groups = variableString.match(this.cfRefSyntax);
-    const regionSuffix = groups[1];
-    const stackName = groups[2];
-    const outputLogicalId = groups[3];
-    return this.serverless
-      .getProvider('aws')
-      .request(
-        'CloudFormation',
-        'describeStacks',
-        { StackName: stackName },
-        this.buildOptions(regionSuffix)
-      )
-      .then((result) => {
-        const outputs = result.Stacks[0].Outputs;
-        const output = outputs.find((x) => x.OutputKey === outputLogicalId);
-
-        if (!output) {
-          const errorMessage = [
-            'Trying to request a non exported variable from CloudFormation.',
-            ` Stack name: "${stackName}"`,
-            ` Requested variable: "${outputLogicalId}".`,
-          ].join('');
-          return BbPromise.reject(new ServerlessError(errorMessage));
-        }
-        return BbPromise.resolve(output.OutputValue);
-      });
-  }
-
-  getValueFromS3(variableString) {
-    const groups = variableString.match(this.s3RefSyntax);
-    const bucket = groups[1];
-    const key = groups[2];
-    return this.serverless
-      .getProvider('aws')
-      .request(
-        'S3',
-        'getObject',
-        {
-          Bucket: bucket,
-          Key: key,
-        },
-        { useCache: true }
-      ) // Use request cache
-      .then((response) => BbPromise.resolve(response.Body.toString()))
-      .catch((err) => {
-        const errorMessage = `Error getting value for ${variableString}. ${err.message}`;
-        return BbPromise.reject(new ServerlessError(errorMessage));
-      });
-  }
-
-  getValueFromSsm(variableString) {
-    const groups = variableString.match(this.ssmRefSyntax);
-    const regionSuffix = groups[1];
-    const param = groups[2];
-    const decrypt = groups[3] === 'true';
-    const split = groups[3] === 'split';
-    return this.serverless
-      .getProvider('aws')
-      .request(
-        'SSM',
-        'getParameter',
-        {
-          Name: param,
-          WithDecryption: decrypt,
-        },
-        this.buildOptions(regionSuffix)
-      ) // Use request cache
-      .then(
-        (response) => {
-          const plainText = response.Parameter.Value;
-          const type = response.Parameter.Type;
-          // Only if Secrets Manager. Parameter Store does not support JSON.
-          // We cannot parse StringList types, so don't try
-          if (type !== 'StringList' && param.startsWith('/aws/reference/secretsmanager')) {
-            try {
-              return JSON.parse(plainText);
-            } catch {
-              // return as plain text if value is not JSON
-            }
-          }
-          if (split) {
-            if (type === 'StringList') return plainText.split(',');
-
-            logWarning(
-              `Cannot split SSM parameter '${param}' of type '${type}'. Must be 'StringList'.`
-            );
-          }
-          return plainText;
-        },
-        (err) => {
-          if (!err.providerError || err.providerError.statusCode !== 400) {
-            throw new ServerlessError(err.message);
-          }
-        }
-      );
-  }
-
-  getValueStrToBool(variableString) {
-    return BbPromise.try(() => {
-      if (typeof variableString === 'string') {
-        const groups = variableString.match(this.strToBoolRefSyntax);
-        const param = groups[1].trim();
-        if (/^(true|false|0|1)$/.test(param)) {
-          if (param === 'false' || param === '0') {
-            return false;
-          }
-          // truthy or non-empty strings
-          return true;
-        }
-        throw new ServerlessError(
-          'Unexpected strToBool input; expected either "true", "false", "0", or "1".'
-        );
-      }
-      // Cast non-string inputs
-      return Boolean(variableString);
-    });
-  }
-
-  getDeepIndex(variableString) {
-    const deepIndexReplace = RegExp(/^deep:|(\.[^}]+)*$/g);
-    return variableString.replace(deepIndexReplace, '');
-  }
-  getVariableFromDeep(variableString) {
-    const index = this.getDeepIndex(variableString);
-    return this.deep[index];
-  }
-  getValueFromDeep(variableString) {
-    const deepPrefixReplace = RegExp(/(?:^deep:)\d+\.?/g);
-    const variable = this.getVariableFromDeep(variableString);
-    const deepRef = variableString.replace(deepPrefixReplace, '');
-    let ret = this.populateValue(variable);
-    if (deepRef.length) {
-      // if there is a deep reference remaining
-      ret = ret.then((result) => {
-        if (typeof result === 'string' && result.match(this.variableSyntax)) {
-          const deepVariable = this.makeDeepVariable(result);
-          return BbPromise.resolve(this.appendDeepVariable(deepVariable, deepRef));
-        }
-        return this.getDeeperValue(deepRef.split('.'), result);
-      });
-    }
-    return ret;
-  }
-
-  makeDeepVariable(variable) {
-    let index = this.deep.findIndex((item) => variable === item);
-    if (index < 0) {
-      index = this.deep.push(variable) - 1;
-    }
-    const variableContainer = variable.match(this.variableSyntax)[0];
-    const variableString = this.cleanVariable(variableContainer).replace(/\s/g, '');
-    return variableContainer.replace(/\s/g, '').replace(variableString, `deep:${index}`);
-  }
-  appendDeepVariable(variable, subProperty) {
-    const variableString = this.cleanVariable(variable);
-    return variable.replace(variableString, `${variableString}.${subProperty}`);
-  }
-
-  /**
-   * Get a value that is within the given valueToPopulate.  The deepProperties specify what value
-   * to retrieve from the given valueToPopulate.  The trouble is that anywhere along this chain a
-   * variable can be discovered.  If this occurs, to avoid cyclic dependencies, the resolution of
-   * the deep value from the given valueToPopulate must be halted.  The discovered variable is thus
-   * set aside into a "deep variable" (see makeDeepVariable).  The indexing into the given
-   * valueToPopulate is then resolved with a replacement ${deep:${index}.${remaining.properties}}
-   * variable (e.g. ${deep:1.foo}).  This pauses the population for continuation during the next
-   * generation of evaluation (see getValueFromDeep)
-   * @param deepProperties The "path" of properties to follow in obtaining the deeper value
-   * @param valueToPopulate The value from which to obtain the deeper value
-   * @returns {Promise} A promise resolving to the deeper value or to a `deep` variable that
-   * will later resolve to the deeper value
-   */
-  getDeeperValue(deepProperties, valueToPopulate) {
-    return BbPromise.reduce(
-      deepProperties,
-      (reducedValueParam, subProperty) => {
-        let reducedValue = reducedValueParam;
-        if (typeof reducedValue === 'string' && reducedValue.match(this.deepRefSyntax)) {
-          // build mode
-          reducedValue = this.appendDeepVariable(reducedValue, subProperty);
-        } else {
-          // get mode
-          if (reducedValue == null) {
-            reducedValue = {};
-          } else if (subProperty !== '' || '' in reducedValue) {
-            reducedValue = reducedValue[subProperty];
-          }
-          if (typeof reducedValue === 'string' && reducedValue.match(this.variableSyntax)) {
-            reducedValue = this.makeDeepVariable(reducedValue);
-          }
-        }
-        return BbPromise.resolve(reducedValue);
-      },
-      valueToPopulate
-    );
-  }
-
-  handleUnresolved(variableString, valueToPopulate) {
-    const isValueEmpty =
-      valueToPopulate === null ||
-      typeof valueToPopulate === 'undefined' ||
-      (typeof valueToPopulate === 'object' &&
-        !Array.isArray(valueToPopulate) &&
-        !Object.keys(valueToPopulate).length);
-
-    if (!isValueEmpty) {
-      return;
-    }
-
-    let varType;
-
-    if (variableString.match(this.envRefSyntax)) {
-      varType = 'environment variable';
-    } else if (variableString.match(this.optRefSyntax)) {
-      varType = 'option';
-    } else if (variableString.match(this.selfRefSyntax)) {
-      varType = 'service attribute';
-    } else if (variableString.match(this.fileRefSyntax)) {
-      varType = 'file';
-    } else if (variableString.match(this.ssmRefSyntax)) {
-      varType = 'SSM parameter';
-    }
-
-    if (!varType) {
-      return;
-    }
-
-    if (this.service.unresolvedVariablesNotificationMode === 'error') {
-      throw new ServerlessError(
-        `A valid ${varType} to satisfy the declaration '${variableString}' could not be found.`,
-        'UNRESOLVED_CONFIG_VARIABLE'
-      );
-    }
-
-    if (!this.service.unresolvedVariablesNotificationMode) {
-      this.serverless._logDeprecation(
-        'VARIABLES_ERROR_ON_UNRESOLVED',
-        'Unresolved variable references will be communicated with a thrown error, starting from next major'
-      );
-    }
-
-    logWarning(
-      `A valid ${varType} to satisfy the declaration '${variableString}' could not be found.`
-    );
-  }
-}
-
-module.exports = Variables;
diff --git a/lib/classes/CLI.js b/lib/classes/cli.js
similarity index 66%
rename from lib/classes/CLI.js
rename to lib/classes/cli.js
index 070be72fc24..521d22735fa 100644
--- a/lib/classes/CLI.js
+++ b/lib/classes/cli.js
@@ -3,10 +3,12 @@
 const version = require('../../package.json').version;
 const os = require('os');
 const chalk = require('chalk');
+const { log } = require('@serverless/utils/log');
 const resolveCliInput = require('../cli/resolve-input');
 const renderHelp = require('../cli/render-help');
 
-// TODO: Remove this class with next major
+const legacyPluginLog = log.get('plugin-legacy');
+
 class CLI {
   constructor(serverless) {
     this.serverless = serverless;
@@ -22,27 +24,6 @@ class CLI {
     this.loadedCommands = commands;
   }
 
-  suppressLogIfPrintCommand(processedInput) {
-    const commands = processedInput.commands;
-
-    // if "-help" or "-h" was entered
-    if (resolveCliInput().isHelpRequest) return;
-
-    // if "print" was NOT entered
-    if (commands.indexOf('print') === -1) {
-      return;
-    }
-
-    // if other command was combined with "print"
-    if (commands.length !== 1) {
-      return;
-    }
-
-    // Make "log" no-op to suppress warnings.
-    // But preserve "consoleLog" which "print" command use to print config.
-    this.log = function () {};
-  }
-
   displayHelp() {
     if (!resolveCliInput().isHelpRequest) return false;
     renderHelp(this.serverless.pluginManager.externalPlugins);
@@ -68,17 +49,15 @@ class CLI {
   }
 
   log(message, entity, opts) {
-    const underline = opts ? opts.underline : false;
-    const bold = opts ? opts.bold : false;
-    const color = opts ? opts.color : null;
+    const { underline = false, bold = false, color = null } = opts || {};
 
-    let print = chalk.yellow;
+    let print = chalk;
 
     if (color) print = chalk.keyword(color);
     if (underline) print = print.underline;
     if (bold) print = print.bold;
 
-    this.consoleLog(`${entity || 'Serverless'}: ${print(message)}`);
+    legacyPluginLog.notice(entity ? `${entity}: ${print(message)}` : print(message));
   }
 
   consoleLog(message) {
diff --git a/lib/classes/ConfigSchemaHandler/index.js b/lib/classes/config-schema-handler/index.js
similarity index 78%
rename from lib/classes/ConfigSchemaHandler/index.js
rename to lib/classes/config-schema-handler/index.js
index 7faa3da1ec6..b8dc0080fab 100644
--- a/lib/classes/ConfigSchemaHandler/index.js
+++ b/lib/classes/config-schema-handler/index.js
@@ -1,14 +1,15 @@
 'use strict';
 
-const Ajv = require('ajv');
 const _ = require('lodash');
-const schema = require('../../configSchema');
+const ensurePlainObject = require('type/plain-object/ensure');
+const schema = require('../../config-schema');
 const ServerlessError = require('../../serverless-error');
-const normalizeAjvErrors = require('./normalizeAjvErrors');
+const normalizeAjvErrors = require('./normalize-ajv-errors');
+const resolveAjvValidate = require('./resolve-ajv-validate');
+const { log, style } = require('@serverless/utils/log');
 
 const FUNCTION_NAME_PATTERN = '^[a-zA-Z0-9-_]+$';
 const ERROR_PREFIX = 'Configuration error';
-const WARNING_PREFIX = 'Configuration warning';
 
 const normalizeSchemaObject = (object, instanceSchema) => {
   for (const [key, value] of Object.entries(object)) {
@@ -56,58 +57,52 @@ const denormalizeUserConfig = (userConfig, { removedValuesMap }) => {
   }
 };
 
+const configurationValidationResults = new WeakMap();
+
 class ConfigSchemaHandler {
   constructor(serverless) {
     this.serverless = serverless;
     this.schema = _.cloneDeep(schema);
 
-    // TODO: Switch back to deepFreeze(this.schema.properties.service) once awsKmsKeyArn property is removed, see https://github.com/serverless/serverless/issues/8261
-    Object.freeze(this.schema.properties.service.name);
+    deepFreeze(this.schema.properties.service);
     deepFreeze(this.schema.properties.plugins);
     deepFreeze(this.schema.properties.package);
   }
 
-  validateConfig(userConfig) {
+  static getConfigurationValidationResult(configuration) {
+    if (!configurationValidationResults.has(ensurePlainObject(configuration))) return null;
+    return configurationValidationResults.get(ensurePlainObject(configuration));
+  }
+
+  async validateConfig(userConfig) {
     if (!this.schema.properties.provider.properties.name) {
+      configurationValidationResults.set(this.serverless.configurationInput, false);
       if (this.serverless.service.configValidationMode !== 'off') {
-        this.serverless.cli.log(
-          `${WARNING_PREFIX}: Unrecognized provider '${this.serverless.service.provider.name}'`,
-          'Serverless',
-          { color: 'orange' }
-        );
-        this.serverless.cli.log(' ');
-        this.serverless.cli.log(
-          "You're relying on provider plugin which doesn't " +
-            'provide a validation schema for its config.',
-          'Serverless',
-          { color: 'orange' }
+        log.warning(
+          [
+            `You're relying on provider "${this.serverless.service.provider.name}" defined by a plugin which doesn't provide a validation schema for its config.`,
+            `Please report the issue at its bug tracker linking: ${style.link(
+              'https://www.serverless.com/framework/docs/providers/aws/guide/plugins#extending-validation-schema'
+            )}`,
+            'You may turn off this message with "configValidationMode: off" setting',
+            '',
+          ].join('\n')
         );
-        this.serverless.cli.log(
-          'Please report the issue at its bug tracker linking: ' +
-            'https://www.serverless.com/framework/docs/providers/aws/guide/plugins#extending-validation-schema',
-          'Serverless',
-          { color: 'orange' }
-        );
-        this.serverless.cli.log(
-          'You may turn off this message with "configValidationMode: off" setting',
-          'Serverless',
-          { color: 'orange' }
-        );
-        this.serverless.cli.log(' ');
       }
 
       this.relaxProviderSchema();
     }
 
-    const ajv = new Ajv({ allErrors: true, coerceTypes: 'array', verbose: true });
-    require('ajv-keywords')(ajv, 'regexp');
     // Workaround https://github.com/ajv-validator/ajv/issues/1255
     normalizeSchemaObject(this.schema, this.schema);
-    const validate = ajv.compile(this.schema);
+    const validate = await resolveAjvValidate(this.schema);
 
     const denormalizeOptions = normalizeUserConfig(userConfig);
     validate(userConfig);
     denormalizeUserConfig(userConfig, denormalizeOptions);
+    if (!configurationValidationResults.has(this.serverless.configurationInput)) {
+      configurationValidationResults.set(this.serverless.configurationInput, !validate.errors);
+    }
     if (validate.errors && this.serverless.service.configValidationMode !== 'off') {
       const messages = normalizeAjvErrors(validate.errors).map((err) => err.message);
       this.handleErrorMessages(messages);
@@ -117,37 +112,32 @@ class ConfigSchemaHandler {
   handleErrorMessages(messages) {
     if (messages.length) {
       if (this.serverless.service.configValidationMode === 'error') {
-        const errorMessage =
-          messages.length > 1
-            ? `${ERROR_PREFIX}: \n     ${messages.join('\n     ')}`
-            : `${ERROR_PREFIX} ${messages[0]}`;
-
-        throw new ServerlessError(errorMessage);
+        throw new ServerlessError(
+          `${
+            messages.length > 1
+              ? `${ERROR_PREFIX}: \n     ${messages.join('\n     ')}`
+              : `${ERROR_PREFIX} ${messages[0]}`
+          }\n\nLearn more about configuration validation here: http://slss.io/configuration-validation`,
+          'INVALID_NON_SCHEMA_COMPLIANT_CONFIGURATION'
+        );
       } else {
-        if (messages.length === 1) {
-          this.serverless.cli.log(`${WARNING_PREFIX} ${messages[0]}`, 'Serverless', {
-            color: 'orange',
-          });
-        } else {
-          this.serverless.cli.log(`${WARNING_PREFIX}:`, 'Serverless', {
-            color: 'orange',
-          });
-          for (const message of messages) {
-            this.serverless.cli.log(`  ${message}`, 'Serverless', { color: 'orange' });
-          }
-        }
-        this.serverless.cli.log(' ');
-        this.serverless.cli.log(
-          'Learn more about configuration validation here: http://slss.io/configuration-validation',
-          'Serverless',
-          { color: 'orange' }
+        log.notice();
+        log.warning(
+          [
+            'Invalid configuration encountered',
+            ...messages.map((message) => `  ${message}`),
+            '',
+            `Learn more about configuration validation here: ${style.link(
+              'http://slss.io/configuration-validation'
+            )}`,
+          ].join('\n')
         );
-        this.serverless.cli.log(' ');
         if (!this.serverless.configurationInput.configValidationMode) {
           this.serverless._logDeprecation(
-            'CONFIG_VALIDATION_MODE_DEFAULT',
-            'Starting with next major, Serverless will throw on configuration errors by default. ' +
-              'Adapt to this behavior now by adding "configValidationMode: error" to service configuration'
+            'CONFIG_VALIDATION_MODE_DEFAULT_V3',
+            'Starting with the next major, Serverless will throw on configuration errors by' +
+              ' default. Adapt to this behavior now by adding "configValidationMode: error" to' +
+              ' the service configuration'
           );
         }
       }
@@ -216,19 +206,13 @@ class ConfigSchemaHandler {
     if (options.resources) this.schema.properties.resources = options.resources;
     if (options.layers) this.schema.properties.layers = options.layers;
 
-    // In case provider implementers do not set stage or variableSyntax options,
-    // then they are set here. The framework internally sets these options in
-    // Service class.
+    // In case provider implementers do not set stage then it is set here.
+    // The framework internally sets these options in Service class.
     if (!this.schema.properties.provider.properties.stage) {
       addPropertiesToSchema(this.schema.properties.provider, {
         properties: { stage: { type: 'string' } },
       });
     }
-    if (!this.schema.properties.provider.properties.variableSyntax) {
-      addPropertiesToSchema(this.schema.properties.provider, {
-        properties: { variableSyntax: { type: 'string' } },
-      });
-    }
   }
 
   defineCustomProperties(configSchemaParts) {
diff --git a/lib/classes/ConfigSchemaHandler/normalizeAjvErrors.js b/lib/classes/config-schema-handler/normalize-ajv-errors.js
similarity index 58%
rename from lib/classes/ConfigSchemaHandler/normalizeAjvErrors.js
rename to lib/classes/config-schema-handler/normalize-ajv-errors.js
index b5ed5296071..bca4c69f63e 100644
--- a/lib/classes/ConfigSchemaHandler/normalizeAjvErrors.js
+++ b/lib/classes/config-schema-handler/normalize-ajv-errors.js
@@ -1,24 +1,22 @@
 'use strict';
 
 const _ = require('lodash');
-const resolveDataPathSize = require('./resolveDataPathSize');
 
-const isEventTypeDataPath = RegExp.prototype.test.bind(/^\.functions\[[^\]]+\]\.events\[\d+\]$/);
+const isEventTypeInstancePath = RegExp.prototype.test.bind(/^\/functions\/[^/]+\/events\/\d+$/);
 const oneOfPathPattern = /\/(?:anyOf|oneOf)(?:\/\d+\/|$)/;
 const isAnyOfPathTypePostfix = RegExp.prototype.test.bind(/^\/\d+\/type$/);
-const dataPathPropertyBracketsPattern = /\['([a-zA-Z_0-9]+)'\]/g;
 const oneOfKeywords = new Set(['anyOf', 'oneOf']);
 
 const filterIrreleventEventConfigurationErrors = (resultErrorsSet) => {
   // 1. Resolve all errors at event type configuration level
-  const eventTypeErrors = Array.from(resultErrorsSet).filter(({ dataPath }) =>
-    isEventTypeDataPath(dataPath)
+  const eventTypeErrors = Array.from(resultErrorsSet).filter(({ instancePath }) =>
+    isEventTypeInstancePath(instancePath)
   );
   // 2. Group event type configuration errors by event instance
-  const eventTypeErrorsByEvent = _.groupBy(eventTypeErrors, ({ dataPath }) => dataPath);
+  const eventTypeErrorsByEvent = _.groupBy(eventTypeErrors, ({ instancePath }) => instancePath);
 
   // 3. Process each error group individually
-  for (const [dataPath, eventEventTypeErrors] of Object.entries(eventTypeErrorsByEvent)) {
+  for (const [instancePath, eventEventTypeErrors] of Object.entries(eventTypeErrorsByEvent)) {
     // 3.1 Resolve error that signals that no event schema was matched
     const noMatchingEventError = eventEventTypeErrors.find(({ keyword }) =>
       oneOfKeywords.has(keyword)
@@ -35,15 +33,16 @@ const filterIrreleventEventConfigurationErrors = (resultErrorsSet) => {
     delete eventEventTypeErrorsByTypeIndex.root;
 
     // 3.3 Resolve eventual type configuration errors for intended event type
-    const eventConfiguredEventTypeErrors = Object.entries(
-      eventEventTypeErrorsByTypeIndex
-    ).find(([, errors]) => errors.every(({ keyword }) => keyword !== 'required'));
+    const eventConfiguredEventTypeErrors = Object.entries(eventEventTypeErrorsByTypeIndex).find(
+      ([, errors]) => errors.every(({ keyword }) => keyword !== 'required')
+    );
 
     if (!eventConfiguredEventTypeErrors) {
       // 3.4 If there are no event type configuration errors for intended event type
       if (
         !Array.from(resultErrorsSet).some(
-          (error) => error.dataPath.startsWith(dataPath) && error.dataPath !== dataPath
+          (error) =>
+            error.instancePath.startsWith(instancePath) && error.instancePath !== instancePath
         )
       ) {
         // 3.4.1 If there are no event configuration errors, it means it's not supported event type:
@@ -69,8 +68,11 @@ const filterIrreleventEventConfigurationErrors = (resultErrorsSet) => {
       //       - All event configuration errors
       const meaningfulSchemaPath = eventConfiguredEventTypeErrors[0];
       for (const error of resultErrorsSet) {
-        if (!error.dataPath.startsWith(dataPath)) continue;
-        if (error.dataPath === dataPath && error.schemaPath.startsWith(meaningfulSchemaPath)) {
+        if (!error.instancePath.startsWith(instancePath)) continue;
+        if (
+          error.instancePath === instancePath &&
+          error.schemaPath.startsWith(meaningfulSchemaPath)
+        ) {
           continue;
         }
         resultErrorsSet.delete(error);
@@ -98,29 +100,28 @@ const filterIrrelevantAnyOfErrors = (resultErrorsSet) => {
   for (const [oneOfPath, oneOfPathErrors] of Object.entries(oneOfErrorsByPath)) {
     // 2.1. If just one error, set was already filtered by event configuration errors filter
     if (oneOfPathErrors.length === 1) continue;
-    // 2.2. Group by dataPath
-    oneOfPathErrors.sort(({ dataPath: dataPathA }, { dataPath: dataPathB }) =>
-      dataPathA.localeCompare(dataPathB)
+    // 2.2. Group by instancePath
+    oneOfPathErrors.sort(({ instancePath: instancePathA }, { instancePath: instancePathB }) =>
+      instancePathA.localeCompare(instancePathB)
     );
-    let currentDataPath = oneOfPathErrors[0].dataPath;
+    let currentInstancePath = oneOfPathErrors[0].instancePath;
     Object.values(
-      _.groupBy(oneOfPathErrors, ({ dataPath }) => {
+      _.groupBy(oneOfPathErrors, ({ instancePath }) => {
         if (
-          dataPath !== currentDataPath &&
-          !dataPath.startsWith(`${currentDataPath}.`) &&
-          !dataPath.startsWith(`${currentDataPath}[`)
+          instancePath !== currentInstancePath &&
+          !instancePath.startsWith(`${currentInstancePath}/`)
         ) {
-          currentDataPath = dataPath;
+          currentInstancePath = instancePath;
         }
-        return currentDataPath;
+        return currentInstancePath;
       })
-    ).forEach((dataPathOneOfPathErrors) => {
+    ).forEach((instancePathOneOfPathErrors) => {
       // 2.2.1.If just one error, set was already filtered by event configuration errors filter
-      if (dataPathOneOfPathErrors.length === 1) return;
+      if (instancePathOneOfPathErrors.length === 1) return;
       // 2.2.2 Group by anyOf variant
       const groupFromIndex = oneOfPath.length + 1;
-      const dataPathOneOfPathErrorsByVariant = _.groupBy(
-        dataPathOneOfPathErrors,
+      const instancePathOneOfPathErrorsByVariant = _.groupBy(
+        instancePathOneOfPathErrors,
         ({ schemaPath }) => {
           if (groupFromIndex > schemaPath.length) return 'root';
           return schemaPath.slice(groupFromIndex, schemaPath.indexOf('/', groupFromIndex));
@@ -128,52 +129,59 @@ const filterIrrelevantAnyOfErrors = (resultErrorsSet) => {
       );
 
       // 2.2.3 If no root error, set was already filtered by event configuration errors filter
-      if (!dataPathOneOfPathErrorsByVariant.root) return;
-      const noMatchingVariantError = dataPathOneOfPathErrorsByVariant.root[0];
-      delete dataPathOneOfPathErrorsByVariant.root;
-      let dataPathOneOfPathVariants = Object.values(dataPathOneOfPathErrorsByVariant);
+      if (!instancePathOneOfPathErrorsByVariant.root) return;
+      const noMatchingVariantError = instancePathOneOfPathErrorsByVariant.root[0];
+      delete instancePathOneOfPathErrorsByVariant.root;
+      let instancePathOneOfPathVariants = Object.values(instancePathOneOfPathErrorsByVariant);
       // 2.2.4 If no variants, set was already filtered by event configuration errors filter
-      if (!dataPathOneOfPathVariants.length) return;
+      if (!instancePathOneOfPathVariants.length) return;
 
-      if (dataPathOneOfPathVariants.length > 1) {
+      if (instancePathOneOfPathVariants.length > 1) {
         // 2.2.5 If errors reported for more than one variant
         // 2.2.5.1 Filter variants where value type was not met
-        dataPathOneOfPathVariants = dataPathOneOfPathVariants.filter(
-          (dataPathOneOfPathVariantErrors) => {
-            if (dataPathOneOfPathVariantErrors.length !== 1) return true;
-            if (dataPathOneOfPathVariantErrors[0].keyword !== 'type') return true;
+        instancePathOneOfPathVariants = instancePathOneOfPathVariants.filter(
+          (instancePathOneOfPathVariantErrors) => {
+            if (instancePathOneOfPathVariantErrors.length !== 1) return true;
+            if (instancePathOneOfPathVariantErrors[0].keyword !== 'type') return true;
             if (
               !isAnyOfPathTypePostfix(
-                dataPathOneOfPathVariantErrors[0].schemaPath.slice(oneOfPath.length)
+                instancePathOneOfPathVariantErrors[0].schemaPath.slice(oneOfPath.length)
               )
             ) {
               return true;
             }
-            for (const dataPathOneOfPathVariantError of dataPathOneOfPathVariantErrors) {
-              resultErrorsSet.delete(dataPathOneOfPathVariantError);
+            for (const instancePathOneOfPathVariantError of instancePathOneOfPathVariantErrors) {
+              resultErrorsSet.delete(instancePathOneOfPathVariantError);
             }
             return false;
           }
         );
-        if (dataPathOneOfPathVariants.length > 1) {
+        if (instancePathOneOfPathVariants.length > 1) {
           // 2.2.5.2 Leave out variants where errors address deepest data paths
-          let deepestDataPathSize = 0;
-          for (const dataPathOneOfPathVariantErrors of dataPathOneOfPathVariants) {
-            dataPathOneOfPathVariantErrors.deepestDataPathSize = Math.max(
-              ...dataPathOneOfPathVariantErrors.map(({ dataPath }) => resolveDataPathSize(dataPath))
+          let deepestInstancePathSize = 0;
+          for (const instancePathOneOfPathVariantErrors of instancePathOneOfPathVariants) {
+            instancePathOneOfPathVariantErrors.deepestInstancePathSize = Math.max(
+              ...instancePathOneOfPathVariantErrors.map(
+                ({ instancePath }) => (instancePath.match(/\//g) || []).length
+              )
             );
-            if (dataPathOneOfPathVariantErrors.deepestDataPathSize > deepestDataPathSize) {
-              deepestDataPathSize = dataPathOneOfPathVariantErrors.deepestDataPathSize;
+            if (
+              instancePathOneOfPathVariantErrors.deepestInstancePathSize > deepestInstancePathSize
+            ) {
+              deepestInstancePathSize = instancePathOneOfPathVariantErrors.deepestInstancePathSize;
             }
           }
 
-          dataPathOneOfPathVariants = dataPathOneOfPathVariants.filter(
-            (dataPathAnyOfPathVariantErrors) => {
-              if (dataPathAnyOfPathVariantErrors.deepestDataPathSize === deepestDataPathSize) {
+          instancePathOneOfPathVariants = instancePathOneOfPathVariants.filter(
+            (instancePathAnyOfPathVariantErrors) => {
+              if (
+                instancePathAnyOfPathVariantErrors.deepestInstancePathSize ===
+                deepestInstancePathSize
+              ) {
                 return true;
               }
-              for (const dataPathOneOfPathVariantError of dataPathAnyOfPathVariantErrors) {
-                resultErrorsSet.delete(dataPathOneOfPathVariantError);
+              for (const instancePathOneOfPathVariantError of instancePathAnyOfPathVariantErrors) {
+                resultErrorsSet.delete(instancePathOneOfPathVariantError);
               }
               return false;
             }
@@ -182,34 +190,38 @@ const filterIrrelevantAnyOfErrors = (resultErrorsSet) => {
       }
 
       // 2.2.6 If all variants were filtered, expose just "no matching variant" error
-      if (!dataPathOneOfPathVariants.length) return;
+      if (!instancePathOneOfPathVariants.length) return;
       // 2.2.7 If just one variant left, expose only errors for that variant
-      if (dataPathOneOfPathVariants.length === 1) {
+      if (instancePathOneOfPathVariants.length === 1) {
         resultErrorsSet.delete(noMatchingVariantError);
         return;
       }
       // 2.2.8 If more than one variant left, expose just "no matching variant" error
-      for (const dataPathOneOfPathVariantErrors of dataPathOneOfPathVariants) {
-        for (const dataPathOneOfPathVariantError of dataPathOneOfPathVariantErrors) {
-          resultErrorsSet.delete(dataPathOneOfPathVariantError);
+      for (const instancePathOneOfPathVariantErrors of instancePathOneOfPathVariants) {
+        const types = new Set();
+        for (const instancePathOneOfPathVariantError of instancePathOneOfPathVariantErrors) {
+          const parentSchema = instancePathOneOfPathVariantError.parentSchema;
+          types.add(parentSchema.const ? 'const' : parentSchema.type);
+          resultErrorsSet.delete(instancePathOneOfPathVariantError);
         }
+        if (types.size === 1) noMatchingVariantError.commonType = types.values().next().value;
       }
     });
   }
 };
 
-const normalizeDataPath = (dataPath) => {
-  if (!dataPath) return 'root';
+const normalizeInstancePath = (instancePath) => {
+  if (!instancePath) return 'root';
 
-  // This regex helps replace functions['someFunc'].foo with functions.someFunc.foo
-  return `'${dataPath.slice(1).replace(dataPathPropertyBracketsPattern, '.$1')}'`;
+  // This code removes leading / and replaces / with . in error path indication
+  return `'${instancePath.slice(1).replace(/\//g, '.')}'`;
 };
 
 const improveMessages = (resultErrorsSet) => {
   for (const error of resultErrorsSet) {
     switch (error.keyword) {
       case 'additionalProperties':
-        if (error.dataPath === '.functions') {
+        if (error.instancePath === '/functions') {
           error.message = `name '${error.params.additionalProperty}' must be alphanumeric`;
         } else {
           error.message = `unrecognized property '${error.params.additionalProperty}'`;
@@ -219,13 +231,18 @@ const improveMessages = (resultErrorsSet) => {
         error.message = `value '${error.data}' does not satisfy pattern ${error.schema}`;
         break;
       case 'anyOf':
-        if (isEventTypeDataPath(error.dataPath)) {
+        if (isEventTypeInstancePath(error.instancePath)) {
           error.message = 'unsupported function event';
           break;
         }
       // fallthrough
       case 'oneOf':
-        error.message = 'unsupported configuration format';
+        if (error.commonType) {
+          if (error.commonType === 'const') error.message = 'unsupported value';
+          else error.message = `unsupported ${error.commonType} format`;
+        } else {
+          error.message = 'unsupported configuration format';
+        }
         break;
       case 'enum':
         if (error.params.allowedValues.every((value) => typeof value === 'string')) {
@@ -234,7 +251,7 @@ const improveMessages = (resultErrorsSet) => {
         break;
       default:
     }
-    error.message = `at ${normalizeDataPath(error.dataPath)}: ${error.message}`;
+    error.message = `at ${normalizeInstancePath(error.instancePath)}: ${error.message}`;
   }
 };
 
diff --git a/lib/classes/config-schema-handler/regexp-keyword.js b/lib/classes/config-schema-handler/regexp-keyword.js
new file mode 100644
index 00000000000..0fd17529c2b
--- /dev/null
+++ b/lib/classes/config-schema-handler/regexp-keyword.js
@@ -0,0 +1,54 @@
+'use strict';
+
+// Implementation has been heavily inspired by `ajv-keywords` implementation from:
+// https://github.com/ajv-validator/ajv-keywords/blob/9656614be0104fe71d229459a5217ccac11958a6/src/definitions/regexp.ts
+// Copyright (c) 2016 Evgeny Poberezkin (https://github.com/ajv-validator/ajv-keywords/blob/master/LICENSE)
+// The reason for that is the issue with `peerDependencies` of `ajv-keywords`, that causes the project to fail when other
+// dependency also relies on different `ajv` version and `npm@6` is used.
+// Related issue: https://github.com/ajv-validator/ajv-keywords/issues/170
+// After the issue is addressed, or if `npm@6` is no longer supported, this module can be removed
+// and we can go back to using `ajv-keywords` directly.
+
+const { _ } = require('ajv/dist/compile/codegen');
+
+const regexpMetaSchema = {
+  type: 'object',
+  properties: {
+    pattern: { type: 'string' },
+    flags: { type: 'string', nullable: true },
+  },
+  required: ['pattern'],
+  additionalProperties: false,
+};
+
+const metaRegexp = /^\/(.*)\/([gimuy]*)$/;
+
+const usePattern = ({ gen, it: { opts } }, pattern, flags = opts.unicodeRegExp ? 'u' : '') => {
+  const rx = new RegExp(pattern, flags);
+  return gen.scopeValue('pattern', {
+    key: rx.toString(),
+    ref: rx,
+    code: _`new RegExp(${pattern}, ${flags})`,
+  });
+};
+
+module.exports = {
+  keyword: 'regexp',
+  type: 'string',
+  schemaType: ['string', 'object'],
+  code(cxt) {
+    const { data, schema } = cxt;
+    const regx = getRegExp(schema);
+    cxt.pass(_`${regx}.test(${data})`);
+
+    function getRegExp(sch) {
+      if (typeof sch === 'object') return usePattern(cxt, sch.pattern, sch.flags);
+      const rx = metaRegexp.exec(sch);
+      if (rx) return usePattern(cxt, rx[1], rx[2]);
+      throw new Error('cannot parse string into RegExp');
+    }
+  },
+  metaSchema: {
+    anyOf: [{ type: 'string' }, regexpMetaSchema],
+  },
+};
diff --git a/lib/classes/config-schema-handler/resolve-ajv-validate.js b/lib/classes/config-schema-handler/resolve-ajv-validate.js
new file mode 100644
index 00000000000..e1092b1b162
--- /dev/null
+++ b/lib/classes/config-schema-handler/resolve-ajv-validate.js
@@ -0,0 +1,74 @@
+'use strict';
+
+const Ajv = require('ajv').default;
+const objectHash = require('object-hash');
+const path = require('path');
+const os = require('os');
+const standaloneCode = require('ajv/dist/standalone').default;
+const fs = require('fs');
+const requireFromString = require('require-from-string');
+const deepSortObjectByKey = require('../../utils/deep-sort-object-by-key');
+const ensureExists = require('../../utils/ensure-exists');
+const ServerlessError = require('../../serverless-error');
+
+const getCacheDir = () => {
+  return path.resolve(
+    process.env.SLS_SCHEMA_CACHE_BASE_DIR || os.homedir(),
+    `.serverless/artifacts/ajv-validate-${require('ajv/package').version}`
+  );
+};
+
+// Validators are cached by schema hash for the purpose
+// of speeding up tests and reducing their memory footprint.
+// If that solution proves to not be enough, we can improve it
+// with `uni-global` package.
+const cachedValidatorsBySchemaHash = {};
+
+const getValidate = async (schema) => {
+  const schemaHash = objectHash(deepSortObjectByKey(schema));
+  if (cachedValidatorsBySchemaHash[schemaHash]) {
+    return cachedValidatorsBySchemaHash[schemaHash];
+  }
+  const filename = `${schemaHash}.js`;
+  const cachePath = path.resolve(getCacheDir(), filename);
+
+  const generate = async () => {
+    const ajv = new Ajv({
+      allErrors: true,
+      coerceTypes: 'array',
+      verbose: true,
+      strict: true,
+      strictRequired: false,
+      code: { source: true },
+    });
+    require('ajv-formats').default(ajv);
+    // Ensure AJV related packages work well when there are mutliple AJV installations around
+    // See: https://github.com/ajv-validator/ajv/issues/1390#issuecomment-763138202
+    ajv.opts.code.formats = Ajv._`require("ajv-formats/dist/formats").fullFormats`;
+    ajv.addKeyword(require('./regexp-keyword'));
+    let validate;
+    try {
+      validate = ajv.compile(schema);
+    } catch (err) {
+      if (err.message && err.message.includes('strict mode')) {
+        throw new ServerlessError(
+          'At least one of the plugins defines a validation schema that is invalid. Try disabling plugins one by one to identify the problematic plugin and report it to the plugin maintainers.',
+          'SCHEMA_FAILS_STRICT_MODE'
+        );
+      }
+      throw err;
+    }
+    const moduleCode = standaloneCode(ajv, validate);
+    await fs.promises.writeFile(cachePath, moduleCode);
+  };
+  await ensureExists(cachePath, generate);
+  const loadedModuleCode = await fs.promises.readFile(cachePath, 'utf-8');
+  const validator = requireFromString(
+    loadedModuleCode,
+    path.resolve(__dirname, `[generated-ajv-validate]${filename}`)
+  );
+  cachedValidatorsBySchemaHash[schemaHash] = validator;
+  return validator;
+};
+
+module.exports = getValidate;
diff --git a/lib/classes/Config.js b/lib/classes/config.js
similarity index 100%
rename from lib/classes/Config.js
rename to lib/classes/config.js
diff --git a/lib/classes/PluginManager.js b/lib/classes/plugin-manager.js
similarity index 57%
rename from lib/classes/PluginManager.js
rename to lib/classes/plugin-manager.js
index 2197891aac5..31e3acd5ebf 100644
--- a/lib/classes/PluginManager.js
+++ b/lib/classes/plugin-manager.js
@@ -2,42 +2,14 @@
 
 const path = require('path');
 const config = require('@serverless/utils/config');
-const cjsResolve = require('ncjsm/resolve/sync');
 const _ = require('lodash');
-const crypto = require('crypto');
-const isModuleNotFoundError = require('ncjsm/is-module-not-found-error');
 const ServerlessError = require('../serverless-error');
 const resolveCliInput = require('../cli/resolve-input');
-const writeFile = require('../utils/fs/writeFile');
-const getCacheFilePath = require('../utils/getCacheFilePath');
-const getCommandSuggestion = require('../utils/getCommandSuggestion');
 const renderCommandHelp = require('../cli/render-help/command');
-const { storeLocally: storeTelemetryLocally, send: sendTelemetry } = require('../utils/telemetry');
-const generateTelemetryPayload = require('../utils/telemetry/generatePayload');
-const processBackendNotificationRequest = require('../utils/processBackendNotificationRequest');
-
-const requireServicePlugin = (serviceDir, pluginPath, localPluginsPath) => {
-  if (localPluginsPath && !pluginPath.startsWith('./')) {
-    // TODO (BREAKING): Consider removing support for localPluginsPath with next major
-    const absoluteLocalPluginPath = path.resolve(localPluginsPath, pluginPath);
-
-    try {
-      return require(absoluteLocalPluginPath);
-    } catch (error) {
-      if (!isModuleNotFoundError(error, absoluteLocalPluginPath)) throw error;
-    }
-  }
-  try {
-    return require(cjsResolve(serviceDir, pluginPath).realPath);
-  } catch (error) {
-    if (!isModuleNotFoundError(error, pluginPath) || pluginPath.startsWith('.')) {
-      throw error;
-    }
-  }
-
-  // Search in "node_modules" in which framework is placed
-  return require(cjsResolve(__dirname, pluginPath).realPath);
-};
+const processBackendNotificationRequest = require('../utils/process-backend-notification-request');
+const tokenizeException = require('../utils/tokenize-exception');
+const getRequire = require('../utils/get-require');
+const { log, getPluginWriters } = require('@serverless/utils/log');
 
 const mergeCommands = (target, source) => {
   if (!target) return source;
@@ -93,6 +65,7 @@ class PluginManager {
 
     this.plugins = [];
     this.externalPlugins = new Set();
+    this.localPluginsPaths = [];
     this.commands = {};
     this.aliases = {};
     this.hooks = {};
@@ -108,7 +81,11 @@ class PluginManager {
   }
 
   addPlugin(Plugin) {
-    const pluginInstance = new Plugin(this.serverless, this.cliOptions);
+    const pluginUtils = {};
+    if (Plugin._serverlessExternalPluginName) {
+      Object.assign(pluginUtils, getPluginWriters(Plugin._serverlessExternalPluginName));
+    }
+    const pluginInstance = new Plugin(this.serverless, this.cliOptions, pluginUtils);
     if (isRegisteringExternalPlugins) {
       this.externalPlugins.add(pluginInstance);
     }
@@ -130,13 +107,14 @@ class PluginManager {
 
     // don't load plugins twice
     if (this.plugins.some((plugin) => plugin instanceof Plugin)) {
-      this.serverless.cli.log(`WARNING: duplicate plugin ${Plugin.name} was not loaded\n`);
-      return null;
+      throw new ServerlessError(
+        'Encountered duplicate plugin definition. Please remove duplicate plugins from your configuration.',
+        'DUPLICATE_PLUGIN_DEFINITION'
+      );
     }
 
     this.loadCommands(pluginInstance);
     this.loadHooks(pluginInstance);
-    this.loadVariableResolvers(pluginInstance);
 
     this.plugins.push(pluginInstance);
 
@@ -161,49 +139,125 @@ class PluginManager {
     return this.asyncPluginInit();
   }
 
+  requireServicePlugin(serviceDir, pluginPath, legacyLocalPluginsPath) {
+    if (legacyLocalPluginsPath && !pluginPath.startsWith('./')) {
+      // TODO (BREAKING): Consider removing support for localPluginsPath with next major
+      const absolutePluginPath = path.resolve(legacyLocalPluginsPath, pluginPath);
+
+      const isLocatedAtLegacyPluginsPath = (() => {
+        try {
+          require.resolve(absolutePluginPath);
+          return true;
+        } catch {
+          return false;
+        }
+      })();
+      if (isLocatedAtLegacyPluginsPath) return require(absolutePluginPath);
+    }
+    const serviceDirRequire = getRequire(serviceDir);
+    const entryFilePath = (() => {
+      try {
+        return serviceDirRequire.resolve(pluginPath);
+      } catch {
+        return null;
+      }
+    })();
+    if (entryFilePath) {
+      if (pluginPath.startsWith('./')) {
+        this.localPluginsPaths.push({ resolvedPath: entryFilePath, inputPath: pluginPath });
+      }
+      return require(entryFilePath);
+    }
+
+    // Search in "node_modules" in which framework is placed
+    try {
+      require.resolve(pluginPath);
+    } catch {
+      throw Object.assign(new Error('Plugin not found'), { code: 'PLUGIN_NOT_FOUND' });
+    }
+    return require(pluginPath);
+  }
+
   resolveServicePlugins(servicePlugs) {
     const pluginsObject = this.parsePluginsObject(servicePlugs);
     const serviceDir = this.serverless.serviceDir;
-    return pluginsObject.modules
-      .filter((name) => name !== '@serverless/enterprise-plugin')
-      .map((name) => {
-        let Plugin;
-        try {
-          Plugin = requireServicePlugin(serviceDir, name, pluginsObject.localPath);
-        } catch (error) {
-          if (!isModuleNotFoundError(error, name)) throw error;
-
-          // Plugin not installed
-          if (
-            resolveCliInput().isHelpRequest ||
-            this.pluginIndependentCommands.has(this.cliCommands[0])
-          ) {
-            // User may intend to install plugins just listed in serverless config
-            // Therefore skip on MODULE_NOT_FOUND case
-            return null;
+    return (
+      pluginsObject.modules
+        // Initially @serverless/enterprise-plugin was published as external plugin
+        // We ensure to not load it, if for some reason it's still in service configuration
+        .filter((name) => name !== '@serverless/enterprise-plugin')
+        .map((name) => {
+          let Plugin;
+          try {
+            Plugin = this.requireServicePlugin(serviceDir, name, pluginsObject.localPath);
+          } catch (error) {
+            if (error.code !== 'PLUGIN_NOT_FOUND') throw error;
+
+            // Plugin not installed
+            if (
+              resolveCliInput().isHelpRequest ||
+              this.pluginIndependentCommands.has(this.cliCommands[0])
+            ) {
+              // User may intend to install plugins just listed in serverless config
+              // Therefore skip on MODULE_NOT_FOUND case
+              return null;
+            }
+
+            const isLocalPlugin = name.startsWith('./');
+
+            throw new ServerlessError(
+              [
+                `Serverless plugin "${name}" not found.`,
+                ' Make sure it\'s installed and listed in the "plugins" section',
+                ' of your serverless config file.',
+                isLocalPlugin ? '' : ` Run "serverless plugin install -n ${name}" to install it.`,
+              ].join(''),
+              'PLUGIN_NOT_FOUND'
+            );
           }
+          if (!Plugin) {
+            throw new ServerlessError(
+              `Serverless plugin "${name}", didn't export Plugin constructor.`,
+              'MISSING_PLUGIN_NAME'
+            );
+          }
+          Object.defineProperty(Plugin, '_serverlessExternalPluginName', {
+            value: name,
+            configurable: true,
+            writable: true,
+          });
+          return Plugin;
+        })
+    );
+  }
 
-          throw new ServerlessError(
-            [
-              `Serverless plugin "${name}" not found.`,
-              ' Make sure it\'s installed and listed in the "plugins" section',
-              ' of your serverless config file.',
-            ].join('')
-          );
+  getLocalPluginsPathPatterns() {
+    return this.localPluginsPaths
+      .map(({ resolvedPath, inputPath }) => {
+        const absoluteInputPath = path.resolve(this.serverless.serviceDir, inputPath);
+        if (
+          absoluteInputPath === resolvedPath ||
+          absoluteInputPath + path.extname(resolvedPath) === resolvedPath
+        ) {
+          return path.relative(this.serverless.serviceDir, resolvedPath);
         }
-        if (!Plugin) {
-          throw new ServerlessError(
-            `Serverless plugin "${name}", didn't export Plugin constructor.`
+
+        if (resolvedPath.startsWith(absoluteInputPath + path.sep)) {
+          return path.relative(
+            this.serverless.serviceDir,
+            path.join(path.dirname(resolvedPath), '/**')
           );
         }
-        return Plugin;
-      });
+
+        return null;
+      })
+      .filter((v) => v !== null);
   }
 
   resolveEnterprisePlugin() {
     if (config.getConfig().enterpriseDisabled) return null;
     this.pluginIndependentCommands.add('login').add('logout').add('dashboard');
-    return require('@serverless/enterprise-plugin');
+    return require('@serverless/dashboard-plugin');
   }
 
   parsePluginsObject(servicePlugs) {
@@ -231,7 +285,10 @@ class PluginManager {
   createCommandAlias(alias, command) {
     // Deny self overrides
     if (command.startsWith(alias)) {
-      throw new ServerlessError(`Command "${alias}" cannot be overriden by an alias`);
+      throw new ServerlessError(
+        `Command "${alias}" cannot be overriden by an alias`,
+        'INVALID_COMMAND_ALIAS'
+      );
     }
 
     const splitAlias = alias.split(':');
@@ -245,7 +302,8 @@ class PluginManager {
     // Check if the alias is already defined
     if (aliasTarget.command) {
       throw new ServerlessError(
-        `Alias "${alias}" is already defined for command ${aliasTarget.command}`
+        `Alias "${alias}" is already defined for command ${aliasTarget.command}`,
+        'COMMAND_ALIAS_ALREADY_DEFINED'
       );
     }
     // Check if the alias would overwrite an exiting command
@@ -257,20 +315,24 @@ class PluginManager {
         return __.commands[aliasPath];
       }, this)
     ) {
-      throw new ServerlessError(`Command "${alias}" cannot be overriden by an alias`);
+      throw new ServerlessError(
+        `Command "${alias}" cannot be overriden by an alias`,
+        'INVALID_COMMAND_ALIAS'
+      );
     }
     aliasTarget.command = command;
   }
 
   loadCommand(pluginName, details, key, isEntryPoint) {
     const commandIsEntryPoint = details.type === 'entrypoint' || isEntryPoint;
-    if (process.env.SLS_DEBUG && !commandIsEntryPoint) {
-      this.serverless.cli.log(`Load command ${key}`);
-    }
+    log.get('lifecycle:command:register').debug(key);
     // Check if there is already an alias for the same path as the command
     const aliasCommand = this.getAliasCommandTarget(key.split(':'));
     if (aliasCommand) {
-      throw new ServerlessError(`Command "${key}" cannot override an existing alias`);
+      throw new ServerlessError(
+        `Command "${key}" cannot override an existing alias`,
+        'INVALID_COMMAND_OVERRIDE_EXISTING_ALIAS'
+      );
     }
     // Load the command
     const commands = _.mapValues(details.commands, (subDetails, subKey) =>
@@ -278,9 +340,7 @@ class PluginManager {
     );
     // Handle command aliases
     (details.aliases || []).forEach((alias) => {
-      if (process.env.SLS_DEBUG) {
-        this.serverless.cli.log(`  -> @${alias}`);
-      }
+      log.get('lifecycle:command:register').debug(`  -> @${alias}`);
       this.createCommandAlias(alias, key);
     });
     return Object.assign({}, details, { key, pluginName, commands });
@@ -291,17 +351,7 @@ class PluginManager {
     if (pluginInstance.commands) {
       Object.entries(pluginInstance.commands).forEach(([key, details]) => {
         const command = this.loadCommand(pluginName, details, key);
-        // Grab and extract deprecated events
-        command.lifecycleEvents = (command.lifecycleEvents || []).map((event) => {
-          if (event.startsWith('deprecated#')) {
-            // Extract event and optional redirect
-            const transformedEvent = /^deprecated#(.*?)(?:->(.*?))?$/.exec(event);
-            this.deprecatedEvents[`${command.key}:${transformedEvent[1]}`] =
-              transformedEvent[2] || null;
-            return transformedEvent[1];
-          }
-          return event;
-        });
+        if (!command.lifecycleEvents) command.lifecycleEvents = [];
         this.commands[key] = mergeCommands(
           this.commands[key],
           _.merge({}, command, {
@@ -320,10 +370,9 @@ class PluginManager {
         const baseEvent = event.replace(/^(?:after:|before:)/, '');
         if (this.deprecatedEvents[baseEvent]) {
           const redirectedEvent = this.deprecatedEvents[baseEvent];
-          if (process.env.SLS_DEBUG) {
-            this.serverless.cli.log(`WARNING: Plugin ${pluginName} uses deprecated hook ${event},
-                     use ${redirectedEvent} hook instead`);
-          }
+          log.info(
+            `Plugin "${pluginName}" uses deprecated hook "${event}". Use "${redirectedEvent}" hook instead.`
+          );
           if (redirectedEvent) {
             target = event.replace(baseEvent, redirectedEvent);
           }
@@ -337,53 +386,6 @@ class PluginManager {
     }
   }
 
-  loadVariableResolvers(pluginInstance) {
-    const pluginName = pluginInstance.constructor.name;
-    for (const [variablePrefix, resolverOrOptions] of Object.entries(
-      pluginInstance.variableResolvers || {}
-    )) {
-      let options = resolverOrOptions;
-      if (!options) {
-        this.serverless.cli.log(
-          `Warning! Ignoring falsy variableResolver for ${variablePrefix} in ${pluginName}.`
-        );
-        continue;
-      }
-      if (typeof resolverOrOptions === 'function') {
-        options = {
-          resolver: resolverOrOptions,
-        };
-      }
-      if (!_.isObject(options)) {
-        throw new Error(
-          `Custom variable resolver {${variablePrefix}: ${JSON.stringify(
-            options
-          )}} defined by ${pluginName} isn't an object`
-        );
-      } else if (!variablePrefix.match(/[0-9a-zA-Z_-]+/)) {
-        throw new Error(
-          `Custom variable resolver prefix ${variablePrefix} defined by ${pluginName} may only contain alphanumeric characters, hyphens or underscores.`
-        );
-      }
-      if (typeof options.resolver !== 'function') {
-        throw new Error(
-          `Custom variable resolver for ${variablePrefix} defined by ${pluginName} specifies a resolver that isn't a function: ${options.resolver}`
-        );
-      }
-      if (options.isDisabledAtPrepopulation && typeof options.serviceName !== 'string') {
-        throw new Error(
-          `Custom variable resolver for ${variablePrefix} defined by ${pluginName} specifies isDisabledAtPrepopulation but doesn't provide a string for a name`
-        );
-      }
-      this.serverless.variables.variableResolvers.push({
-        regex: new RegExp(`^${variablePrefix}:`),
-        resolver: options.resolver.bind(this.serverless.variables),
-        isDisabledAtPrepopulation: options.isDisabledAtPrepopulation || false,
-        serviceName: options.serviceName || null,
-      });
-    }
-  }
-
   getCommands() {
     const result = {};
 
@@ -478,50 +480,44 @@ class PluginManager {
 
         if (!isNotContainer && isNotEntrypoint) return current.commands[name];
 
-        // if user is using a top level command properly, but sub commands are not
-        if (this.serverless.cli.loadedCommands[commandOrAlias[0]]) {
-          const errorMessage = [`"${name}" is not a valid sub command. Run "serverless `];
-          for (let i = 0; commandOrAlias[i] !== name; i++) {
-            errorMessage.push(`${commandOrAlias[i]}`);
-            if (commandOrAlias[i + 1] !== name) {
-              errorMessage.push(' ');
-            }
-          }
-          errorMessage.push('" to see a more helpful error message for this command.');
-          throw new ServerlessError(errorMessage.join(''));
-        }
-
-        // top level command isn't valid. give a suggestion
-        const commandName = commandOrAlias.slice(0, index + 1).join(' ');
-        const suggestedCommand = getCommandSuggestion(
-          commandName,
-          this.serverless.cli.loadedCommands
-        );
-        // TODO: Remove with next major (functionality is replicated in main script)
-        const errorMessage = [
-          `Serverless command "${commandName}" not found. Did you mean "${suggestedCommand}"?`,
-          ' Run "serverless help" for a list of all available commands.',
-        ].join('');
-        throw new ServerlessError(errorMessage);
+        // Invalid command, can happen only when Framework is used programmatically,
+        // as otherwise command is validated in main script
+        throw new new ServerlessError(
+          `Unrecognized command "${commandsArray.join(' ')}"`,
+          'UNRECOGNIZED COMMAND'
+        )();
       },
       { commands: this.commands }
     );
   }
 
-  getEvents(command) {
-    return _.flatMap(command.lifecycleEvents, (event) => [
-      `before:${command.key}:${event}`,
-      `${command.key}:${event}`,
-      `after:${command.key}:${event}`,
-    ]);
-  }
-
   getPlugins() {
     return this.plugins;
   }
 
-  getHooks(events) {
-    return _.flatMap([].concat(events), (event) => this.hooks[event] || []);
+  getLifecycleEventsData(command) {
+    const lifecycleEventsData = [];
+    let hooksLength = 0;
+    for (const lifecycleEventSubName of command.lifecycleEvents || []) {
+      const lifecycleEventName = `${command.key}:${lifecycleEventSubName}`;
+      const hooksData = {
+        before: this.hooks[`before:${lifecycleEventName}`] || [],
+        at: this.hooks[lifecycleEventName] || [],
+        after: this.hooks[`after:${lifecycleEventName}`] || [],
+      };
+      hooksLength += hooksData.before.length + hooksData.at.length + hooksData.after.length;
+      lifecycleEventsData.push({
+        command,
+        lifecycleEventSubName,
+        lifecycleEventName,
+        hooksData,
+      });
+    }
+    return { lifecycleEventsData, hooksLength };
+  }
+
+  async runHooks(hookName, hooks) {
+    for (const { hook } of hooks) await hook();
   }
 
   async invoke(commandsArray, allowEntryPoints) {
@@ -534,31 +530,32 @@ class PluginManager {
     this.convertShortcutsIntoOptions(command);
     this.validateServerlessConfigDependency(command);
     this.assignDefaultOptions(command);
-    this.validateOptions(command);
 
-    const events = this.getEvents(command);
-    const hooks = this.getHooks(events);
+    const { lifecycleEventsData, hooksLength } = this.getLifecycleEventsData(command);
 
-    if (process.env.SLS_DEBUG) {
-      this.serverless.cli.log(`Invoke ${commandsArray.join(':')}`);
-      if (hooks.length === 0) {
-        const warningMessage = 'Warning: The command you entered did not catch on any hooks';
-        this.serverless.cli.log(warningMessage);
-      }
-    }
+    log
+      .get('lifecycle:command:invoke')
+      .debug(
+        `Invoke ${commandsArray.join(':')}${
+          !hooksLength ? ' (noop due to no registered hooks)' : ''
+        }`
+      );
 
-    for (const hook of hooks) {
-      try {
-        await hook.hook();
-      } catch (error) {
-        if (error instanceof TerminateHookChain) {
-          if (process.env.SLS_DEBUG) {
-            this.serverless.cli.log(`Terminate ${commandsArray.join(':')}`);
-          }
-          return;
-        }
-        throw error;
+    try {
+      for (const {
+        lifecycleEventName,
+        hooksData: { before, at, after },
+      } of lifecycleEventsData) {
+        await this.runHooks(`before:${lifecycleEventName}`, before);
+        await this.runHooks(lifecycleEventName, at);
+        await this.runHooks(`after:${lifecycleEventName}`, after);
       }
+    } catch (error) {
+      if (error instanceof TerminateHookChain) {
+        log.debug(`Terminate ${commandsArray.join(':')}`);
+        return;
+      }
+      throw error;
     }
   }
 
@@ -581,26 +578,42 @@ class PluginManager {
    * Called by the CLI to start a public command.
    */
   async run(commandsArray) {
-    // first initialize hooks
-    for (const { hook } of this.getHooks(['initialize'])) {
-      await hook();
+    this.commandRunStartTime = Date.now();
+    if (resolveCliInput().commands[0] !== 'plugin') {
+      // first initialize hooks
+      for (const { hook } of this.hooks.initialize || []) await hook();
     }
 
-    await storeTelemetryLocally(await generateTelemetryPayload(this.serverless));
     let deferredBackendNotificationRequest;
-    if (commandsArray.join(' ') === 'deploy') {
-      deferredBackendNotificationRequest = sendTelemetry({
-        serverlessExecutionSpan: this.serverless.onExitPromise,
-      });
-    }
 
     try {
       await this.invoke(commandsArray);
-    } finally {
-      if (deferredBackendNotificationRequest) {
-        await processBackendNotificationRequest(await deferredBackendNotificationRequest);
+    } catch (commandException) {
+      try {
+        for (const { hook } of this.hooks.error || []) await hook(commandException);
+      } catch (errorHookException) {
+        const errorHookExceptionMeta = tokenizeException(errorHookException);
+        log.warning(
+          `The "error" hook crashed with:\n${
+            errorHookExceptionMeta.stack || errorHookExceptionMeta.message
+          }`
+        );
+      } finally {
+        await deferredBackendNotificationRequest;
+        throw commandException; // eslint-disable-line no-unsafe-finally
       }
     }
+
+    try {
+      for (const { hook } of this.hooks.finalize || []) await hook();
+    } catch (finalizeHookException) {
+      await deferredBackendNotificationRequest;
+      throw finalizeHookException;
+    }
+
+    if (deferredBackendNotificationRequest) {
+      await processBackendNotificationRequest(await deferredBackendNotificationRequest);
+    }
   }
 
   /**
@@ -622,72 +635,11 @@ class PluginManager {
           'This command can only be run in a Serverless service directory. ',
           "Make sure to reference a valid config file in the current working directory if you're using a custom config file",
         ].join('');
-        throw new ServerlessError(msg);
+        throw new ServerlessError(msg, 'INVALID_COMMAND_MISSING_SERVICE_DIRECTORY');
       }
     }
   }
 
-  validateOptions(command) {
-    // TODO: Remove with next major, as it's already handled externally
-    if (command.options) {
-      Object.entries(command.options).forEach(([key, value]) => {
-        if (value.required && (this.cliOptions[key] === true || !this.cliOptions[key])) {
-          let requiredThings = `the --${key} option`;
-
-          if (value.shortcut) {
-            requiredThings += ` / -${value.shortcut} shortcut`;
-          }
-          let errorMessage = `This command requires ${requiredThings}.`;
-
-          if (value.usage) {
-            errorMessage = `${errorMessage} Usage: ${value.usage}`;
-          }
-
-          throw new ServerlessError(errorMessage, 'MISSING_REQUIRED_CLI_OPTION');
-        }
-
-        if (
-          _.isPlainObject(value.customValidation) &&
-          value.customValidation.regularExpression instanceof RegExp &&
-          typeof value.customValidation.errorMessage === 'string' &&
-          !value.customValidation.regularExpression.test(this.cliOptions[key])
-        ) {
-          throw new ServerlessError(value.customValidation.errorMessage);
-        }
-      });
-    }
-  }
-
-  updateAutocompleteCacheFile() {
-    const commands = _.clone(this.getCommands());
-    const cacheFile = {
-      commands: {},
-      validationHash: '',
-    };
-
-    Object.entries(commands).forEach(([commandName, commandObj]) => {
-      const command = commandObj;
-      if (!command.options) {
-        command.options = {};
-      }
-      if (!command.commands) {
-        command.commands = {};
-      }
-      cacheFile.commands[commandName] = Object.keys(command.options)
-        .map((option) => `--${option}`)
-        .concat(Object.keys(command.commands));
-    });
-
-    const serverlessConfigFileHash = crypto
-      .createHash('sha256')
-      .update(JSON.stringify(this.serverless.configurationInput || null))
-      .digest('hex');
-    cacheFile.validationHash = serverlessConfigFileHash;
-    const cacheFilePath = getCacheFilePath(this.serverless.serviceDir);
-
-    return writeFile(cacheFilePath, cacheFile);
-  }
-
   convertShortcutsIntoOptions(command) {
     if (command.options) {
       Object.entries(command.options).forEach(([optionKey, optionObject]) => {
diff --git a/lib/classes/Service.js b/lib/classes/service.js
similarity index 52%
rename from lib/classes/Service.js
rename to lib/classes/service.js
index 51c23ee9793..5180514c5ca 100644
--- a/lib/classes/Service.js
+++ b/lib/classes/service.js
@@ -1,11 +1,13 @@
 'use strict';
 
-const { ServerlessError, logWarning } = require('./Error');
+const ServerlessError = require('../serverless-error');
 const util = require('util');
 const _ = require('lodash');
 const semver = require('semver');
+const { log } = require('@serverless/utils/log');
 const resolveCliInput = require('../cli/resolve-input');
 const currentVersion = require('../../package').version;
+const isLocallyInstalled = require('../cli/is-locally-installed');
 
 class Service {
   constructor(serverless, data) {
@@ -19,7 +21,6 @@ class Service {
     this.serviceObject = null;
     this.provider = {
       stage: 'dev',
-      variableSyntax: '\\${([^{}:]+?(?:\\(|:)(?:[^:{}][^{}]*?)?)}',
     };
     this.custom = {};
     this.plugins = [];
@@ -52,29 +53,92 @@ class Service {
   }
 
   loadServiceFileParam() {
-    const serverlessFileParam = this.serverless.configurationInput;
     // Not used internally, left set to not break plugins which depend on it
     // TOOD: Remove with next major
     this.serviceFilename = this.serverless.configurationFilename;
 
-    const serverlessFile = serverlessFileParam;
+    const configurationInput = this.serverless.configurationInput;
+
+    this.initialServerlessConfig = configurationInput;
+
+    // TODO: Ideally below approach should be replaced at some point with:
+    // 1. In "initialization" phase: Minimize reliance on service configuration
+    //    to few core properties
+    // 2. Before "run" phase: Validate and normalize (via AJV) `serverless.configurationInput`
+    //    into `serverless.configuration`
+    // 3. In "run" phase: Instead of relying on `serverless.service` rely on
+    //    `serverless.configuration` internally
+
+    // Below comments provide usage feedback helfpul for future refactor process.
+
+    // ## Properties currently accessed at "initialization" phase
+
+    this.disabledDeprecations = configurationInput.disabledDeprecations;
+    this.deprecationNotificationMode = configurationInput.deprecationNotificationMode;
+
+    // `provider` (`provder.name` by many plugin constructs, and few other core properties as
+    //              `provider.stage` are read by dashboard plugin)
+    if (!_.isObject(configurationInput.provider)) {
+      const providerName = configurationInput.provider;
+      this.provider = {
+        name: providerName,
+      };
+    } else {
+      this.provider = configurationInput.provider;
+    }
+    if (this.provider.stage == null) {
+      this.provider.stage = 'dev';
+    }
+
+    // `service` (read by dashboard plugin)
+    if (_.isObject(configurationInput.service)) {
+      throw new ServerlessError(
+        'Object notation for "service" property is not supported. Set "service" property directly with service name.',
+        'SERVICE_OBJECT_NOTATION'
+      );
+    } else {
+      this.serviceObject = { name: configurationInput.service };
+      this.service = configurationInput.service;
+    }
+
+    // (dashboard plugin)
+    this.app = configurationInput.app;
+    this.org = configurationInput.org;
+
+    this.plugins = configurationInput.plugins;
+
+    // `package.path` is read by few core plugins at initialization
+    if (configurationInput.package) {
+      this.package = configurationInput.package;
+    }
+
+    // ## Properties accessed at "run" phase
+    this.custom = configurationInput.custom; // (dashboard plugin)
+    this.resources = configurationInput.resources;
+    this.functions = configurationInput.functions || {};
+    this.configValidationMode = configurationInput.configValidationMode || 'warn';
+    if (this.provider.name === 'aws') {
+      this.layers = configurationInput.layers || {};
+    }
+    this.outputs = configurationInput.outputs;
+
     // basic service level validation
     const version = this.serverless.utils.getVersion();
-    let ymlVersion = serverlessFile.frameworkVersion;
+    let ymlVersion = configurationInput.frameworkVersion;
     if (ymlVersion && !semver.validRange(ymlVersion)) {
-      if (serverlessFile.configValidationMode === 'error') {
+      if (configurationInput.configValidationMode === 'error') {
         throw new ServerlessError(
           'Configured "frameworkVersion" does not represent a valid semver version range.',
           'INVALID_FRAMEWORK_VERSION'
         );
       }
-      logWarning(
+      log.warning(
         'Configured "frameworkVersion" does not represent a valid semver version range, version validation is skipped'
       );
       ymlVersion = null;
     }
-    if (!this.isLocallyInstalled && !ymlVersion && process.env.SLS_DEBUG) {
-      this.serverless.cli.log(
+    if (!isLocallyInstalled && !ymlVersion && !semver.parse(version).prerelease.length) {
+      log.info(
         'To ensure safe major version upgrades ensure "frameworkVersion" setting in ' +
           'service configuration ' +
           `(recommended setup: "frameworkVersion: ^${currentVersion}")\n`
@@ -91,83 +155,45 @@ class Service {
       ].join('');
       throw new ServerlessError(errorMessage, 'FRAMEWORK_VERSION_MISMATCH');
     }
-    if (!serverlessFile.service) {
+    if (!configurationInput.service) {
       throw new ServerlessError(
         `"service" property is missing in ${this.serverless.configurationFilename}`,
         'SERVICE_NAME_MISSING'
       );
     }
-    if (!serverlessFile.provider) {
+    if (!configurationInput.provider) {
       throw new ServerlessError(
         `"provider" property is missing in ${this.serverless.configurationFilename}`,
         'PROVIDER_NAME_MISSING'
       );
     }
-
-    // #######################################################################
-    // ## KEEP SYNCHRONIZED WITH EQUIVALENT IN ~/lib/plugins/print/print.js ##
-    // #######################################################################
-    // #####################################################################
-    // ## KEEP SYNCHRONIZED WITH EQUIVALENT IN ~/lib/classes/Variables.js ##
-    // ##   there, see `getValueFromSelf`                                 ##
-    // ##   here, see below                                               ##
-    // #####################################################################
-    if (!_.isObject(serverlessFile.provider)) {
-      const providerName = serverlessFile.provider;
-      serverlessFile.provider = {
-        name: providerName,
-      };
+    if (!_.isObject(configurationInput.provider)) {
+      // Schema uncoditionally expects `provider` to be an object.
+      // Ideally if it's fixed at some point, and either we do not support string notation for
+      // provider, or we support string by schema
+      configurationInput.provider = this.provider;
     }
 
-    if (_.isObject(serverlessFile.service)) {
-      this.serverless._logDeprecation(
-        'SERVICE_OBJECT_NOTATION',
-        'Starting from next major object notation for "service" property will no longer be ' +
-          'recognized. Set "service" property directly with service name.'
-      );
-      this.serviceObject = serverlessFile.service;
-      this.service = serverlessFile.service.name;
-    } else {
-      this.serviceObject = { name: serverlessFile.service };
-      this.service = serverlessFile.service;
-    }
+    return this;
+  }
 
-    this.app = serverlessFile.app;
-    this.tenant = serverlessFile.tenant;
-    this.org = serverlessFile.org;
-    this.custom = serverlessFile.custom;
-    this.plugins = serverlessFile.plugins;
-    this.resources = serverlessFile.resources;
-    this.functions = serverlessFile.functions || {};
-    this.configValidationMode = serverlessFile.configValidationMode || 'warn';
-    this.disabledDeprecations = serverlessFile.disabledDeprecations;
-    this.unresolvedVariablesNotificationMode = serverlessFile.unresolvedVariablesNotificationMode;
-
-    // merge so that the default settings are still in place and
-    // won't be overwritten
-    if (serverlessFile.provider) {
-      if (serverlessFile.provider.stage == null) {
-        serverlessFile.provider.stage = this.provider.stage;
-      }
-      if (serverlessFile.provider.variableSyntax == null) {
-        serverlessFile.provider.variableSyntax = this.provider.variableSyntax;
-      }
-      this.provider = serverlessFile.provider;
+  reloadServiceFileParam() {
+    const configurationInput = this.initialServerlessConfig;
+    if (_.isObject(configurationInput.provider)) {
+      this.provider = configurationInput.provider;
+      if (this.provider.stage == null) this.provider.stage = 'dev';
     }
-
-    if (serverlessFile.package) {
-      this.package = serverlessFile.package;
+    if (configurationInput.package) {
+      this.package = configurationInput.package;
     }
-
+    this.custom = configurationInput.custom;
+    this.resources = configurationInput.resources;
+    this.functions = configurationInput.functions || {};
+    this.configValidationMode = configurationInput.configValidationMode || 'warn';
     if (this.provider.name === 'aws') {
-      this.layers = serverlessFile.layers || {};
+      this.layers = configurationInput.layers || {};
     }
-
-    this.outputs = serverlessFile.outputs;
-
-    this.initialServerlessConfig = serverlessFile;
-
-    return this;
+    this.outputs = configurationInput.outputs;
   }
 
   setFunctionNames(rawOptions) {
@@ -177,7 +203,20 @@ class Service {
 
     // Ensure that function is an object and setup function.name property
     const stageNameForFunction = options.stage || this.provider.stage;
+
+    if (!_.isObject(this.functions)) {
+      throw new ServerlessError(
+        `Unexpected "functions" configuration: Expected object received: ${util.inspect(
+          this.functions
+        )}`,
+        'NON_OBJECT_FUNCTIONS_CONFIGURATION'
+      );
+    }
     Object.entries(this.functions).forEach(([functionName, functionObj]) => {
+      if (functionObj == null) {
+        delete this.functions[functionName];
+        return;
+      }
       if (!_.isObject(functionObj)) {
         throw new ServerlessError(
           `Unexpected "${functionName}" function configuration: Expected object received ${util.inspect(
@@ -206,7 +245,10 @@ class Service {
             if (typeof value === 'object') {
               return _.merge(memo, value);
             }
-            throw new Error(`Non-object value specified in ${key} array: ${value}`);
+            throw new ServerlessError(
+              `Non-object value specified in ${key} array: ${value}`,
+              'LEGACY_CONFIGURATION_PROPERTY_MERGE_INVALID_INPUT'
+            );
           }
 
           return memo;
@@ -215,16 +257,29 @@ class Service {
     });
   }
 
-  validate() {
+  async validate() {
     const userConfig = this.initialServerlessConfig;
-    userConfig.service = this.serviceObject;
 
     // Ensure to validate normalized (after mergeArrays) input
     if (userConfig.functions) userConfig.functions = this.functions;
     if (userConfig.resources) userConfig.resources = this.resources;
 
-    this.serverless.configSchemaHandler.validateConfig(userConfig);
+    await this.serverless.configSchemaHandler.validateConfig(userConfig);
 
+    if (userConfig.projectDir != null) {
+      this.serverless._logDeprecation(
+        'PROJECT_DIR',
+        'The "projectDir" option is no longer used and is ignored. ' +
+          'You can safely remove it from the configuration'
+      );
+    }
+    if (userConfig.variablesResolutionMode != null) {
+      this.serverless._logDeprecation(
+        'VARIABLES_RESOLUTION_MODE',
+        'Starting with v3.0, the "variablesResolutionMode" option is now useless. ' +
+          'You can safely remove it from the configuration'
+      );
+    }
     return this;
   }
 
@@ -256,14 +311,20 @@ class Service {
     if (functionName in this.functions) {
       return this.functions[functionName];
     }
-    throw new ServerlessError(`Function "${functionName}" doesn't exist in this Service`);
+    throw new ServerlessError(
+      `Function "${functionName}" doesn't exist in this Service`,
+      'FUNCTION_MISSING_IN_SERVICE'
+    );
   }
 
   getLayer(layerName) {
     if (layerName in this.layers) {
       return this.layers[layerName];
     }
-    throw new ServerlessError(`Layer "${layerName}" doesn't exist in this Service`);
+    throw new ServerlessError(
+      `Layer "${layerName}" doesn't exist in this Service`,
+      'LAYER_MISSING_IN_SERVICE'
+    );
   }
 
   getEventInFunction(eventName, functionName) {
@@ -273,7 +334,10 @@ class Service {
     if (event) {
       return event;
     }
-    throw new ServerlessError(`Event "${eventName}" doesn't exist in function "${functionName}"`);
+    throw new ServerlessError(
+      `Event "${eventName}" doesn't exist in function "${functionName}"`,
+      'EVENT_MISSING_FOR_FUNCTION'
+    );
   }
 
   getAllEventsInFunction(functionName) {
diff --git a/lib/classes/Utils.js b/lib/classes/utils.js
similarity index 83%
rename from lib/classes/Utils.js
rename to lib/classes/utils.js
index fdf04817583..288530fecc1 100644
--- a/lib/classes/Utils.js
+++ b/lib/classes/utils.js
@@ -6,13 +6,13 @@ const fs = require('fs');
 const path = require('path');
 const BbPromise = require('bluebird');
 const fse = require('fs-extra');
-const fileExistsSync = require('../utils/fs/fileExistsSync');
-const writeFileSync = require('../utils/fs/writeFileSync');
-const copyDirContentsSync = require('../utils/fs/copyDirContentsSync');
-const readFileSync = require('../utils/fs/readFileSync');
-const readFile = require('../utils/fs/readFile');
-const walkDirSync = require('../utils/fs/walkDirSync');
-const dirExistsSync = require('../utils/fs/dirExistsSync');
+const fileExistsSync = require('../utils/fs/file-exists-sync');
+const writeFileSync = require('../utils/fs/write-file-sync');
+const copyDirContentsSync = require('../utils/fs/copy-dir-contents-sync');
+const readFileSync = require('../utils/fs/read-file-sync');
+const readFile = require('../utils/fs/read-file');
+const walkDirSync = require('../utils/fs/walk-dir-sync');
+const dirExistsSync = require('../utils/fs/dir-exists-sync');
 const version = require('../../package.json').version;
 
 class Utils {
diff --git a/lib/classes/YamlParser.js b/lib/classes/yaml-parser.js
similarity index 100%
rename from lib/classes/YamlParser.js
rename to lib/classes/yaml-parser.js
diff --git a/lib/cli/commands-schema/aws-service.js b/lib/cli/commands-schema/aws-service.js
index 1c1cbe6b3cf..58ce9173581 100644
--- a/lib/cli/commands-schema/aws-service.js
+++ b/lib/cli/commands-schema/aws-service.js
@@ -6,6 +6,7 @@ const serviceCommands = require('./service');
 const commands = (module.exports = new Map());
 
 commands.set('deploy', {
+  groupName: 'main',
   usage: 'Deploy a Serverless service',
   options: {
     'conceal': {
@@ -16,37 +17,25 @@ commands.set('deploy', {
       usage: 'Path of the deployment package',
       shortcut: 'p',
     },
-    'verbose': {
-      usage: 'Show all stack events during deployment',
-      shortcut: 'v',
-      type: 'boolean',
-    },
     'force': {
       usage: 'Forces a deployment to take place',
       type: 'boolean',
     },
-    'function': {
-      usage: "Function name. Deploys a single function (see 'deploy function')",
-      shortcut: 'f',
-    },
     'aws-s3-accelerate': {
       usage: 'Enables S3 Transfer Acceleration making uploading artifacts much faster.',
       type: 'boolean',
     },
+    'enforce-hash-update': {
+      usage:
+        'Enforces new function version by overriding descriptions across all your functions. To be used only when migrating to new hashing algorithm.',
+      type: 'boolean',
+    },
   },
-  lifecycleEvents: [
-    'deprecated#cleanup->package:cleanup',
-    'deprecated#initialize->package:initialize',
-    'deprecated#setupProviderConfiguration->package:setupProviderConfiguration',
-    'deprecated#createDeploymentArtifacts->package:createDeploymentArtifacts',
-    'deprecated#compileFunctions->package:compileFunctions',
-    'deprecated#compileEvents->package:compileEvents',
-    'deploy',
-    'finalize',
-  ],
+  lifecycleEvents: ['deploy', 'finalize'],
 });
 
 commands.set('deploy function', {
+  groupName: 'main',
   usage: 'Deploy a single function from the service',
   options: {
     'function': {
@@ -77,6 +66,7 @@ commands.set('deploy list functions', {
 });
 
 commands.set('info', {
+  groupName: 'main',
   usage: 'Display information about the service',
   options: {
     conceal: {
@@ -88,6 +78,7 @@ commands.set('info', {
 });
 
 commands.set('invoke', {
+  groupName: 'main',
   usage: 'Invoke a deployed function',
   options: {
     function: {
@@ -131,6 +122,7 @@ commands.set('invoke', {
 });
 
 commands.set('invoke local', {
+  groupName: 'main',
   usage: 'Invoke function locally',
   options: {
     'function': {
@@ -171,6 +163,7 @@ commands.set('invoke local', {
 });
 
 commands.set('logs', {
+  groupName: 'main',
   usage: 'Output the logs of a deployed function',
   options: {
     function: {
@@ -217,13 +210,6 @@ commands.set('metrics', {
 
 commands.set('remove', {
   usage: 'Remove Serverless service and all resources',
-  options: {
-    verbose: {
-      usage: 'Show all stack events during deployment',
-      shortcut: 'v',
-      type: 'boolean',
-    },
-  },
   lifecycleEvents: ['remove'],
 });
 
@@ -235,11 +221,6 @@ commands.set('rollback', {
       shortcut: 't',
       required: false,
     },
-    verbose: {
-      usage: 'Show all stack events during deployment',
-      shortcut: 'v',
-      type: 'boolean',
-    },
   },
   lifecycleEvents: ['initialize', 'rollback'],
 });
@@ -260,18 +241,6 @@ commands.set('rollback function', {
   lifecycleEvents: ['rollback'],
 });
 
-commands.set('studio', {
-  usage: 'Develop a Serverless application in the cloud.',
-  options: {
-    autoStage: {
-      usage: 'If specified, generate a random stage. This stage will be removed on exit.',
-      shortcut: 'a',
-      type: 'boolean',
-    },
-  },
-  lifecycleEvents: ['studio'],
-});
-
 commands.set('test', {
   usage: 'Run HTTP tests',
   options: {
diff --git a/lib/cli/commands-schema/common-options/global.js b/lib/cli/commands-schema/common-options/global.js
index 92ec7976bf4..f53106bda21 100644
--- a/lib/cli/commands-schema/common-options/global.js
+++ b/lib/cli/commands-schema/common-options/global.js
@@ -2,7 +2,9 @@
 
 module.exports = {
   help: { usage: 'Show this message', shortcut: 'h', type: 'boolean' },
-  version: { usage: 'Show version info', type: 'boolean' },
+  version: { usage: 'Show version info', shortcut: 'v', type: 'boolean' },
+  verbose: { usage: 'Show verbose logs', type: 'boolean' },
+  debug: { usage: 'Namespace of debug logs to expose (use "*" to display all)', type: 'string' },
 };
 
 for (const optionSchema of Object.values(module.exports)) {
diff --git a/lib/cli/commands-schema/no-service.js b/lib/cli/commands-schema/no-service.js
index e4908975e67..f5d271b6861 100644
--- a/lib/cli/commands-schema/no-service.js
+++ b/lib/cli/commands-schema/no-service.js
@@ -12,8 +12,20 @@ commands.set('', {
   hasAwsExtension: true,
   options: {
     'help-interactive': { usage: 'Show this message', type: 'boolean' },
+    'name': {
+      usage: 'Name for the service.',
+    },
+    'template': {
+      usage: 'Name of template for the service.',
+    },
+    'template-path': {
+      usage: 'Template local path for the service.',
+    },
+    'template-url': {
+      usage: 'Template url for the service.',
+    },
   },
-  lifecycleEvents: ['initializeService', 'setupAws', 'autoUpdate', 'tabCompletion', 'end'],
+  lifecycleEvents: ['initializeService', 'setupAws', 'autoUpdate', 'end'],
 });
 
 commands.set('config', {
@@ -59,36 +71,6 @@ commands.set('config credentials', {
   lifecycleEvents: ['config'],
 });
 
-(() => {
-  const isHidden = process.platform === 'win32';
-  const noSupportNotice = '<tab> completion is not supported on Windows';
-
-  commands.set('config tabcompletion install', {
-    usage: 'Install a <tab> completion for chosen shell',
-    isHidden,
-    noSupportNotice,
-    options: {
-      shell: {
-        usage:
-          'Shell for which <tab> completion should be installed. ' +
-          'Supported options: bash (default), zsh, fish ',
-        shortcut: 's',
-      },
-      location: {
-        usage: 'Custom location for shell config',
-        shortcut: 'l',
-      },
-    },
-    lifecycleEvents: ['install'],
-  });
-  commands.set('config tabcompletion uninstall', {
-    usage: 'Uninstall a <tab> completion',
-    isHidden,
-    noSupportNotice,
-    lifecycleEvents: ['uninstall'],
-  });
-})();
-
 commands.set('create', {
   usage: 'Create new Serverless service',
   options: {
@@ -120,6 +102,11 @@ commands.set('create', {
 commands.set('dashboard', {
   usage: 'Open the Serverless dashboard',
   lifecycleEvents: ['dashboard'],
+  serviceDependencyMode: 'optional',
+});
+
+commands.set('doctor', {
+  usage: 'Print status on reported deprecations triggered in the last command run',
 });
 
 commands.set('generate-event', {
@@ -142,7 +129,7 @@ commands.set('generate-event', {
 });
 
 commands.set('help', {
-  // Shows general "help", so has no specific usage info
+  usage: 'Show this help',
   serviceDependencyMode: 'optional',
 });
 
@@ -245,7 +232,7 @@ commands.set('slstats', {
 });
 
 (() => {
-  const isHidden = !require('../../utils/isStandaloneExecutable') || process.platform === 'win32';
+  const isHidden = !require('../../utils/is-standalone-executable') || process.platform === 'win32';
   const noSupportNotice =
     "It's applicable only in context of a standalone executable instance " +
     'in non Windows environment.';
diff --git a/lib/cli/commands-schema/resolve-final.js b/lib/cli/commands-schema/resolve-final.js
index 025a8063b26..feb8819838b 100644
--- a/lib/cli/commands-schema/resolve-final.js
+++ b/lib/cli/commands-schema/resolve-final.js
@@ -8,9 +8,7 @@ const serviceCommands = require('./service');
 const awsServiceCommands = require('./aws-service');
 const serviceOptions = require('./common-options/service');
 const awsServiceOptions = require('./common-options/aws-service');
-const logDeprecation = require('../../utils/logDeprecation');
-
-const deprecatedEventPattern = /^deprecated#(.*?)(?:->(.*?))?$/;
+const logDeprecation = require('../../utils/log-deprecation');
 
 module.exports = (loadedPlugins, { providerName, configuration }) => {
   const commands = new Map(providerName === 'aws' ? awsServiceCommands : serviceCommands);
@@ -27,9 +25,6 @@ module.exports = (loadedPlugins, { providerName, configuration }) => {
           .map(([name, schema]) => {
             const lifecycleEventNamePrefix = name.split(' ').join(':');
             return (schema.lifecycleEvents || []).map((lifecycleEventBaseName) => {
-              if (lifecycleEventBaseName.startsWith('deprecated#')) {
-                lifecycleEventBaseName = lifecycleEventBaseName.match(deprecatedEventPattern)[1];
-              }
               const lifecycleEventName = `${lifecycleEventNamePrefix}:${lifecycleEventBaseName}`;
               return [
                 [`before:${lifecycleEventName}`, name],
@@ -113,7 +108,7 @@ module.exports = (loadedPlugins, { providerName, configuration }) => {
 
   if (missingOptionTypes.size) {
     logDeprecation(
-      'CLI_OPTIONS_SCHEMA',
+      'CLI_OPTIONS_SCHEMA_V3',
       'CLI options definitions were upgraded with "type" property (which could be one of "string", "boolean", "multiple"). ' +
         'Below listed plugins do not predefine type for introduced options:\n' +
         ` - ${Array.from(
diff --git a/lib/cli/conditionally-load-dotenv.js b/lib/cli/conditionally-load-dotenv.js
index f5e8adde625..92444d65664 100644
--- a/lib/cli/conditionally-load-dotenv.js
+++ b/lib/cli/conditionally-load-dotenv.js
@@ -1,40 +1,11 @@
-// TODO: Remove with next major release
-
 'use strict';
 
-const path = require('path');
 const _ = require('lodash');
-const memoizee = require('memoizee');
-const fileExists = require('../utils/fs/fileExists');
-const logDeprecation = require('../utils/logDeprecation');
-
-module.exports = memoizee(
-  async (options, configuration) => {
-    const stage = options.stage || _.get(configuration, 'provider.stage', 'dev');
-    if (configuration.useDotenv) {
-      require('./load-dotenv')(stage);
-      return;
-    }
-
-    const defaultEnvFilePath = path.resolve('.env');
-    const stageEnvFilePath = path.resolve(`.env.${stage}`);
-
-    const [doesStageEnvFileExists, doesDefaultEnvFileExists] = await Promise.all([
-      fileExists(stageEnvFilePath),
-      fileExists(defaultEnvFilePath),
-    ]);
 
-    if (doesDefaultEnvFileExists || doesStageEnvFileExists) {
-      logDeprecation(
-        'LOAD_VARIABLES_FROM_ENV_FILES',
-        'Detected ".env" files. In the next major release variables from ".env" ' +
-          'files will be automatically loaded into the serverless build process. ' +
-          'Set "useDotenv: true" to adopt that behavior now.',
-        { serviceConfig: configuration }
-      );
-    }
-  },
-  {
-    length: 0 /* Intentionally no "promise: true" as rejection means critical non-retryable error */,
+module.exports = async (options, configuration) => {
+  const stage = options.stage || _.get(configuration, 'provider.stage', 'dev');
+  if (configuration.useDotenv) {
+    require('./load-dotenv')(stage);
+    return;
   }
-);
+};
diff --git a/lib/cli/ensure-supported-command.js b/lib/cli/ensure-supported-command.js
index 933fb921a89..ba8b673af86 100644
--- a/lib/cli/ensure-supported-command.js
+++ b/lib/cli/ensure-supported-command.js
@@ -3,7 +3,6 @@
 const { distance: getDistance } = require('fastest-levenshtein');
 const resolveInput = require('./resolve-input');
 const ServerlessError = require('../serverless-error');
-const logDeprecation = require('../utils/logDeprecation');
 
 const getCommandSuggestion = (command, commandsSchema) => {
   let suggestion;
@@ -25,14 +24,8 @@ const getCommandSuggestion = (command, commandsSchema) => {
 };
 
 module.exports = (configuration = null) => {
-  const {
-    command,
-    options,
-    commandSchema,
-    commandsSchema,
-    isContainerCommand,
-    isHelpRequest,
-  } = resolveInput();
+  const { command, options, commandSchema, commandsSchema, isContainerCommand, isHelpRequest } =
+    resolveInput();
 
   if (!commandSchema && !isContainerCommand) {
     throw new ServerlessError(
@@ -48,11 +41,9 @@ module.exports = (configuration = null) => {
     (optionName) => !supportedOptions.has(optionName)
   );
   if (unrecognizedOptions.length) {
-    logDeprecation(
-      'UNSUPPORTED_CLI_OPTIONS',
-      `Detected unrecognized CLI options: "--${unrecognizedOptions.join('", "--')}".\n` +
-        'Starting with the next major, Serverless Framework will report them with a thrown error',
-      { serviceConfig: configuration }
+    throw new ServerlessError(
+      `Detected unrecognized CLI options: "--${unrecognizedOptions.join('", "--')}".\n`,
+      'UNSUPPORTED_CLI_OPTIONS'
     );
   }
   if (isContainerCommand) return;
diff --git a/lib/cli/handle-error.js b/lib/cli/handle-error.js
index 66a0c88145d..1d686e8ec2e 100644
--- a/lib/cli/handle-error.js
+++ b/lib/cli/handle-error.js
@@ -1,126 +1,90 @@
 'use strict';
 
-const path = require('path');
 const isObject = require('type/object/is');
-const chalk = require('chalk');
-const isStandaloneExecutable = require('../utils/isStandaloneExecutable');
-const resolveLocalServerlessPath = require('./resolve-local-serverless-path');
+const stripAnsi = require('strip-ansi');
+const sfeVersion = require('@serverless/dashboard-plugin/package.json').version;
+const { platformClientVersion } = require('@serverless/dashboard-plugin');
+const { getDashboardProvidersUrl } = require('@serverless/dashboard-plugin/lib/dashboard');
+const { style, writeText } = require('@serverless/utils/log');
 const slsVersion = require('./../../package').version;
-const sfeVersion = require('@serverless/enterprise-plugin/package.json').version;
-const { platformClientVersion } = require('@serverless/enterprise-plugin');
-const ServerlessError = require('../serverless-error');
+const isStandaloneExecutable = require('../utils/is-standalone-executable');
 const tokenizeException = require('../utils/tokenize-exception');
+const isLocallyInstalled = require('./is-locally-installed');
+const resolveErrorLocation = require('../utils/telemetry/resolve-error-location');
 
-const serverlessPath = path.resolve(__dirname, '../Serverless.js');
-
-const consoleLog = (message) => process.stdout.write(`${message}\n`);
-
-const writeMessage = (title, message) => {
-  let line = '';
-  while (line.length < 56 - title.length) {
-    line = `${line}-`;
-  }
-
-  process.stdout.write(' \n');
-  consoleLog(chalk.yellow(` ${title} ${line}`));
-  consoleLog(' ');
-
-  if (message) {
-    consoleLog(`  ${message.split('\n').join('\n  ')}`);
-  }
-
-  consoleLog(' ');
-};
+const isErrorCodeNormative = RegExp.prototype.test.bind(/^[A-Z][A-Z0-9]*(?:_[A-Z0-9]+)*$/);
 
 module.exports = async (exception, options = {}) => {
   if (!isObject(options)) options = {};
-  const { isUncaughtException, isLocallyInstalled, isInvokedByGlobalInstallation } = options;
+  const { serverless } = options;
 
-  if (isInvokedByGlobalInstallation) {
-    const localServerlessPath = await resolveLocalServerlessPath();
+  const exceptionTokens = tokenizeException(exception);
+  const isUserError = exceptionTokens.isUserError;
 
-    try {
-      // Attempt to use error handler from local version
-      // TODO: Remove local version fallback with next major (when its moved to the top of the process)
-      try {
-        require(path.resolve(localServerlessPath, '../cli/handle-error'))(exception, {
-          isLocallyInstalled,
-          isUncaughtException,
-        });
-        return;
-      } catch (error) {
-        // Pass and attempt to use old-style error handler from local version
+  const platform = process.platform;
+  const nodeVersion = process.version.replace(/^[v|V]/, '');
+  const installationModePostfix = (() => {
+    if (isStandaloneExecutable) return ' (standalone)';
+    return isLocallyInstalled ? ' (local)' : '';
+  })();
+  const globalInstallationPostfix = (() => {
+    if (EvalError.$serverlessInitInstallationVersion) {
+      return ` ${EvalError.$serverlessInitInstallationVersion}v (global)`;
+    }
+    return '';
+  })();
 
-        // Ugly mock of serverless below is used to ensure that Framework version will be logged with `(local)` suffix
-        require(path.resolve(localServerlessPath, '../classes/Error')).logError(exception, {
-          serverless: { isLocallyInstalled },
-          forceExit: isUncaughtException,
-        });
-        return;
+  const detailsTextTokens = [
+    `Environment: ${platform}, node ${nodeVersion}, ` +
+      `framework ${slsVersion}${installationModePostfix}${globalInstallationPostfix}, ` +
+      `plugin ${sfeVersion}, SDK ${platformClientVersion}`,
+  ];
+
+  if (serverless && serverless.service.provider.name === 'aws') {
+    const credentials = serverless.getProvider('aws').cachedCredentials;
+    if (credentials) {
+      if (credentials.dashboardProviderAlias) {
+        detailsTextTokens.push(
+          `Credentials: Serverless Dashboard, "${
+            credentials.dashboardProviderAlias
+          }" provider (${getDashboardProvidersUrl(serverless.pluginManager.dashboardPlugin)})`
+        );
+      } else if (credentials.credentials) {
+        if (credentials.credentials.profile) {
+          detailsTextTokens.push(
+            `Credentials: Local, "${credentials.credentials.profile}" profile`
+          );
+        } else {
+          // The only alternative here are credentials from environment variables
+          detailsTextTokens.push('Credentials: Local, environment variables');
+        }
       }
-    } catch (err) {
-      // This is just a fallback as for most (all?) versions it shouldn't happen
-      throw new ServerlessError(
-        'Could not resolve path to locally installed error handler.',
-        'INVALID_LOCAL_SERVERLESS_ERROR_HANDLER'
-      );
     }
   }
 
-  const exceptionTokens = tokenizeException(exception);
-  const isUserError = !isUncaughtException && exceptionTokens.isUserError;
-
-  writeMessage(
-    exceptionTokens.title,
-    exceptionTokens.stack && (!isUserError || process.env.SLS_DEBUG)
-      ? exceptionTokens.stack
-      : exceptionTokens.message
+  detailsTextTokens.push(
+    'Docs:        docs.serverless.com',
+    'Support:     forum.serverless.com',
+    'Bugs:        github.com/serverless/serverless/issues'
   );
 
-  if (!isUserError && !process.env.SLS_DEBUG) {
-    const debugInfo = [
-      '    ',
-      ' For debugging logs, run again after setting the',
-      ' "SLS_DEBUG=*" environment variable.',
-    ].join('');
-    consoleLog(chalk.red(debugInfo));
-    consoleLog(' ');
-  }
-
-  const platform = process.platform;
-  const nodeVersion = process.version.replace(/^[v|V]/, '');
+  writeText(style.aside(...detailsTextTokens));
 
-  consoleLog(chalk.yellow('  Get Support --------------------------------------------'));
-  consoleLog(`${chalk.yellow('     Docs:          ')}docs.serverless.com`);
-  consoleLog(`${chalk.yellow('     Bugs:          ')}github.com/serverless/serverless/issues`);
-  consoleLog(`${chalk.yellow('     Issues:        ')}forum.serverless.com`);
+  // TODO: Ideally after migrating to new logger complete this strip should not be needed
+  //       (it can be removed after we clear all chalk error message decorations from internals)
+  const errorMsg =
+    exceptionTokens.decoratedMessage ||
+    stripAnsi(
+      exceptionTokens.stack && !isUserError ? exceptionTokens.stack : exceptionTokens.message
+    );
+  writeText(null, style.error('Error:'), errorMsg);
 
-  consoleLog(' ');
-  consoleLog(chalk.yellow('  Your Environment Information ---------------------------'));
-  consoleLog(chalk.yellow(`     Operating System:          ${platform}`));
-  consoleLog(chalk.yellow(`     Node Version:              ${nodeVersion}`));
-
-  const installationModePostfix = await (async () => {
-    if (isStandaloneExecutable) return ' (standalone)';
-    if (isLocallyInstalled != null) return isLocallyInstalled ? ' (local)' : '';
-    return serverlessPath === (await resolveLocalServerlessPath()) ? ' (local)' : '';
-  })();
-  consoleLog(
-    chalk.yellow(`     Framework Version:         ${slsVersion}${installationModePostfix}`)
-  );
-  consoleLog(chalk.yellow(`     Plugin Version:            ${sfeVersion}`));
-  consoleLog(chalk.yellow(`     SDK Version:               ${platformClientVersion}`));
+  process.exitCode = 1;
 
-  const componentsVersion = (() => {
-    try {
-      return require('@serverless/components/package').version;
-    } catch (error) {
-      return 'Unavailable';
-    }
-  })();
-  consoleLog(chalk.yellow(`     Components Version:        ${componentsVersion}`));
-  consoleLog(' ');
+  const failureReason = { kind: isUserError ? 'user' : 'programmer', code: exception.code };
+  if (!isUserError || !exception.code || !isErrorCodeNormative(exception.code)) {
+    failureReason.location = resolveErrorLocation(exceptionTokens);
+  }
 
-  process.exitCode = 1;
-  if (isUncaughtException) process.exit();
+  return { telemetryData: { failureReason, outcome: 'failure' } };
 };
diff --git a/lib/cli/interactive-setup/aws-credentials.js b/lib/cli/interactive-setup/aws-credentials.js
new file mode 100644
index 00000000000..46507508d84
--- /dev/null
+++ b/lib/cli/interactive-setup/aws-credentials.js
@@ -0,0 +1,449 @@
+'use strict';
+
+const { log, style, progress } = require('@serverless/utils/log');
+const _ = require('lodash');
+const inquirer = require('@serverless/utils/inquirer');
+const promptWithHistory = require('@serverless/utils/inquirer/prompt-with-history');
+const memoizee = require('memoizee');
+const AWS = require('aws-sdk');
+
+const awsCredentials = require('../../plugins/aws/utils/credentials');
+const { confirm, doesServiceInstanceHaveLinkedProvider } = require('./utils');
+const openBrowser = require('../../utils/open-browser');
+const ServerlessError = require('../../serverless-error');
+const resolveStage = require('../../utils/resolve-stage');
+const resolveRegion = require('../../utils/resolve-region');
+
+const isValidAwsAccessKeyId = RegExp.prototype.test.bind(/^[A-Z0-9]{10,}$/);
+const isValidAwsSecretAccessKey = RegExp.prototype.test.bind(/^[a-zA-Z0-9/+]{10,}$/);
+const { getPlatformClientWithAccessKey } = require('@serverless/dashboard-plugin/lib/client-utils');
+const isAuthenticated = require('@serverless/dashboard-plugin/lib/is-authenticated');
+
+const CREDENTIALS_SETUP_CHOICE = {
+  LOCAL: '_local_',
+  CREATE_PROVIDER: '_create_provider_',
+  SKIP: '_skip_',
+};
+
+const getProviderLinkUid = ({ app, service, stage, region }) =>
+  `appName|${app}|serviceName|${service}|stage|${stage}|region|${region}`;
+
+const getSdkInstance = memoizee(
+  async (orgName) => {
+    return getPlatformClientWithAccessKey(orgName);
+  },
+  { promise: true }
+);
+
+const getOrgUidByName = memoizee(
+  async (orgName) => {
+    const sdk = await getSdkInstance(orgName);
+    let organization;
+    try {
+      organization = await sdk.organizations.get({ orgName });
+    } catch (err) {
+      if (err.statusCode && err.statusCode >= 500) {
+        throw new ServerlessError(
+          'Serverless Dashboard is currently unavailable, please try again later',
+          'DASHBOARD_UNAVAILABLE'
+        );
+      }
+      throw err;
+    }
+    return organization.orgUid;
+  },
+  { promise: true }
+);
+
+const getProviders = memoizee(
+  async (orgName) => {
+    const sdk = await getSdkInstance(orgName);
+    const orgUid = await getOrgUidByName(orgName);
+    let providers;
+    try {
+      providers = await sdk.getProviders(orgUid);
+    } catch (err) {
+      if (err.statusCode && err.statusCode >= 500) {
+        throw new ServerlessError(
+          'Serverless Dashboard is currently unavailable, please try again later',
+          'DASHBOARD_UNAVAILABLE'
+        );
+      }
+      throw err;
+    }
+    return providers.result;
+  },
+  {
+    promise: true,
+  }
+);
+
+const awsAccessKeyIdInput = async ({ stepHistory }) => {
+  const accessKeyId = await promptWithHistory({
+    message: 'AWS Access Key Id:',
+    type: 'input',
+    name: 'accessKeyId',
+    stepHistory,
+    validate: (input) => {
+      if (isValidAwsAccessKeyId(input.trim())) return true;
+      return 'AWS Access Key Id seems invalid.\n   Expected something like AKIAIOSFODNN7EXAMPLE';
+    },
+  });
+  return accessKeyId;
+};
+
+const awsSecretAccessKeyInput = async ({ stepHistory }) => {
+  const secretAccessKey = await promptWithHistory({
+    message: 'AWS Secret Access Key:',
+    type: 'input',
+    name: 'secretAccessKey',
+    stepHistory,
+    validate: (input) => {
+      if (isValidAwsSecretAccessKey(input.trim())) return true;
+      return (
+        'AWS Secret Access Key seems invalid.\n' +
+        '   Expected something like wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY'
+      );
+    },
+  });
+  return secretAccessKey;
+};
+
+const credentialsSetupChoice = async (context, providers) => {
+  let credentialsSetupChoices = [];
+  let message = 'No AWS credentials found, what credentials do you want to use?';
+
+  if (providers) {
+    // This is situation where we know that user has decided to link his service to an org
+    const hasExistingProviders = Boolean(providers.length);
+    if (hasExistingProviders) {
+      message = 'What credentials do you want to use?';
+    }
+    const createAccessRoleName = hasExistingProviders
+      ? 'Create a new AWS Access Role provider'
+      : 'AWS Access Role (most secure)';
+
+    const formatProviderName = (provider) => {
+      if (provider.providerType === 'roleArn') {
+        return `${provider.alias} (${provider.providerDetails.roleArn})`;
+      }
+      // Otherwise its `accessKey`-based provider
+
+      return `${provider.alias} (${provider.providerDetails.accessKeyId})`;
+    };
+    credentialsSetupChoices = [
+      ...providers.map((provider) => ({
+        name: formatProviderName(provider),
+        value: provider.providerUid,
+      })),
+      { name: createAccessRoleName, value: CREDENTIALS_SETUP_CHOICE.CREATE_PROVIDER },
+    ];
+  }
+
+  credentialsSetupChoices.push(
+    { name: 'Local AWS Access Keys', value: CREDENTIALS_SETUP_CHOICE.LOCAL },
+    { name: 'Skip', value: CREDENTIALS_SETUP_CHOICE.SKIP }
+  );
+
+  const result = await promptWithHistory({
+    message,
+    type: 'list',
+    name: 'credentialsSetupChoice',
+    choices: credentialsSetupChoices,
+    stepHistory: context.stepHistory,
+  });
+  return result;
+};
+
+const steps = {
+  writeOnSetupSkip: () => {
+    log.notice();
+    log.notice.skip(
+      `You can setup your AWS account later. More details available here: ${style.link(
+        'http://slss.io/aws-creds-setup'
+      )}`
+    );
+  },
+
+  ensureAwsAccount: async ({ stepHistory }) => {
+    if (await confirm('Do you have an AWS account?', { name: 'hasAwsAccount' })) return;
+    openBrowser('https://portal.aws.amazon.com/billing/signup');
+    await promptWithHistory({
+      message: 'Press Enter to continue after creating an AWS account',
+      name: 'createAwsAccountPrompt',
+      stepHistory,
+    });
+  },
+  ensureAwsCredentials: async ({ options, configuration, stepHistory }) => {
+    const region = options.region || configuration.provider.region || 'us-east-1';
+    openBrowser(
+      `https://console.aws.amazon.com/iam/home?region=${region}#/users$new?step=final&accessKey&userNames=serverless&permissionType=policies&policies=arn:aws:iam::aws:policy%2FAdministratorAccess`
+    );
+    await promptWithHistory({
+      message: 'Press Enter to continue after creating an AWS user with access keys',
+      name: 'generateAwsCredsPrompt',
+      stepHistory,
+    });
+  },
+  inputAwsCredentials: async (context) => {
+    const accessKeyId = await awsAccessKeyIdInput(context);
+    const secretAccessKey = await awsSecretAccessKeyInput(context);
+    await awsCredentials.saveFileProfiles(new Map([['default', { accessKeyId, secretAccessKey }]]));
+    log.notice();
+    log.notice.success(
+      `AWS credentials saved on your machine at "${
+        process.platform === 'win32' ? '%userprofile%\\.aws\\credentials' : '~/.aws/credentials'
+      }". Go there to change them at any time.`
+    );
+  },
+  handleProviderCreation: async ({ configuration: { org: orgName }, stepHistory }) => {
+    const providersUrl = `https://app.serverless.com/${orgName}/settings/providers?source=cli&providerId=new&provider=aws`;
+    openBrowser(providersUrl);
+    log.notice('To learn more about providers, visit: http://slss.io/add-providers-dashboard');
+
+    const providerProgress = progress.get('provider');
+    providerProgress.notice('Waiting for creation of AWS Access Role provider');
+
+    let onEvent;
+    let showSkipPromptTimeout;
+
+    const p = new Promise((resolve) => {
+      let inquirerPrompt;
+
+      const timeoutDuration = 1000 * 30; // 30 seconds
+      showSkipPromptTimeout = setTimeout(() => {
+        const promptName = 'skipProviderSetup';
+        stepHistory.start(promptName);
+        inquirerPrompt = inquirer.prompt({
+          message:
+            '\n [If you encountered an issue when setting up a provider, you may press Enter to skip this step]',
+          name: promptName,
+        });
+
+        inquirerPrompt.then(() => {
+          stepHistory.finalize(promptName, true);
+          resolve(null);
+        });
+      }, timeoutDuration);
+
+      onEvent = (event) => {
+        if (inquirerPrompt) {
+          // Disable inquirer prompt asking to skip without setting provider
+          inquirerPrompt.ui.close();
+        }
+
+        clearTimeout(showSkipPromptTimeout);
+        resolve(event);
+      };
+    });
+
+    // Listen for `provider.created` event to detect creation of new provider
+    const sdk = await getSdkInstance(orgName);
+    try {
+      await sdk.connect({
+        orgName,
+        onEvent,
+        filter: {
+          events: ['provider.created'],
+        },
+      });
+    } catch (err) {
+      // Ensure that prompt timeout is cleared in case of error
+      clearTimeout(showSkipPromptTimeout);
+
+      if (err.statusCode && err.statusCode >= 500) {
+        throw new ServerlessError(
+          'Serverless Dashboard is currently unavailable, please try again later',
+          'DASHBOARD_UNAVAILABLE'
+        );
+      }
+      throw err;
+    }
+
+    let maybeEvent;
+    try {
+      maybeEvent = await p;
+    } finally {
+      sdk.disconnect();
+    }
+
+    providerProgress.remove();
+
+    log.notice();
+    if (maybeEvent) {
+      log.notice.success('AWS Access Role provider was successfully created');
+      return maybeEvent.data.object.provider_uid;
+    }
+
+    log.notice.skip(
+      'Skipping credentials provider setup. You can still setup credentials provider later.'
+    );
+    return null;
+  },
+  linkProviderToServiceInstance: async ({ providerUid, configuration, options }) => {
+    const { app, service, org } = configuration;
+    const stage = resolveStage({ configuration, options });
+    const region = resolveRegion({ configuration, options });
+    const sdk = await getSdkInstance(org);
+    const linkType = 'instance';
+    const linkUid = getProviderLinkUid({ app, service, region, stage });
+    let orgUid;
+    try {
+      orgUid = await getOrgUidByName(org);
+    } catch (err) {
+      if (err.code === 'DASHBOARD_UNAVAILABLE') {
+        log.error();
+        log.error(err.message);
+        return false;
+      }
+      throw err;
+    }
+    try {
+      await sdk.createProviderLink(orgUid, linkType, linkUid, providerUid);
+      return true;
+    } catch (err) {
+      if (err.statusCode && err.statusCode >= 500) {
+        log.error();
+        log.error('Serverless Dashboard is currently unavailable, please try again later');
+        return false;
+      }
+      throw err;
+    }
+  },
+};
+
+module.exports = {
+  async isApplicable(context) {
+    const { configuration, history, options, serviceDir } = context;
+
+    if (!serviceDir) {
+      context.inapplicabilityReasonCode = 'NOT_IN_SERVICE_DIRECTORY';
+      return false;
+    }
+
+    if (
+      _.get(configuration, 'provider') !== 'aws' &&
+      _.get(configuration, 'provider.name') !== 'aws'
+    ) {
+      context.inapplicabilityReasonCode = 'NON_AWS_PROVIDER';
+      return false;
+    }
+    if (new AWS.S3().config.credentials) {
+      context.inapplicabilityReasonCode = 'LOCAL_CREDENTIALS_CONFIGURED';
+      return false;
+    }
+    if ((await awsCredentials.resolveFileProfiles()).size) {
+      context.inapplicabilityReasonCode = 'LOCAL_CREDENTIAL_PROFILES_CONFIGURED';
+      return false;
+    }
+
+    const orgName = configuration.org;
+    if (orgName && isAuthenticated()) {
+      let providers;
+      try {
+        providers = await getProviders(orgName);
+      } catch (err) {
+        if (err.code === 'DASHBOARD_UNAVAILABLE') {
+          log.error();
+          log.error(err.message);
+          return false;
+        }
+        throw err;
+      }
+      const hasDefaultProvider = providers.some((provider) => provider.isDefault);
+
+      if (hasDefaultProvider) {
+        context.inapplicabilityReasonCode = 'DEFAULT_PROVIDER_CONFIGURED';
+        return false;
+      }
+
+      // For situation where it is invoked for already existing service
+      // We need to check if service already has a linked provider
+      if (
+        providers &&
+        !history.has('service') &&
+        (await doesServiceInstanceHaveLinkedProvider({ configuration, options }))
+      ) {
+        context.inapplicabilityReasonCode = 'LINKED_PROVIDER_CONFIGURED';
+        return false;
+      }
+    }
+
+    return true;
+  },
+  async run(context) {
+    let providers;
+
+    // It is possible that user decides to not configure org for his service and
+    // we still should allow setup of local credentials in such case
+    if (context.configuration.org && isAuthenticated()) {
+      try {
+        providers = await getProviders(context.configuration.org);
+      } catch (err) {
+        if (err.code === 'DASHBOARD_UNAVAILABLE') {
+          log.error();
+          log.error(err.message);
+          return;
+        }
+        throw err;
+      }
+    }
+    const credentialsSetupChoiceAnswer = await credentialsSetupChoice(context, providers);
+
+    if (credentialsSetupChoiceAnswer === CREDENTIALS_SETUP_CHOICE.CREATE_PROVIDER) {
+      try {
+        const createdProviderUid = await steps.handleProviderCreation(context);
+        const hadExistingProviders = Boolean(providers.length);
+        const shouldLinkProvider = createdProviderUid && hadExistingProviders;
+        if (shouldLinkProvider) {
+          // This is situation where user decided to create a new provider and already had previous providers setup
+          // In this case, we want to setup an explicit link between provider and service as the newly created provider
+          // might not be the default one.
+          await steps.linkProviderToServiceInstance({
+            configuration: context.configuration,
+            providerUid: createdProviderUid,
+            options: context.options,
+          });
+        }
+        return;
+      } catch (err) {
+        if (err.code === 'DASHBOARD_UNAVAILABLE') {
+          log.error();
+          log.error(err.message);
+          return;
+        }
+        throw err;
+      }
+    } else if (credentialsSetupChoiceAnswer === CREDENTIALS_SETUP_CHOICE.SKIP) {
+      steps.writeOnSetupSkip();
+      return;
+    } else if (credentialsSetupChoiceAnswer === CREDENTIALS_SETUP_CHOICE.LOCAL) {
+      await steps.ensureAwsAccount(context);
+      await steps.ensureAwsCredentials(context);
+      await steps.inputAwsCredentials(context);
+      return;
+    }
+
+    // Otherwise user selected an existing provider
+    const linked = await steps.linkProviderToServiceInstance({
+      configuration: context.configuration,
+      providerUid: credentialsSetupChoiceAnswer,
+      options: context.options,
+    });
+
+    if (linked) {
+      log.notice();
+      log.notice.success('Selected provider was successfully linked to your service');
+    }
+  },
+  steps,
+  configuredQuestions: [
+    'credentialsSetupChoice',
+    'hasAwsAccount',
+    'createAwsAccountPrompt',
+    'generateAwsCredsPrompt',
+    'accessKeyId',
+    'secretAccessKey',
+    'skipProviderSetup',
+  ],
+};
diff --git a/lib/cli/interactive-setup/dashboard-login.js b/lib/cli/interactive-setup/dashboard-login.js
new file mode 100644
index 00000000000..424082fd39b
--- /dev/null
+++ b/lib/cli/interactive-setup/dashboard-login.js
@@ -0,0 +1,85 @@
+'use strict';
+
+const _ = require('lodash');
+const { ServerlessSDK } = require('@serverless/platform-client');
+const login = require('@serverless/dashboard-plugin/lib/login');
+const configUtils = require('@serverless/utils/config');
+const promptWithHistory = require('@serverless/utils/inquirer/prompt-with-history');
+const { showOnboardingWelcome } = require('./utils');
+
+const loginOrRegisterQuestion = async (stepHistory) =>
+  promptWithHistory({
+    message: 'Do you want to login/register to Serverless Dashboard?',
+    type: 'confirm',
+    name: 'shouldLoginOrRegister',
+    stepHistory,
+  });
+
+const steps = {
+  loginOrRegister: async (context) => {
+    const shouldLoginOrRegister =
+      context.options.org ||
+      context.configuration.org ||
+      (await loginOrRegisterQuestion(context.stepHistory));
+    if (shouldLoginOrRegister) {
+      await login({ isInteractive: true });
+    }
+  },
+};
+
+module.exports = {
+  async isApplicable(context) {
+    const { configuration, options, serviceDir } = context;
+
+    if (!serviceDir) {
+      context.inapplicabilityReasonCode = 'NOT_IN_SERVICE_DIRECTORY';
+      return false;
+    }
+
+    if (
+      _.get(configuration, 'provider') !== 'aws' &&
+      _.get(configuration, 'provider.name') !== 'aws'
+    ) {
+      context.inapplicabilityReasonCode = 'NON_AWS_PROVIDER';
+      return false;
+    }
+
+    if (process.env.SERVERLESS_ACCESS_KEY) {
+      context.inapplicabilityReasonCode = 'SERVERLESS_ACCESS_KEY_PROVIDED';
+      return false;
+    }
+
+    const sdk = new ServerlessSDK();
+    const { supportedRegions, supportedRuntimes } = await sdk.metadata.get();
+    if (!supportedRuntimes.includes(_.get(configuration.provider, 'runtime') || 'nodejs12.x')) {
+      context.inapplicabilityReasonCode = 'UNSUPPORTED_RUNTIME';
+      return false;
+    }
+    if (
+      !supportedRegions.includes(options.region || configuration.provider.region || 'us-east-1')
+    ) {
+      context.inapplicabilityReasonCode = 'UNSUPPORTED_REGION';
+      return false;
+    }
+    const isLoggedIn = Boolean(configUtils.getLoggedInUser());
+    if (isLoggedIn) {
+      context.inapplicabilityReasonCode = 'ALREADY_LOGGED_IN';
+    }
+    return !isLoggedIn;
+  },
+  async run(context) {
+    const isOrgProvided = context.options.org || context.configuration.org;
+
+    if (
+      context.initial.isInServiceContext &&
+      !context.initial.isDashboardEnabled &&
+      !isOrgProvided
+    ) {
+      showOnboardingWelcome(context);
+    }
+
+    return steps.loginOrRegister(context);
+  },
+  steps,
+  configuredQuestions: ['shouldLoginOrRegister'],
+};
diff --git a/lib/cli/interactive-setup/dashboard-set-org.js b/lib/cli/interactive-setup/dashboard-set-org.js
new file mode 100644
index 00000000000..ae17d924699
--- /dev/null
+++ b/lib/cli/interactive-setup/dashboard-set-org.js
@@ -0,0 +1,373 @@
+'use strict';
+
+const _ = require('lodash');
+const chalk = require('chalk');
+const { log } = require('@serverless/utils/log');
+const accountUtils = require('@serverless/utils/account');
+const configUtils = require('@serverless/utils/config');
+const { ServerlessSDK } = require('@serverless/platform-client');
+const promptWithHistory = require('@serverless/utils/inquirer/prompt-with-history');
+const { writeOrgAndApp, showOnboardingWelcome } = require('./utils');
+const {
+  getPlatformClientWithAccessKey,
+  getOrCreateAccessKeyForOrg,
+} = require('@serverless/dashboard-plugin/lib/client-utils');
+
+const isValidAppName = RegExp.prototype.test.bind(/^[a-z0-9](?:[a-z0-9-]{0,126}[a-z0-9])?$/);
+
+const orgUpdateConfirm = async (stepHistory) => {
+  log.notice(
+    'Service has monitoring enabled, but it is configured with the "org" to which you do not have access'
+  );
+  log.notice();
+  const shouldUpdateOrg = await promptWithHistory({
+    message: 'Would you like to update it?',
+    type: 'confirm',
+    name: 'shouldUpdateOrg',
+    stepHistory,
+  });
+  return shouldUpdateOrg;
+};
+
+const appUpdateConfirm = async (appName, orgName, stepHistory) => {
+  log.notice('The "app" used in this Service does not yet exist in your Organization.');
+  log.notice();
+
+  const appUpdateType = await promptWithHistory({
+    message: 'What would you like to do?',
+    type: 'list',
+    name: 'appUpdateType',
+    stepHistory,
+    choices: [
+      { name: `Create '${appName}' app in '${orgName}' org`, value: '_create_' },
+      {
+        name: 'Switch to one of the existing apps (or create new one with different name)',
+        value: '_choose_existing_',
+      },
+      { name: "Skip, I'll sort this out manually", value: '_skip_' },
+    ],
+  });
+  return appUpdateType;
+};
+
+const orgsChoice = async (orgNames, stepHistory) => {
+  const orgName = await promptWithHistory({
+    message: 'What org do you want to add this service to?',
+    type: 'list',
+    name: 'orgName',
+    choices: [...orgNames, { name: '[Skip]', value: '_skip_' }],
+    stepHistory,
+  });
+  return orgName;
+};
+
+const appNameChoice = async (appNames, stepHistory) => {
+  const appName = await promptWithHistory({
+    message: 'What application do you want to add this to?',
+    type: 'list',
+    name: 'appName',
+    choices: Array.from(appNames).concat({ name: '[create a new app]', value: '_create_' }),
+    stepHistory,
+  });
+  return appName;
+};
+
+const appNameInput = async (appNames, stepHistory) => {
+  const appName = await promptWithHistory({
+    message: 'What do you want to name this application?',
+    type: 'input',
+    name: 'newAppName',
+    stepHistory,
+    validate: (input) => {
+      input = input.trim();
+      if (!isValidAppName(input)) {
+        return (
+          'App name is not valid.\n' +
+          '   - It should only contain lowercase alphanumeric and hyphens.\n' +
+          '   - It should start and end with an alphanumeric character.\n' +
+          "   - Shouldn't exceed 128 characters"
+        );
+      }
+      if (appNames.includes(input)) return 'App of this name already exists';
+      return true;
+    },
+  });
+  return appName;
+};
+
+const steps = {
+  resolveOrgNames: async (user) => {
+    if (process.env.SERVERLESS_ACCESS_KEY) {
+      const sdk = new ServerlessSDK({ accessKey: process.env.SERVERLESS_ACCESS_KEY });
+      const { orgName } = await sdk.accessKeys.get();
+      return new Set([orgName]);
+    }
+
+    let orgs = new Set();
+    if (!user.idToken) {
+      // User registered over CLI hence idToken is not stored.
+      // Still to resolve organizations from platform idToken is needed.
+      // Handling it gently by assuming that orgs listed in config file
+      // make a valid representation
+      for (const org of Object.keys(user.accessKeys)) orgs.add(org);
+    } else {
+      const sdk = new ServerlessSDK();
+      await accountUtils.refreshToken(sdk);
+      user = configUtils.getLoggedInUser();
+      sdk.config({ accessKey: user.idToken });
+      orgs = new Set(
+        (await sdk.organizations.list({ username: user.username })).map((org) => org.tenantName)
+      );
+    }
+    return orgs;
+  },
+  setOrgAndApp: async (
+    context,
+    {
+      orgNames,
+      orgName,
+      apps,
+      appName,
+      newAppName,
+      isDashboardMonitoringOverridenByCli,
+      isDashboardAppPreconfigured,
+    }
+  ) => {
+    const { history, stepHistory } = context;
+    if (!orgName) {
+      orgName = await (async () => {
+        // We only want to automatically select the single available org in situations where user explicitly
+        // logged in/registered during the process and created new service, for existing services we want to always ask
+        // that question. It will also be always asked if `SERVERLESS_ACCESS_KEY` was provided
+        if (
+          orgNames.size === 1 &&
+          history &&
+          history.has('dashboardLogin') &&
+          history.has('service')
+        ) {
+          return orgNames.values().next().value;
+        }
+        return orgsChoice(orgNames, stepHistory);
+      })();
+    }
+
+    if (orgName === '_skip_') {
+      return;
+    }
+
+    const sdk = await getPlatformClientWithAccessKey(orgName);
+    if (!newAppName && !appName) {
+      if (!apps) apps = await sdk.apps.list({ orgName });
+
+      const appNames = apps.map((app) => app.appName);
+
+      if (!apps.length) {
+        newAppName = context.configuration.service;
+      } else {
+        appName = await appNameChoice(appNames, stepHistory);
+        if (appName === '_create_') {
+          newAppName = await appNameInput(appNames, stepHistory);
+        }
+      }
+    }
+    if (newAppName) {
+      ({ appName } = await sdk.apps.create({ orgName, app: { name: newAppName } }));
+    }
+    if (isDashboardMonitoringOverridenByCli && isDashboardAppPreconfigured) {
+      const shouldOverrideDashboardConfig = await promptWithHistory({
+        message:
+          'Are you sure you want to update monitoring settings ' +
+          `to ${chalk.bold(`app: ${appName}, org: ${orgName}`)}`,
+        type: 'confirm',
+        name: 'shouldOverrideDashboardConfig',
+        stepHistory,
+      });
+      if (!shouldOverrideDashboardConfig) {
+        delete context.configuration.app;
+        delete context.configuration.org;
+        return;
+      }
+    }
+    log.notice();
+    log.notice.success(
+      `Your project is ready to be deployed to Serverless Dashboard (org: "${orgName}", app: "${appName}")`
+    );
+    await writeOrgAndApp(orgName, appName, context);
+    return;
+  },
+};
+
+module.exports = {
+  async isApplicable(context) {
+    const { configuration, options, serviceDir } = context;
+    if (!serviceDir) {
+      context.inapplicabilityReasonCode = 'NOT_IN_SERVICE_DIRECTORY';
+      return false;
+    }
+
+    if (
+      _.get(configuration, 'provider') !== 'aws' &&
+      _.get(configuration, 'provider.name') !== 'aws'
+    ) {
+      context.inapplicabilityReasonCode = 'NON_AWS_PROVIDER';
+      return false;
+    }
+    const sdk = new ServerlessSDK();
+    const { supportedRegions, supportedRuntimes } = await sdk.metadata.get();
+    if (!supportedRuntimes.includes(_.get(configuration.provider, 'runtime') || 'nodejs12.x')) {
+      context.inapplicabilityReasonCode = 'UNSUPPORTED_RUNTIME';
+      return false;
+    }
+    if (
+      !supportedRegions.includes(options.region || configuration.provider.region || 'us-east-1')
+    ) {
+      context.inapplicabilityReasonCode = 'UNSUPPORTED_REGION';
+      return false;
+    }
+    const usesServerlessAccessKey = Boolean(process.env.SERVERLESS_ACCESS_KEY);
+
+    let user = configUtils.getLoggedInUser();
+    if (!user && !usesServerlessAccessKey) {
+      context.inapplicabilityReasonCode = 'NOT_LOGGED_IN';
+      return false;
+    }
+
+    const orgNames = await steps.resolveOrgNames(user);
+    if (!orgNames.size) {
+      context.inapplicabilityReasonCode = 'NO_ORGS_AVAILABLE';
+      return false;
+    }
+    if (!usesServerlessAccessKey) {
+      user = configUtils.getLoggedInUser(); // Refreshed, as new token might have been generated
+    }
+
+    const orgName = options.org || configuration.org;
+    const appName = options.app || configuration.app;
+
+    const isDashboardMonitoringPreconfigured = Boolean(configuration.org);
+    const isDashboardAppPreconfigured = Boolean(configuration.app);
+    const isDashboardMonitoringOverridenByCli =
+      isDashboardMonitoringPreconfigured &&
+      ((options.org && options.org !== configuration.org) ||
+        (options.app && options.app !== configuration.app));
+    if (orgName && orgNames.has(orgName)) {
+      if (!isValidAppName(appName)) {
+        return {
+          user,
+          orgName,
+          isDashboardMonitoringPreconfigured,
+          isDashboardAppPreconfigured,
+          isDashboardMonitoringOverridenByCli,
+        };
+      }
+
+      const accessKey = await getOrCreateAccessKeyForOrg(orgName);
+      sdk.config({ accessKey });
+      const apps = await sdk.apps.list({ orgName });
+
+      if (options.org || options.app) {
+        if (apps.some((app) => app.appName === appName)) {
+          if (
+            isDashboardMonitoringPreconfigured &&
+            isDashboardAppPreconfigured &&
+            !isDashboardMonitoringOverridenByCli
+          ) {
+            context.inapplicabilityReasonCode = 'MONITORING_NOT_OVERRIDEN_BY_CLI';
+            return false;
+          }
+          return {
+            user,
+            orgName,
+            appName,
+            isDashboardMonitoringPreconfigured,
+            isDashboardAppPreconfigured,
+            isDashboardMonitoringOverridenByCli,
+          };
+        }
+        if (options.app) {
+          log.error();
+          log.error('Passed value for "--app" doesn\'t seem to correspond to chosen organization.');
+        }
+        return {
+          user,
+          orgName,
+          isDashboardMonitoringPreconfigured,
+          isDashboardAppPreconfigured,
+          isDashboardMonitoringOverridenByCli,
+        };
+      } else if (apps.some((app) => app.appName === appName)) {
+        context.inapplicabilityReasonCode = 'HAS_MONITORING_SETUP';
+        return false;
+      }
+      return {
+        user,
+        orgName,
+        apps,
+        newAppName: appName,
+        isDashboardMonitoringPreconfigured,
+        isDashboardAppPreconfigured,
+        isDashboardMonitoringOverridenByCli,
+      };
+    } else if (orgName) {
+      if (options.org) {
+        log.error();
+        log.error(
+          'Passed value for "--org" doesn\'t seem to correspond to account with which you\'re logged in with.'
+        );
+      } else {
+        log.error();
+        log.error(`Configured org "${orgName}" is not available in your account.`);
+      }
+    }
+    return {
+      user,
+      orgNames,
+      isDashboardMonitoringPreconfigured,
+      isDashboardAppPreconfigured,
+      isDashboardMonitoringOverridenByCli,
+    };
+  },
+  async run(context, stepData) {
+    const { configuration, options, stepHistory } = context;
+    if (context.initial.isInServiceContext && !context.initial.isDashboardEnabled) {
+      showOnboardingWelcome(context);
+    }
+
+    if (!stepData.orgName) delete configuration.org;
+    if (!stepData.appName && !stepData.newAppName) delete configuration.app;
+    if (!options.org && !options.app) {
+      if (stepData.isDashboardMonitoringPreconfigured) {
+        if (!stepData.orgName) {
+          if (!(await orgUpdateConfirm(stepHistory))) return;
+        } else if (stepData.newAppName) {
+          const appUpdateTypeChoice = await appUpdateConfirm(
+            stepData.newAppName,
+            stepData.orgName,
+            stepHistory
+          );
+          switch (appUpdateTypeChoice) {
+            case '_create_':
+              break;
+            case '_choose_existing_':
+              delete stepData.newAppName;
+              break;
+            case '_skip_':
+              return;
+            default:
+              throw new Error('Unexpected app update type');
+          }
+        }
+      }
+    }
+    await steps.setOrgAndApp(context, stepData);
+  },
+  steps,
+  configuredQuestions: [
+    'orgName',
+    'appName',
+    'newAppName',
+    'shouldUpdateOrg',
+    'appUpdateType',
+    'shouldOverrideDashboardConfig',
+  ],
+};
diff --git a/lib/cli/interactive-setup/deploy.js b/lib/cli/interactive-setup/deploy.js
new file mode 100644
index 00000000000..15ee21144dd
--- /dev/null
+++ b/lib/cli/interactive-setup/deploy.js
@@ -0,0 +1,84 @@
+'use strict';
+
+const Serverless = require('../../serverless');
+const { writeText, style } = require('@serverless/utils/log');
+const promptWithHistory = require('@serverless/utils/inquirer/prompt-with-history');
+const { doesServiceInstanceHaveLinkedProvider } = require('./utils');
+const _ = require('lodash');
+const AWS = require('aws-sdk');
+const isAuthenticated = require('@serverless/dashboard-plugin/lib/is-authenticated');
+
+const printMessage = () => {
+  writeText(
+    null,
+    style.aside('What next?'),
+    'Run these commands in the project directory:',
+    null,
+    `serverless deploy    ${style.aside('Deploy changes')}`,
+    `serverless info      ${style.aside('View deployed endpoints and resources')}`,
+    `serverless invoke    ${style.aside('Invoke deployed functions')}`,
+    `serverless --help    ${style.aside('Discover more commands')}`
+  );
+};
+
+module.exports = {
+  async isApplicable(context) {
+    const { configuration, serviceDir, options } = context;
+    if (!serviceDir) {
+      context.inapplicabilityReasonCode = 'NOT_IN_SERVICE_DIRECTORY';
+      return false;
+    }
+
+    if (
+      _.get(configuration, 'provider') !== 'aws' &&
+      _.get(configuration, 'provider.name') !== 'aws'
+    ) {
+      context.inapplicabilityReasonCode = 'NON_AWS_PROVIDER';
+      return false;
+    }
+
+    // We want to proceed if the service instance has a linked provider
+    if (
+      configuration.org &&
+      isAuthenticated() &&
+      (await doesServiceInstanceHaveLinkedProvider({ configuration, options }))
+    ) {
+      return true;
+    }
+
+    // We want to proceed if local credentials are available
+    if (new AWS.Config().credentials) return true;
+
+    context.inapplicabilityReasonCode = 'NO_CREDENTIALS_CONFIGURED';
+    return false;
+  },
+  async run(context) {
+    const { configuration, configurationFilename, serviceDir, stepHistory } = context;
+    const shouldDeploy = await promptWithHistory({
+      name: 'shouldDeploy',
+      message: 'Do you want to deploy now?',
+      stepHistory,
+      type: 'confirm',
+    });
+    if (!shouldDeploy) {
+      printMessage();
+      return;
+    }
+
+    const serverless = new Serverless({
+      configuration,
+      serviceDir,
+      configurationFilename,
+      isConfigurationResolved: true,
+      commands: ['deploy'],
+      options: {},
+    });
+
+    await serverless.init();
+    await serverless.run();
+    context.serverless = serverless;
+
+    printMessage();
+  },
+  configuredQuestions: ['shouldDeploy'],
+};
diff --git a/lib/cli/interactive-setup/index.js b/lib/cli/interactive-setup/index.js
new file mode 100644
index 00000000000..697a3214b75
--- /dev/null
+++ b/lib/cli/interactive-setup/index.js
@@ -0,0 +1,60 @@
+'use strict';
+
+const inquirer = require('@serverless/utils/inquirer');
+const { StepHistory } = require('@serverless/utils/telemetry');
+const { log } = require('@serverless/utils/log');
+const { resolveInitialContext } = require('./utils');
+
+const steps = {
+  service: require('./service'),
+  dashboardLogin: require('./dashboard-login'),
+  dashboardSetOrg: require('./dashboard-set-org'),
+  awsCredentials: require('./aws-credentials'),
+  deploy: require('./deploy'),
+};
+
+module.exports = async (context) => {
+  const stepsDetails = new Map(
+    Object.entries(steps).map(([stepName, step]) => {
+      return [stepName, { configuredQuestions: step.configuredQuestions }];
+    })
+  );
+  const { commandUsage } = context;
+  const history = new Map();
+  context = { ...context, inquirer, history };
+
+  commandUsage.stepsHistory = history;
+  commandUsage.stepsHistory.toJSON = () => {
+    return Array.from(stepsDetails.entries()).map(([step, stepDetails]) => {
+      const stepHistory = history.get(step);
+      return {
+        name: step,
+        ...stepDetails,
+        history: stepHistory ? stepHistory.toJSON() : [],
+      };
+    });
+  };
+
+  const initialContext = resolveInitialContext(context);
+  commandUsage.initialContext = initialContext;
+  context.initial = initialContext;
+
+  for (const [stepName, step] of Object.entries(steps)) {
+    delete context.stepHistory;
+    delete context.inapplicabilityReasonCode;
+    const stepData = await step.isApplicable(context);
+    Object.assign(stepsDetails.get(stepName), {
+      isApplicable: Boolean(stepData),
+      inapplicabilityReasonCode: context.inapplicabilityReasonCode,
+      timestamp: Date.now(),
+    });
+    if (stepData) {
+      log.notice();
+      context.stepHistory = new StepHistory();
+      context.history.set(stepName, context.stepHistory);
+      await step.run(context, stepData);
+    }
+  }
+
+  return context;
+};
diff --git a/lib/cli/interactive-setup/service.js b/lib/cli/interactive-setup/service.js
new file mode 100644
index 00000000000..a2b517df419
--- /dev/null
+++ b/lib/cli/interactive-setup/service.js
@@ -0,0 +1,269 @@
+'use strict';
+
+const { join } = require('path');
+const fsp = require('fs').promises;
+const spawn = require('child-process-ext/spawn');
+const promptWithHistory = require('@serverless/utils/inquirer/prompt-with-history');
+const { log, progress } = require('@serverless/utils/log');
+const resolveConfigurationPath = require('../resolve-configuration-path');
+const readConfiguration = require('../../configuration/read');
+const resolveVariables = require('../../configuration/variables');
+const createFromLocalTemplate = require('../../utils/create-from-local-template');
+const npmCommandDeferred = require('../../utils/npm-command-deferred');
+const ServerlessError = require('../../serverless-error');
+const { downloadTemplateFromRepo } = require('../../utils/download-template-from-repo');
+
+const isValidServiceName = RegExp.prototype.test.bind(/^[a-zA-Z][a-zA-Z0-9-]{0,100}$/);
+
+const initializeProjectChoices = [
+  { name: 'AWS - Node.js - Starter', value: 'aws-node' },
+  { name: 'AWS - Node.js - HTTP API', value: 'aws-node-http-api' },
+  { name: 'AWS - Node.js - Scheduled Task', value: 'aws-node-scheduled-cron' },
+  { name: 'AWS - Node.js - SQS Worker', value: 'aws-node-sqs-worker' },
+  { name: 'AWS - Node.js - Express API', value: 'aws-node-express-api' },
+  { name: 'AWS - Node.js - Express API with DynamoDB', value: 'aws-node-express-dynamodb-api' },
+
+  { name: 'AWS - Python - Starter', value: 'aws-python' },
+  { name: 'AWS - Python - HTTP API', value: 'aws-python-http-api' },
+  { name: 'AWS - Python - Scheduled Task', value: 'aws-python-scheduled-cron' },
+  { name: 'AWS - Python - SQS Worker', value: 'aws-python-sqs-worker' },
+  { name: 'AWS - Python - Flask API', value: 'aws-python-flask-api' },
+  { name: 'AWS - Python - Flask API with DynamoDB', value: 'aws-python-flask-dynamodb-api' },
+  { name: 'Other', value: 'other' },
+];
+
+const projectTypeChoice = async (stepHistory) => {
+  const projectType = await promptWithHistory({
+    message: 'What do you want to make?',
+    type: 'list',
+    name: 'projectType',
+    choices: initializeProjectChoices,
+    pageSize: 13,
+    recordRawAnswerInHistory: true,
+    stepHistory,
+  });
+  return projectType;
+};
+
+const INVALID_PROJECT_NAME_MESSAGE =
+  'Project name is not valid.\n' +
+  '   - It should only contain alphanumeric and hyphens.\n' +
+  '   - It should start with an alphabetic character.\n' +
+  "   - Shouldn't exceed 128 characters";
+
+const projectNameInput = async (workingDir, projectType, stepHistory) => {
+  const projectName = await promptWithHistory({
+    message: 'What do you want to call this project?',
+    type: 'input',
+    name: 'projectName',
+    stepHistory,
+    default: projectType ? `${projectType}-project` : null,
+    validate: async (input) => {
+      input = input.trim();
+      if (!isValidServiceName(input)) {
+        return INVALID_PROJECT_NAME_MESSAGE;
+      }
+
+      try {
+        await fsp.access(join(workingDir, input));
+        return `Path ${input} is already taken`;
+      } catch {
+        return true;
+      }
+    },
+  });
+  return projectName;
+};
+
+const resolveProjectNameInput = async ({ options, workingDir, projectType, stepHistory }) => {
+  if (options.name) {
+    if (!isValidServiceName(options.name)) {
+      throw new ServerlessError(INVALID_PROJECT_NAME_MESSAGE, 'INVALID_PROJECT_NAME');
+    }
+
+    let alreadyTaken = false;
+    try {
+      await fsp.access(join(workingDir, options.name));
+      alreadyTaken = true;
+    } catch {
+      // Pass
+    }
+
+    if (alreadyTaken) {
+      throw new ServerlessError(
+        `Path ${options.name} is already taken`,
+        'TARGET_FOLDER_ALREADY_EXISTS'
+      );
+    }
+
+    return options.name;
+  }
+
+  return projectNameInput(workingDir, projectType, stepHistory);
+};
+
+module.exports = {
+  isApplicable(context) {
+    const { options, serviceDir } = context;
+    const notApplicableOptions = new Set(['name', 'template-path', 'template', 'template-url']);
+    if (serviceDir && Object.keys(options).some((key) => notApplicableOptions.has(key))) {
+      throw new ServerlessError(
+        `Cannot setup a new service when being in context of another service (${[
+          ...notApplicableOptions,
+        ]
+          .map((opt) => `"--${opt}"`)
+          .join(', ')} options cannot be applied)`,
+        'NOT_APPLICABLE_SERVICE_OPTIONS'
+      );
+    }
+
+    const inServiceDir = Boolean(serviceDir);
+    if (inServiceDir) {
+      context.inapplicabilityReasonCode = 'IN_SERVICE_DIRECTORY';
+    }
+    return !inServiceDir;
+  },
+  async run(context) {
+    const workingDir = context.cwd || process.cwd();
+
+    log.notice('Creating a new serverless project');
+    log.notice();
+
+    // Validate if user did not provide more than one of: `template', 'template-url` and `template-path` options
+    const templateOptions = new Set(['template-path', 'template', 'template-url']);
+    if (Object.keys(context.options).filter((key) => templateOptions.has(key)).length > 1) {
+      throw new ServerlessError(
+        `You can provide only one of: ${[...templateOptions]
+          .map((opt) => `"--${opt}"`)
+          .join(', ')} options`,
+        'MULTIPLE_TEMPLATE_OPTIONS_PROVIDED'
+      );
+    }
+
+    let projectDir;
+    let projectName;
+    if (context.options['template-path']) {
+      projectName = await resolveProjectNameInput({
+        options: context.options,
+        workingDir,
+        stepHistory: context.stepHistory,
+      });
+      projectDir = join(workingDir, projectName);
+      await createFromLocalTemplate({
+        templatePath: context.options['template-path'],
+        projectDir,
+        projectName,
+      });
+    } else if (context.options['template-url']) {
+      projectName = await resolveProjectNameInput({
+        options: context.options,
+        workingDir,
+        stepHistory: context.stepHistory,
+      });
+      projectDir = join(workingDir, projectName);
+      const templateUrl = context.options['template-url'];
+      const downloadProgress = progress.get('template-download');
+      downloadProgress.notice(`Downloading template from provided url: ${templateUrl}`);
+      try {
+        await downloadTemplateFromRepo(templateUrl, null, projectName);
+      } catch (err) {
+        if (err.constructor.name !== 'ServerlessError') throw err;
+
+        throw new ServerlessError(
+          `Could not download template from provided url. Ensure that the template provided with "--template-url" exists: ${err.message}`,
+          'INVALID_TEMPLATE_URL'
+        );
+      }
+      downloadProgress.remove();
+    } else {
+      let projectType;
+      if (context.options.template) {
+        projectType = context.options.template;
+      } else {
+        projectType = await projectTypeChoice(context.stepHistory);
+        if (projectType === 'other') {
+          log.notice();
+          log.notice(
+            'Run "serverless create --help" to view available templates and create a new project ' +
+              'from one of those templates.'
+          );
+          return;
+        }
+      }
+      projectName = await resolveProjectNameInput({
+        options: context.options,
+        workingDir,
+        projectType,
+        stepHistory: context.stepHistory,
+      });
+      projectDir = join(workingDir, projectName);
+      const templateUrl = `https://github.com/serverless/examples/tree/v3/${projectType}`;
+      const downloadProgress = progress.get('template-download');
+      downloadProgress.notice(`Downloading "${projectType}" template`);
+      try {
+        await downloadTemplateFromRepo(templateUrl, projectType, projectName);
+      } catch (err) {
+        if (err.code === 'ENOENT' && context.options.template) {
+          throw new ServerlessError(
+            'Could not find provided template. Ensure that the template provided with "--template" exists.',
+            'INVALID_TEMPLATE'
+          );
+        }
+
+        if (err.constructor.name !== 'ServerlessError') throw err;
+
+        throw new ServerlessError(
+          `Could not download template. Ensure that you are using the latest version of Serverless Framework: ${err.message}`,
+          'TEMPLATE_DOWNLOAD_FAILED'
+        );
+      }
+      downloadProgress.remove();
+    }
+
+    let hasPackageJson = false;
+    try {
+      await fsp.access(join(projectDir, 'package.json'));
+      hasPackageJson = true;
+    } catch {
+      // pass
+    }
+
+    if (hasPackageJson) {
+      const installProgress = progress.get('npm-install');
+      installProgress.notice(`Installing dependencies with "npm" in "${projectName}" folder`);
+      const { command, args } = await npmCommandDeferred;
+      try {
+        await spawn(command, [...args, 'install'], { cwd: projectDir });
+      } catch (err) {
+        if (err.code === 'ENOENT') {
+          log.warning();
+          log.warning(
+            'Cannot install dependencies as "npm" installation could not be found. Please install npm and run "npm install" in directory of created service.'
+          );
+        } else {
+          throw new ServerlessError(
+            `Cannot install dependencies: ${err.message}`,
+            'DEPENDENCIES_INSTALL_FAILED'
+          );
+        }
+      }
+      installProgress.remove();
+    }
+
+    try {
+      // Try to remove `serverless.template.yml` file from created project if its present
+      await fsp.unlink(join(projectDir, 'serverless.template.yml'));
+    } catch {
+      // pass
+    }
+
+    log.notice();
+    log.notice.success(`Project successfully created in ${projectName} folder`);
+    context.serviceDir = projectDir;
+    const configurationPath = await resolveConfigurationPath({ cwd: projectDir, options: {} });
+    context.configurationFilename = configurationPath.slice(projectDir.length + 1);
+    context.configuration = await readConfiguration(configurationPath);
+    await resolveVariables(context);
+  },
+  configuredQuestions: ['projectType', 'projectName'],
+};
diff --git a/lib/cli/interactive-setup/utils.js b/lib/cli/interactive-setup/utils.js
new file mode 100644
index 00000000000..a415eb96f94
--- /dev/null
+++ b/lib/cli/interactive-setup/utils.js
@@ -0,0 +1,106 @@
+'use strict';
+
+const path = require('path');
+const memoizee = require('memoizee');
+const inquirer = require('@serverless/utils/inquirer');
+const { log } = require('@serverless/utils/log');
+const resolveProviderCredentials = require('@serverless/dashboard-plugin/lib/resolve-provider-credentials');
+const isAuthenticated = require('@serverless/dashboard-plugin/lib/is-authenticated');
+const hasLocalCredentials = require('../../aws/has-local-credentials');
+
+const fsp = require('fs').promises;
+
+const yamlExtensions = new Set(['.yml', '.yaml']);
+
+const appPattern = /^(?:#\s*)?app\s*:.+/m;
+const orgPattern = /^(?:#\s*)?(?:org)\s*:.+/m;
+
+const ServerlessError = require('../../serverless-error');
+const resolveStage = require('../../utils/resolve-stage');
+const resolveRegion = require('../../utils/resolve-region');
+
+module.exports = {
+  confirm: async (message, options = {}) => {
+    const name = options.name || 'isConfirmed';
+    return (
+      await inquirer.prompt({
+        message,
+        type: 'confirm',
+        name,
+      })
+    )[name];
+  },
+  doesServiceInstanceHaveLinkedProvider: async ({ configuration, options }) => {
+    const region = resolveRegion({ configuration, options });
+    const stage = resolveStage({ configuration, options });
+    let result;
+    try {
+      result = await resolveProviderCredentials({ configuration, region, stage });
+    } catch (err) {
+      if (err.statusCode && err.statusCode >= 500) {
+        throw new ServerlessError(
+          'Serverless Dashboard is currently unavailable, please try again later',
+          'DASHBOARD_UNAVAILABLE'
+        );
+      }
+      throw err;
+    }
+
+    return Boolean(result);
+  },
+  resolveInitialContext: ({ configuration, serviceDir }) => {
+    return {
+      isInServiceContext: Boolean(serviceDir),
+      isLoggedIntoDashboard: isAuthenticated(),
+      hasLocalAwsCredentials: hasLocalCredentials(),
+      isDashboardEnabled: Boolean(configuration && configuration.org && configuration.app),
+    };
+  },
+  writeOrgAndApp: async (
+    orgName,
+    appName,
+    { configurationFilename, serviceDir, configuration }
+  ) => {
+    const configurationFilePath = path.resolve(serviceDir, configurationFilename);
+    let ymlString = await (async () => {
+      if (!yamlExtensions.has(path.extname(configurationFilename))) return null; // Non YAML config
+      try {
+        return await fsp.readFile(configurationFilePath);
+      } catch (error) {
+        if (error.code === 'ENOENT') return null;
+        throw error;
+      }
+    })();
+
+    if (!ymlString) {
+      log.notice(
+        'Add the following settings to your serverless configuration file:\n\n' +
+          `org: ${orgName}\napp: ${appName}`
+      );
+      return;
+    }
+    ymlString = ymlString.toString();
+    const appMatch = ymlString.match(appPattern);
+    if (appMatch) {
+      ymlString = ymlString.replace(appMatch[0], `app: ${appName}`);
+    } else {
+      ymlString = `app: ${appName}\n${ymlString}`;
+    }
+    const orgMatch = ymlString.match(orgPattern);
+    if (orgMatch) {
+      ymlString = ymlString.replace(orgMatch[0], `org: ${orgName}`);
+    } else {
+      ymlString = `org: ${orgName}\n${ymlString}`;
+    }
+    await fsp.writeFile(configurationFilePath, ymlString);
+    configuration.org = orgName;
+    configuration.app = appName;
+  },
+  showOnboardingWelcome: memoizee(
+    (context) => {
+      log.notice(`Onboarding "${context.configuration.service}" to the Serverless Dashboard`);
+      log.notice();
+    },
+    { length: 0 }
+  ),
+};
diff --git a/lib/cli/is-locally-installed.js b/lib/cli/is-locally-installed.js
new file mode 100644
index 00000000000..610cb83eabb
--- /dev/null
+++ b/lib/cli/is-locally-installed.js
@@ -0,0 +1,6 @@
+'use strict';
+
+const path = require('path');
+const localServerlessPath = require('./local-serverless-path');
+
+module.exports = localServerlessPath === path.resolve(__dirname, '../../');
diff --git a/lib/cli/load-dotenv.js b/lib/cli/load-dotenv.js
index 7067edb1dac..7c87f48eced 100644
--- a/lib/cli/load-dotenv.js
+++ b/lib/cli/load-dotenv.js
@@ -1,6 +1,7 @@
 'use strict';
 
 const dotenv = require('dotenv');
+const dotenvExpand = require('dotenv-expand');
 const path = require('path');
 const ServerlessError = require('../serverless-error');
 
@@ -11,11 +12,16 @@ const throwDotenvError = (error, filePath) => {
   throw new ServerlessError(errorMessage, 'DOTENV_LOAD_ERROR');
 };
 
+const loadDotenvFrom = (envFilePath) => {
+  const config = dotenv.config({ path: envFilePath });
+  return dotenvExpand(config);
+};
+
 module.exports = (stage) => {
   const defaultEnvFilePath = path.join(process.cwd(), '.env');
   const stageEnvFilePath = path.join(process.cwd(), `.env.${stage}`);
 
-  const { error: stageEnvResultError } = dotenv.config({ path: stageEnvFilePath });
+  const { error: stageEnvResultError } = loadDotenvFrom(stageEnvFilePath);
 
   if (!stageEnvResultError) return;
 
@@ -23,7 +29,8 @@ module.exports = (stage) => {
     throwDotenvError(stageEnvResultError, stageEnvFilePath);
   }
 
-  const { error: defaultEnvResultError } = dotenv.config({ path: defaultEnvFilePath });
+  const { error: defaultEnvResultError } = loadDotenvFrom(defaultEnvFilePath);
+
   if (defaultEnvResultError && !isMissingFileError(defaultEnvResultError)) {
     throwDotenvError(defaultEnvResultError, defaultEnvFilePath);
   }
diff --git a/lib/cli/local-serverless-path.js b/lib/cli/local-serverless-path.js
new file mode 100644
index 00000000000..af3c4eba4f4
--- /dev/null
+++ b/lib/cli/local-serverless-path.js
@@ -0,0 +1,18 @@
+'use strict';
+
+// This module should be dependencies free (as it's used at local fallback triage)
+// and kept async (as telemetry payload generation depends on it)
+
+const path = require('path');
+const { createRequire } = require('module');
+
+try {
+  module.exports = path.resolve(
+    path.dirname(
+      createRequire(path.resolve(process.cwd(), 'require-resolver')).resolve('serverless')
+    ),
+    '..'
+  );
+} catch {
+  module.exports = null;
+}
diff --git a/lib/cli/param-reg-exp.js b/lib/cli/param-reg-exp.js
new file mode 100644
index 00000000000..5d55aaf4ff3
--- /dev/null
+++ b/lib/cli/param-reg-exp.js
@@ -0,0 +1,4 @@
+'use strict';
+
+module.exports =
+  /^-(?:-(?<fullName>[a-zA-Z][A-Za-z0-9:_-]+)|(?<aliasNames>[a-z]+))(?:=(?<value>.*)|$)/;
diff --git a/lib/cli/parse-args.js b/lib/cli/parse-args.js
index 9b228f8a21c..f3dfbf177d6 100644
--- a/lib/cli/parse-args.js
+++ b/lib/cli/parse-args.js
@@ -3,9 +3,9 @@
 'use strict';
 
 const ServerlessError = require('../serverless-error');
+const paramRegExp = require('./param-reg-exp');
 
-const paramRe = /^-(?:-(?<fullName>[a-zA-Z][A-Za-z0-9:_-]+)|(?<aliasNames>[a-z]+))(?:=(?<value>.*)|$)/;
-const isParamName = RegExp.prototype.test.bind(paramRe);
+const isParamName = RegExp.prototype.test.bind(paramRegExp);
 
 module.exports = (
   args,
@@ -13,12 +13,13 @@ module.exports = (
 ) => {
   const result = Object.create(null);
   result._ = [];
+  const isHelpRequest = args.includes('-h') || args.includes('--help');
   for (let i = 0, arg; (arg = args[i]); ++i) {
     if (arg === '--') {
       result._.push(...args.slice(i + 1));
       break;
     }
-    const paramMatch = arg.match(paramRe);
+    const paramMatch = arg.match(paramRegExp);
     if (!paramMatch) {
       result._.push(arg);
       continue;
@@ -31,6 +32,7 @@ module.exports = (
     if (aliasNames) {
       if (aliasNames.length > 1) {
         if (value != null) {
+          if (isHelpRequest) return result;
           throw new ServerlessError(
             `Unexpected value for "-${aliasNames}"`,
             'UNEXPECTED_CLI_PARAM_VALUE'
@@ -39,6 +41,7 @@ module.exports = (
         for (const aliasName of aliasNames) {
           paramName = alias.get(aliasName) || aliasName;
           if (result[paramName] != null) {
+            if (isHelpRequest) return result;
             throw new ServerlessError(
               `Unexpected multiple "--${paramName}" (aliased by "-${aliasName}") values`,
               'UNEXPECTED_CLI_PARAM_MULTIPLE_VALUE'
@@ -55,6 +58,7 @@ module.exports = (
 
     if (string.has(paramName) || multiple.has(paramName)) {
       if (isBoolean) {
+        if (isHelpRequest) return result;
         throw new ServerlessError(`Unexpected boolean "--${paramName}"`, 'MISSING_CLI_PARAM_VALUE');
       }
       if (multiple.has(paramName)) {
@@ -63,6 +67,7 @@ module.exports = (
         continue;
       }
       if (result[paramName] !== undefined) {
+        if (isHelpRequest) return result;
         throw new ServerlessError(
           `Unexpected multiple "--${paramName}"`,
           'UNEXPECTED_CLI_PARAM_MULTIPLE_VALUE'
@@ -75,12 +80,14 @@ module.exports = (
     if (paramName.startsWith('no-') && (boolean.has(paramName.slice(3)) || isBoolean)) {
       paramName = paramName.slice(3);
       if (value != null) {
+        if (isHelpRequest) return result;
         throw new ServerlessError(
           `Unexpected value for "--${paramName}"`,
           'UNEXPECTED_CLI_PARAM_VALUE'
         );
       }
       if (result[paramName] !== undefined) {
+        if (isHelpRequest) return result;
         throw new ServerlessError(
           `Unexpected multiple "--${paramName}"`,
           'UNEXPECTED_CLI_PARAM_MULTIPLE_VALUE'
@@ -92,12 +99,14 @@ module.exports = (
 
     if (boolean.has(paramName) || isBoolean) {
       if (value != null) {
+        if (isHelpRequest) return result;
         throw new ServerlessError(
           `Unexpected value for "--${paramName}"`,
           'UNEXPECTED_CLI_PARAM_VALUE'
         );
       }
       if (result[paramName] !== undefined) {
+        if (isHelpRequest) return result;
         throw new ServerlessError(
           `Unexpected multiple "--${paramName}"`,
           'UNEXPECTED_CLI_PARAM_MULTIPLE_VALUE'
@@ -111,6 +120,7 @@ module.exports = (
       if (Array.isArray(result[paramName])) {
         result[paramName].push(value == null ? args[++i] : value || null);
       } else if (typeof result[paramName] === 'boolean') {
+        if (isHelpRequest) return result;
         throw new ServerlessError(
           `Unexpected multiple "--${paramName}"`,
           'UNEXPECTED_CLI_PARAM_MULTIPLE_VALUE'
diff --git a/lib/cli/render-help/command.js b/lib/cli/render-help/command.js
index 7c92ccdde55..58bdbc3fcbe 100644
--- a/lib/cli/render-help/command.js
+++ b/lib/cli/render-help/command.js
@@ -1,5 +1,6 @@
 'use strict';
 
+const { writeText } = require('@serverless/utils/log');
 const resolveInput = require('../resolve-input');
 const renderOptionsHelp = require('./options');
 
@@ -9,12 +10,14 @@ module.exports = (commandName) => {
   const { commandsSchema } = resolveInput();
   const commandSchema = commandsSchema.get(commandName);
 
-  if (commandSchema) process.stdout.write(`${generateCommandUsage(commandName, commandSchema)}\n`);
+  if (commandSchema) {
+    writeText(generateCommandUsage(commandName, commandSchema));
+  }
   for (const [subCommandName, subCommandSchema] of commandsSchema) {
     if (!subCommandName.startsWith(`${commandName} `)) continue;
-    process.stdout.write(`${generateCommandUsage(subCommandName, subCommandSchema)}\n`);
+    writeText(generateCommandUsage(subCommandName, subCommandSchema));
   }
   if (commandSchema) renderOptionsHelp(Object.assign({}, commandSchema.options));
 
-  process.stdout.write('\n');
+  writeText();
 };
diff --git a/lib/cli/render-help/general.js b/lib/cli/render-help/general.js
index c86c2acbf6e..b7471a00525 100644
--- a/lib/cli/render-help/general.js
+++ b/lib/cli/render-help/general.js
@@ -1,53 +1,59 @@
 'use strict';
 
-const chalk = require('chalk');
+const { writeText, style } = require('@serverless/utils/log');
+const { version } = require('../../../package');
+const globalOptions = require('../commands-schema/common-options/global');
 const resolveInput = require('../resolve-input');
 const generateCommandUsage = require('./generate-command-usage');
+const renderOptions = require('./options');
 
 module.exports = (loadedPlugins) => {
   const { commandsSchema } = resolveInput();
 
-  const lines = [
-    '',
-    chalk.yellow.underline('Commands'),
-    chalk.dim('* You can run commands with "serverless" or the shortcut "sls"'),
-    chalk.dim('* Pass "--no-color" to disable CLI colors'),
-    chalk.dim('* Pass "--help" after any <command> for contextual help'),
-    '',
-    chalk.yellow.underline('Interactive Quickstart'),
-    chalk.dim(
-      `* Run serverless (or shortcut sls) without any arguments to initialize an interactive setup
-  of functionalities related to given service or current environment`
-    ),
-    chalk.dim('* Pass "--help-interactive" for contextual help on interactive CLI options'),
-    '',
-    chalk.yellow.underline('Serverless Components'),
-    chalk.dim(
-      '* Run serverless (or shortcut sls) in context of a component service to initialize a components CLI'
-    ),
-    chalk.dim('* Pass "--help-components" for contextual help on Serverless Components'),
-    '',
-    chalk.yellow.underline('Framework'),
-    chalk.dim('* Documentation: http://slss.io/docs'),
-    '',
-    chalk.yellow.underline('Environment Variables'),
-    chalk.dim('* Set SLS_DEBUG=* to see debugging logs'),
-    chalk.dim('* Set SLS_WARNING_DISABLE=* to hide warnings from the output'),
-    chalk.dim('* Set SLS_DEPRECATION_DISABLE=* to disable deprecation logs'),
-    chalk.dim(
-      "* Set SLS_MAX_CONCURRENT_ARTIFACTS_UPLOADS to control the maximum S3 upload SDK requests that are sent in parallel during the deployment of the service's artifacts. The default is 3. Note: increasing this too high might, actually, downgrade the overall upload speed"
-    ),
-    '',
-    chalk.yellow.underline('General Commands'),
-    '',
-  ];
+  writeText(
+    `Serverless Framework v${version}`,
+    null,
+    style.aside('Usage'),
+    'serverless <command> <options>',
+    'sls <command> <options>',
+    null,
+    style.aside('Get started'),
+    `Run ${style.strong('serverless')} to interactively setup a project.`,
+    'Use --help-interactive to display the interactive setup help.',
+    null,
+    style.aside('Monitoring'),
+    'Enable performance and error monitoring with the Serverless Dashboard.',
+    `Learn more: ${style.linkStrong('https://serverless.com/monitoring')}`,
+    null,
+    style.aside('Plugins'),
+    'Extend the Serverless Framework with plugins.',
+    `Explore plugins: ${style.linkStrong('https://serverless.com/plugins')}`,
+    null,
+    style.aside('Options')
+  );
+
+  renderOptions(globalOptions, { shouldWriteModernOnly: true });
+
+  const allCommands = new Map(
+    Array.from(commandsSchema).filter(([commandName, { isHidden }]) => commandName && !isHidden)
+  );
+  const mainCommands = new Map(
+    Array.from(allCommands).filter(([, { groupName }]) => groupName === 'main')
+  );
+
+  if (mainCommands.size) {
+    writeText(null, style.aside('Main commands'));
+    for (const [commandName, commandSchema] of mainCommands) {
+      writeText(generateCommandUsage(commandName, commandSchema));
+    }
+    writeText(null, style.aside('Other commands'));
+  } else {
+    writeText(null, style.aside('All commands'));
+  }
 
   const extensionCommandsSchema = new Map();
 
-  for (const [commandName, commandSchema] of commandsSchema) {
-    if (!commandName) continue;
-    if (commandSchema.isHidden) continue;
-    if (!commandSchema.lifecycleEvents) continue;
+  for (const [commandName, commandSchema] of allCommands) {
     if (commandSchema.isExtension) {
       if (!extensionCommandsSchema.has(commandSchema.sourcePlugin)) {
         extensionCommandsSchema.set(commandSchema.sourcePlugin, new Map());
@@ -55,30 +61,20 @@ module.exports = (loadedPlugins) => {
       extensionCommandsSchema.get(commandSchema.sourcePlugin).set(commandName, commandSchema);
       continue;
     }
-    lines.push(generateCommandUsage(commandName, commandSchema));
-  }
+    if (commandSchema.groupName === 'main') continue;
 
-  lines.push('');
+    writeText(generateCommandUsage(commandName, commandSchema));
+  }
 
   if (loadedPlugins.size) {
-    // print all the installed plugins
-    lines.push(
-      chalk.yellow.underline('Plugins'),
-      Array.from(loadedPlugins, (plugin) => plugin.constructor.name).join(', ')
-    );
-
     if (extensionCommandsSchema.size) {
-      lines.push('', chalk.yellow.underline('Commands by plugin'), '');
-
       for (const [plugin, pluginCommandsSchema] of extensionCommandsSchema) {
-        lines.push(plugin.constructor.name);
+        writeText(null, style.aside(plugin.constructor.name));
         for (const [commandName, commandSchema] of pluginCommandsSchema) {
-          lines.push(generateCommandUsage(commandName, commandSchema));
+          writeText(generateCommandUsage(commandName, commandSchema));
         }
-        lines.push('');
       }
     }
   }
-
-  process.stdout.write(`${lines.join('\n')}\n`);
+  writeText();
 };
diff --git a/lib/cli/render-help/generate-command-usage.js b/lib/cli/render-help/generate-command-usage.js
index 252e6306667..e0f6691286b 100644
--- a/lib/cli/render-help/generate-command-usage.js
+++ b/lib/cli/render-help/generate-command-usage.js
@@ -1,11 +1,12 @@
 'use strict';
 
-const chalk = require('chalk');
+const { style } = require('@serverless/utils/log');
 
 module.exports = (commandName, commandSchema) => {
-  const dotsLength = 30;
+  const indentFillLength = 30;
 
   const usage = commandSchema.usage;
-  const dots = '.'.repeat(Math.max(dotsLength - commandName.length, 0));
-  return `${chalk.yellow(commandName)} ${chalk.dim(dots)} ${usage}`;
+  return `${commandName} ${' '.repeat(
+    Math.max(indentFillLength - commandName.length, 0)
+  )} ${style.aside(usage)}`;
 };
diff --git a/lib/cli/render-help/index.js b/lib/cli/render-help/index.js
index 8ee11545428..c1da2506e86 100644
--- a/lib/cli/render-help/index.js
+++ b/lib/cli/render-help/index.js
@@ -8,7 +8,10 @@ const renderCommandHelp = require('./command');
 module.exports = (loadedPlugins) => {
   const { command, options } = resolveInput();
   if (!command) {
-    if (options['help-interactive']) renderInteractiveSetupHelp();
+    if (options['help-interactive']) {
+      renderInteractiveSetupHelp();
+      return;
+    }
     renderGeneralHelp(loadedPlugins);
   } else if (command === 'help') {
     renderGeneralHelp(loadedPlugins);
diff --git a/lib/cli/render-help/interactive-setup.js b/lib/cli/render-help/interactive-setup.js
index 528de1d1273..6e8d16d981f 100644
--- a/lib/cli/render-help/interactive-setup.js
+++ b/lib/cli/render-help/interactive-setup.js
@@ -1,16 +1,15 @@
 'use strict';
 
-const chalk = require('chalk');
+const { writeText, style } = require('@serverless/utils/log');
 const commmandSchema = require('../commands-schema/no-service').get('');
 const renderOptions = require('./options');
 
 module.exports = () => {
-  process.stdout.write(`${chalk.yellow.underline('Interactive CLI')}\n`);
-  process.stdout.write(
-    `${chalk.yellow(
-      `Run serverless (or shortcut sls) a subcommand to initialize an interactive setup of
-functionalities related to given service or current environment`
-    )}\n`
+  writeText(
+    style.aside('Interactive CLI'),
+    `Run ${style.strong('serverless')} to interactively setup a project.`,
+    null,
+    style.aside('Options')
   );
 
   renderOptions(commmandSchema.options);
diff --git a/lib/cli/render-help/options.js b/lib/cli/render-help/options.js
index 35c38da04ec..bd04ce5b4e3 100644
--- a/lib/cli/render-help/options.js
+++ b/lib/cli/render-help/options.js
@@ -1,32 +1,44 @@
 'use strict';
 
-const chalk = require('chalk');
+const { writeText, style } = require('@serverless/utils/log');
 
 module.exports = (commandOptions) => {
-  const dotsLength = 40;
+  const indentFillLength = 40;
 
   for (const [option, optionsObject] of Object.entries(commandOptions)) {
-    let optionsDots = '.'.repeat(Math.max(dotsLength - option.length, 0));
+    let legacyOptionsIndentFill = '.'.repeat(Math.max(indentFillLength - option.length, 0));
+    let optionsIndentFill = ' '.repeat(Math.max(indentFillLength - option.length - 4, 0));
 
     if (optionsObject.required) {
-      optionsDots = optionsDots.slice(0, optionsDots.length - 18);
+      legacyOptionsIndentFill = legacyOptionsIndentFill.slice(
+        0,
+        legacyOptionsIndentFill.length - 18
+      );
+      optionsIndentFill = optionsIndentFill.slice(0, optionsIndentFill.length - 18);
     } else {
-      optionsDots = optionsDots.slice(0, optionsDots.length - 7);
+      legacyOptionsIndentFill = legacyOptionsIndentFill.slice(
+        0,
+        legacyOptionsIndentFill.length - 7
+      );
+      optionsIndentFill = optionsIndentFill.slice(0, optionsIndentFill.length - 7);
     }
     if (optionsObject.shortcut) {
-      optionsDots = optionsDots.slice(0, optionsDots.length - 5);
+      legacyOptionsIndentFill = legacyOptionsIndentFill.slice(
+        0,
+        legacyOptionsIndentFill.length - 5
+      );
+      optionsIndentFill = optionsIndentFill.slice(0, optionsIndentFill.length - 5);
     }
 
-    const optionInfo = `    --${option}`;
     let shortcutInfo = '';
     let requiredInfo = '';
     if (optionsObject.shortcut) shortcutInfo = ` / -${optionsObject.shortcut}`;
 
     if (optionsObject.required) requiredInfo = ' (required)';
 
-    const optionsUsage = optionsObject.usage ? chalk.dim(optionsDots) + optionsObject.usage : '';
-    const output = `${optionInfo}${shortcutInfo}${requiredInfo} ${optionsUsage}`;
-
-    process.stdout.write(`${chalk.yellow(output)}\n`);
+    const optionsUsage = optionsObject.usage
+      ? optionsIndentFill + style.aside(optionsObject.usage)
+      : '';
+    writeText(`--${option}${shortcutInfo}${requiredInfo} ${optionsUsage}`);
   }
 };
diff --git a/lib/cli/render-version.js b/lib/cli/render-version.js
index 94e10a939d8..5b86dd2e100 100644
--- a/lib/cli/render-version.js
+++ b/lib/cli/render-version.js
@@ -1,61 +1,55 @@
 'use strict';
 
 const path = require('path');
+const os = require('os');
 const { version } = require('../../package');
-const { version: dashboardPluginVersion } = require('@serverless/enterprise-plugin/package');
-const { version: componentsVersion } = require('@serverless/components/package');
-const { platformClientVersion } = require('@serverless/enterprise-plugin');
-const isStandaloneExecutable = require('../utils/isStandaloneExecutable');
-const resolveLocalServerlessPath = require('./resolve-local-serverless-path');
-const chalk = require('chalk');
-const ServerlessError = require('../serverless-error');
+const spawn = require('child-process-ext/spawn');
+const { version: dashboardPluginVersion } = require('@serverless/dashboard-plugin/package');
+const { platformClientVersion } = require('@serverless/dashboard-plugin');
+const isStandaloneExecutable = require('../utils/is-standalone-executable');
+const localServerlessPath = require('./local-serverless-path');
+const { writeText } = require('@serverless/utils/log');
 
-const serverlessPath = path.resolve(__dirname, '../Serverless.js');
+const serverlessPath = path.resolve(__dirname, '../..');
 
-module.exports = async () => {
-  const localServerlessPath = await resolveLocalServerlessPath();
-
-  if (localServerlessPath) {
-    // If the version is already local, do not try to fallback for version resolution to avoid falling into the loop
-    // TODO: Remove local version fallback with next major (when its moved to the top of the process)
-    const isLocal = serverlessPath === localServerlessPath;
-    if (!isLocal) {
-      // Attempt to resolve version with local Serverless instance
-      process.stdout.write(
-        `Serverless: ${chalk.yellow(
-          'Running "serverless" installed locally (in service node_modules)'
-        )}\n`
-      );
-      const localServerlessDir = path.resolve(path.dirname(localServerlessPath), '..');
-
-      try {
-        try {
-          require(path.resolve(localServerlessDir, 'bin/serverless.js'));
-        } catch {
-          // Pass and attempt to use `bin/serverless` that was used by older version of the Framework
-          require(path.resolve(localServerlessDir, 'bin/serverless'));
-        }
-      } catch {
-        // This is just a fallback as for most (all?) versions it shouldn't happen
-        throw new ServerlessError(
-          'Could not resolve path to locally installed serverless.',
-          'INVALID_LOCAL_SERVERLESS_PATH'
-        );
-      }
-      return;
-    }
+const resolveTencentCliVersion = async () => {
+  try {
+    return String(
+      (
+        await spawn(
+          path.resolve(
+            os.homedir(),
+            `.serverless-tencent/bin/serverless-tencent${
+              process.platform === 'win32' ? '.exe' : ''
+            }`
+          ),
+          ['--version', '--plain']
+        )
+      ).stdoutBuffer
+    ).trim();
+  } catch (error) {
+    return null;
   }
+};
 
-  const installationModePostfix = await (async () => {
+module.exports = async () => {
+  const installationModePostfix = (() => {
     if (isStandaloneExecutable) return ' (standalone)';
     if (serverlessPath === localServerlessPath) return ' (local)';
     return '';
   })();
 
-  process.stdout.write(
-    `Framework Core: ${version}${installationModePostfix}\n` +
-      `Plugin: ${dashboardPluginVersion}\n` +
-      `SDK: ${platformClientVersion}\n` +
-      `Components: ${componentsVersion}\n`
+  const globalInstallationPostfix = (() => {
+    if (EvalError.$serverlessInitInstallationVersion) {
+      return ` ${EvalError.$serverlessInitInstallationVersion}v (global)`;
+    }
+    return '';
+  })();
+
+  const tencentCliVersion = await resolveTencentCliVersion();
+  writeText(
+    `Framework Core: ${version}${installationModePostfix}${globalInstallationPostfix}`,
+    `Plugin: ${dashboardPluginVersion}`,
+    `SDK: ${platformClientVersion}\n${tencentCliVersion ? `Tencent CLI: ${tencentCliVersion}` : ''}`
   );
 };
diff --git a/lib/cli/resolve-configuration-path.js b/lib/cli/resolve-configuration-path.js
index a3d3925cfc9..492a64d89dd 100644
--- a/lib/cli/resolve-configuration-path.js
+++ b/lib/cli/resolve-configuration-path.js
@@ -1,19 +1,24 @@
 'use strict';
 
+const ensurePlainObject = require('type/plain-object/ensure');
+const ensureString = require('type/string/ensure');
 const path = require('path');
-const fs = require('fs').promises;
+const fsp = require('fs').promises;
 const ServerlessError = require('../serverless-error');
-const fileExists = require('../utils/fs/fileExists');
-const logDeprecation = require('../utils/logDeprecation');
+const fileExists = require('../utils/fs/file-exists');
 const resolveInput = require('./resolve-input');
 
 const supportedExtensions = new Set(['yml', 'yaml', 'json', 'js', 'ts']);
 
-module.exports = async () => {
-  const customConfigName = resolveInput().options.config;
+module.exports = async (options = {}) => {
+  if (!options) options = {};
+  const cliOptions =
+    ensurePlainObject(options.options, { isOptional: true }) || resolveInput().options;
+  const cwd = path.resolve(ensureString(options.cwd, { isOptional: true }) || process.cwd());
+  const customConfigName = cliOptions.config;
 
   if (customConfigName) {
-    const customConfigPath = path.resolve(customConfigName);
+    const customConfigPath = path.resolve(cwd, customConfigName);
     if (!supportedExtensions.has(path.extname(customConfigPath).slice(1))) {
       throw new ServerlessError(
         'Invalid "--config" value: Unsupported file extension ' +
@@ -23,7 +28,7 @@ module.exports = async () => {
     }
     const stats = await (async () => {
       try {
-        return await fs.stat(customConfigPath);
+        return await fsp.stat(customConfigPath);
       } catch (error) {
         if (error.code === 'ENOENT') {
           throw new ServerlessError(
@@ -43,18 +48,17 @@ module.exports = async () => {
         'INVALID_SERVICE_CONFIG_PATH'
       );
     }
-    if (process.cwd() !== path.dirname(customConfigPath)) {
-      logDeprecation(
-        'NESTED_CUSTOM_CONFIGURATION_PATH',
-        'Service configuration is expected to be placed in a root of a service (working directory). All paths, function handlers in a configuration are resolved against service directory".\n' +
-          'Starting from next major Serverless will no longer permit configurations nested in sub directories.'
+    if (cwd !== path.dirname(customConfigPath)) {
+      throw new ServerlessError(
+        'Service configuration is expected to be placed in a root of a service (working directory). All paths, function handlers in a configuration are resolved against service directory.\n',
+        'NESTED_CUSTOM_CONFIGURATION_PATH'
       );
     }
     return customConfigPath;
   }
 
   for (const extension of supportedExtensions) {
-    const eventualServiceConfigPath = path.resolve(process.cwd(), `serverless.${extension}`);
+    const eventualServiceConfigPath = path.resolve(cwd, `serverless.${extension}`);
     if (await fileExists(eventualServiceConfigPath)) return eventualServiceConfigPath;
   }
   return null;
diff --git a/lib/cli/resolve-input.js b/lib/cli/resolve-input.js
index c9f1f9ae8f8..937305e4069 100644
--- a/lib/cli/resolve-input.js
+++ b/lib/cli/resolve-input.js
@@ -5,15 +5,9 @@
 const ensureMap = require('type/map/ensure');
 const memoizee = require('memoizee');
 const parseArgs = require('./parse-args');
+const globalOptionsSchema = require('./commands-schema/common-options/global');
 
-const baseArgsSchema = {
-  boolean: new Set(['help', 'help-interactive', 'use-local-credentials', 'v', 'version']),
-  string: new Set(['app', 'config', 'org', 'stage']),
-  alias: new Map([
-    ['c', 'config'],
-    ['h', 'help'],
-  ]),
-};
+const isParamName = RegExp.prototype.test.bind(require('./param-reg-exp'));
 
 const resolveArgsSchema = (commandOptionsSchema) => {
   const options = { boolean: new Set(), string: new Set(), alias: new Map(), multiple: new Set() };
@@ -38,41 +32,26 @@ const resolveArgsSchema = (commandOptionsSchema) => {
 module.exports = memoizee((commandsSchema = require('./commands-schema')) => {
   commandsSchema = ensureMap(commandsSchema);
   const args = process.argv.slice(2);
+  const firstParamIndex = args.findIndex(isParamName);
 
-  // Ideally no options should be passed before command (to know what options are supported,
-  // and whether they're boolean or not, we need to know command name upfront).
-  // Still so far we (kind of) supported such notation and we need to maintain it in current major.
-  // Thefore at first resolution stage we use schema that recognizes just some popular options
-  let options = parseArgs(args, baseArgsSchema);
-  let commands = options._;
+  const commands = args.slice(0, firstParamIndex === -1 ? Infinity : firstParamIndex);
+  const command = commands.join(' ');
+  const commandSchema = commandsSchema.get(command);
+  const options = parseArgs(
+    args.slice(firstParamIndex === -1 ? Infinity : firstParamIndex),
+    resolveArgsSchema(commandSchema ? commandSchema.options : globalOptionsSchema)
+  );
   delete options._;
 
-  let command = commands.join(' ');
-
-  // Having command potentially resolved, resolve options again with help of the command schema
-  let commandSchema = commandsSchema.get(command);
-  while (commandSchema) {
-    const resolvedOptions = parseArgs(args, resolveArgsSchema(commandSchema.options));
-    const resolvedCommand = resolvedOptions._.join(' ');
-    if (resolvedCommand === command) {
-      options = resolvedOptions;
-      commands = options._;
-      delete options._;
-      break;
-    }
-    // Unlikely scenario, where after applying the command schema different command resolves
-    // It can happen only in cases where e.g. for "sls deploy --force  function -f foo"
-    // we intially assume "deploy" command, while after applying "deploy" command schema it's
-    // actually a "deploy function" command that resolves
-    command = resolvedCommand;
-    commandSchema = commandsSchema.get(resolvedCommand);
-  }
-
   const result = { commands, options, command, commandSchema, commandsSchema };
   if (!commandSchema) {
     result.isContainerCommand = Array.from(commandsSchema.keys()).some((commandName) =>
       commandName.startsWith(`${command} `)
     );
+    if (result.isContainerCommand) {
+      result.isHelpRequest = true;
+      return result;
+    }
   }
 
   if (
@@ -84,17 +63,5 @@ module.exports = memoizee((commandsSchema = require('./commands-schema')) => {
     result.isHelpRequest = true;
   }
 
-  if (!result.isHelpRequest) {
-    const argsString = args.join(' ');
-    if (command && argsString !== command && !argsString.startsWith(`${command} `)) {
-      // Some options were passed before command name (e.g. "sls -v deploy"), deprecate such usage
-      require('../utils/logDeprecation')(
-        'CLI_OPTIONS_BEFORE_COMMAND',
-        '"serverless" command options are expected to follow command and not be put before the command.\n' +
-          'Starting from next major Serverless will no longer support the latter form.'
-      );
-    }
-  }
-
   return result;
 });
diff --git a/lib/cli/resolve-local-serverless-path.js b/lib/cli/resolve-local-serverless-path.js
deleted file mode 100644
index 7ac16114137..00000000000
--- a/lib/cli/resolve-local-serverless-path.js
+++ /dev/null
@@ -1,15 +0,0 @@
-'use strict';
-
-const memoizee = require('memoizee');
-const resolve = require('ncjsm/resolve');
-
-module.exports = memoizee(
-  async () => {
-    try {
-      return (await resolve(process.cwd(), 'serverless')).realPath;
-    } catch {
-      return null;
-    }
-  },
-  { promise: true }
-);
diff --git a/lib/cli/run-serverless-tencent.js b/lib/cli/run-serverless-tencent.js
new file mode 100644
index 00000000000..c6edc52b2a4
--- /dev/null
+++ b/lib/cli/run-serverless-tencent.js
@@ -0,0 +1,149 @@
+'use strict';
+
+const { createRequire } = require('module');
+const os = require('os');
+const path = require('path');
+const fsp = require('fs').promises;
+const childProcess = require('child_process');
+const spawn = require('child-process-ext/spawn');
+
+const relativeBinPath = 'serverless-tencent/bin/serverless-tencent';
+const standaloneFilename = path.resolve(
+  os.homedir(),
+  `.serverless-tencent/bin/serverless-tencent${process.platform === 'win32' ? '.exe' : ''}`
+);
+const standaloneServerUrl = 'https://slt-binary-sv-1300963013.cos.accelerate.myqcloud.com';
+
+const resolveAbsoluteModulePath = (contextDirname, modulePath) => {
+  try {
+    return createRequire(path.resolve(contextDirname, 'require-resolver')).resolve(modulePath);
+  } catch {
+    return null;
+  }
+};
+
+const resolveGlobalNpmPath = async () => {
+  const npmNodeModulesPath = await (async () => {
+    try {
+      return String((await spawn('npm', ['root', '-g'])).stdoutBuffer).trim();
+    } catch (error) {
+      return null;
+    }
+  })();
+
+  if (!npmNodeModulesPath) return null;
+  try {
+    return require.resolve(`${npmNodeModulesPath}/${relativeBinPath}`);
+  } catch (globalDepError) {
+    return null;
+  }
+};
+
+const isStandaloneInstalled = async () => {
+  try {
+    await fsp.access(standaloneFilename);
+    return true;
+  } catch {
+    return false;
+  }
+};
+
+const resolvePlatform = () => {
+  switch (process.platform) {
+    case 'darwin':
+      return 'macos';
+    case 'win32':
+      return 'win';
+    default:
+      return process.platform;
+  }
+};
+const resolveArch = () => {
+  switch (process.arch) {
+    case 'x32':
+      return 'x86';
+    case 'arm':
+    case 'arm64':
+      return 'armv6';
+    default:
+      return process.arch;
+  }
+};
+
+const resolveExtname = () => {
+  return process.platform === 'win32' ? '.exe' : '';
+};
+
+module.exports = async () => {
+  // 1. If installed locally in service node_modules, run it
+  const localNpmPath = resolveAbsoluteModulePath(process.cwd(), relativeBinPath);
+  if (localNpmPath) {
+    require(localNpmPath);
+    return;
+  }
+
+  // 2. If installed as npm global installation, run it
+  const globalNpmPath = await resolveGlobalNpmPath();
+  if (globalNpmPath) {
+    require(globalNpmPath);
+    return;
+  }
+
+  // 3. Fallback to standalone executable
+  if (!(await isStandaloneInstalled())) {
+    // 3.1 Auto install if not installed
+    const getCliProgressFooter = require('cli-progress-footer');
+    const cliProgressFooter = getCliProgressFooter();
+    cliProgressFooter.shouldAddProgressAnimationPrefix = true;
+    cliProgressFooter.progressAnimationPrefixFrames =
+      cliProgressFooter.progressAnimationPrefixFrames.map((frame) => `\x1b[93m${frame}\x1b[39m`);
+
+    // EN: Installing Tencent Serverless CLI...
+    cliProgressFooter.updateProgress('正在安装 Tencent Serverless CLI');
+
+    try {
+      const stream = require('stream');
+      const { promisify } = require('util');
+      const fs = require('fs');
+      const fse = require('fs-extra');
+      const got = require('got');
+      const safeMoveFile = require('../utils/fs/safe-move-file');
+
+      const pipeline = promisify(stream.pipeline);
+
+      const latestTag = (await got(`${standaloneServerUrl}/latest-tag`)).body;
+      const standaloneTmpPath = path.resolve(os.tmpdir(), 'serverless-tencent-binary-tmp');
+
+      try {
+        await pipeline(
+          got.stream(
+            `${standaloneServerUrl}/${latestTag}/serverless-tencent-${resolvePlatform()}-${resolveArch()}${resolveExtname()}`
+          ),
+          fs.createWriteStream(standaloneTmpPath)
+        );
+      } catch (error) {
+        if (error.response && error.response.statusCode === 404) {
+          process.stdout.write(
+            `${[
+              '',
+              // EN: Unable to install Tencent Serverless CLI automatically.
+              '无法自动安装 Tencent Serverless CLI.',
+              // EN: Please use "npm install -g serverless-tencent" to complete the manual
+              //     installation and re-execute this command
+              '请使用 "npm install -g serverless-tencent" 完成手动安装，并重新执行此命令',
+            ].join('\n')}\n`
+          );
+          return;
+        }
+        throw error;
+      }
+      await fse.ensureDir(path.dirname(standaloneFilename));
+      await safeMoveFile(standaloneTmpPath, standaloneFilename);
+      await fsp.chmod(standaloneFilename, 0o755);
+    } finally {
+      cliProgressFooter.updateProgress();
+    }
+  }
+
+  childProcess.spawn(standaloneFilename, process.argv.slice(2), { stdio: 'inherit' });
+};
diff --git a/lib/cli/triage.js b/lib/cli/triage.js
new file mode 100644
index 00000000000..a72712e2004
--- /dev/null
+++ b/lib/cli/triage.js
@@ -0,0 +1,194 @@
+'use strict';
+
+module.exports = async () => {
+  const cliArgs = new Set(process.argv.slice(2));
+
+  // Unconditionally favor "serverless" for version check
+  if (cliArgs.has('--version')) return 'serverless';
+  if (cliArgs.has('-v')) return 'serverless';
+
+  // Detect eventual component configuration
+  const fsp = require('fs').promises;
+
+  const isChinaUser = (() => {
+    if (process.env.SLS_GEO_LOCATION) return process.env.SLS_GEO_LOCATION === 'cn';
+    return new Intl.DateTimeFormat('en', { timeZoneName: 'long' })
+      .format()
+      .includes('China Standard Time');
+  })();
+
+  const resolvePlatformCli = () => {
+    // Support SERVERLESS_PLATFORM_VENDOR to be configured in .env files
+    const dotenv = require('dotenv');
+    dotenv.config({ path: require('path').resolve('.env') });
+
+    if (process.env.SERVERLESS_PLATFORM_VENDOR) {
+      return process.env.SERVERLESS_PLATFORM_VENDOR === 'tencent'
+        ? 'serverless-tencent'
+        : '@serverless/components';
+    }
+    return isChinaUser ? 'serverless-tencent' : '@serverless/components';
+  };
+
+  if (
+    (
+      await Promise.all(
+        ['yml', 'yaml', 'json'].map(async (extension) => {
+          try {
+            await fsp.access(`serverless.component.${extension}`);
+            return true;
+          } catch {
+            return false;
+          }
+        })
+      )
+    ).some(Boolean)
+  ) {
+    return resolvePlatformCli();
+  }
+
+  // Detect eventual service configuration
+  const configurationExtension =
+    (
+      await Promise.all(
+        ['yml', 'yaml', 'json', 'js', 'ts'].map(async (extension) => {
+          try {
+            await fsp.access(`serverless.${extension}`);
+            return extension;
+          } catch {
+            return null;
+          }
+        })
+      )
+    ).find(Boolean) || null;
+
+  if (configurationExtension) {
+    // Found top level service configuration, recognize CLI by content
+    const targetCliName = await (async () => {
+      const resolveByObjectConfiguration = (configuration) => {
+        if (configuration.provider) return 'serverless';
+        if (configuration.component) return resolvePlatformCli();
+        for (const value of Object.values(configuration)) {
+          if (value.component) return '@serverless/cli';
+        }
+        return null;
+      };
+      switch (configurationExtension) {
+        case 'yml':
+        case 'yaml': {
+          const content = await fsp.readFile(`serverless.${configurationExtension}`, 'utf8');
+          if (content.search(/(?:^|\n)provider\s*:/) !== -1) return 'serverless';
+          if (content.search(/(?:^|\n)component\s*:/) !== -1) return resolvePlatformCli();
+          if (content.search(/\n\s+component\s*:/) !== -1) return '@serverless/cli';
+          return null;
+        }
+        case 'json': {
+          const configuration = (() => {
+            try {
+              return require(`${process.cwd()}/serverless.json`);
+            } catch {
+              return null;
+            }
+          })();
+          if (!configuration) return 'serverless';
+          return resolveByObjectConfiguration(configuration);
+        }
+        case 'js': {
+          const configuration = (() => {
+            try {
+              return require(`${process.cwd()}/serverless.js`);
+            } catch {
+              return null;
+            }
+          })();
+          if (!configuration) return 'serverless';
+          if (typeof configuration === 'function') return '@serverless/cli';
+          return resolveByObjectConfiguration(configuration);
+        }
+        case 'ts':
+          return 'serverless';
+        default:
+          throw new Error(`Unrecognized extension "${configurationExtension}"`);
+      }
+    })();
+    if (targetCliName) return targetCliName;
+  }
+
+  // No top level service configuration
+  if (isChinaUser) return resolvePlatformCli();
+
+  // Detect eventual component template
+  const nestedTemplateKeywords = new Set([
+    'deploy',
+    'remove',
+    'info',
+    'help',
+    '--help',
+    'dev',
+    'logs',
+    'invoke',
+    'credentials',
+  ]);
+  if (!nestedTemplateKeywords.has(process.argv[2])) return 'serverless';
+
+  const path = require('path');
+  const detectSubServiceType = async (subDirname) => {
+    const subConfigurationExtension =
+      (
+        await Promise.all(
+          ['yml', 'yaml', 'json', 'js'].map(async (extension) => {
+            try {
+              await fsp.access(path.resolve(subDirname, `serverless.${extension}`));
+              return extension;
+            } catch {
+              return null;
+            }
+          })
+        )
+      ).find(Boolean) || null;
+    if (!subConfigurationExtension) return null;
+    switch (subConfigurationExtension) {
+      case 'yml':
+      case 'yaml': {
+        const content = await fsp.readFile(
+          path.resolve(subDirname, `serverless.${subConfigurationExtension}`),
+          'utf8'
+        );
+        if (content.search(/(?:^|\n)component\s*:/) !== -1) return '@serverless/components';
+        return 'other';
+      }
+      case 'json': {
+        const configuration = (() => {
+          try {
+            return require(`${path.resolve(subDirname)}/serverless.json`);
+          } catch {
+            return null;
+          }
+        })();
+        return configuration && configuration.component ? '@serverless/components' : 'other';
+      }
+      case 'js': {
+        const configuration = (() => {
+          try {
+            return require(`${path.resolve(subDirname)}/serverless.js`);
+          } catch {
+            return null;
+          }
+        })();
+        return configuration && configuration.component ? '@serverless/components' : 'other';
+      }
+      default:
+        throw new Error(`Unrecognized extension "${subConfigurationExtension}"`);
+    }
+  };
+  let hasComponent = false;
+  for (const subDirname of await fsp.readdir('.')) {
+    const stats = await fsp.lstat(subDirname);
+    if (!stats.isDirectory()) continue;
+    const subServiceType = await detectSubServiceType(subDirname);
+    if (!subServiceType) continue;
+    if (subServiceType === '@serverless/components') hasComponent = true;
+    else return 'serverless';
+  }
+  return hasComponent ? resolvePlatformCli() : 'serverless';
+};
diff --git a/lib/cli/write-service-outputs.js b/lib/cli/write-service-outputs.js
new file mode 100644
index 00000000000..e9605939553
--- /dev/null
+++ b/lib/cli/write-service-outputs.js
@@ -0,0 +1,13 @@
+'use strict';
+
+const { writeText, style } = require('@serverless/utils/log');
+
+module.exports = (serviceOutputs) => {
+  for (const [section, entries] of serviceOutputs) {
+    if (typeof entries === 'string') {
+      writeText(`${style.aside(`${section}:`)} ${entries}`);
+    } else {
+      writeText(`${style.aside(`${section}:\n`)}  ${entries.join('\n  ')}`);
+    }
+  }
+};
diff --git a/lib/commands/plugin-management.js b/lib/commands/plugin-management.js
new file mode 100644
index 00000000000..6efa1cc0f32
--- /dev/null
+++ b/lib/commands/plugin-management.js
@@ -0,0 +1,37 @@
+'use strict';
+
+const path = require('path');
+const ServerlessError = require('../../lib/serverless-error');
+
+module.exports = {
+  validate({ serviceDir }) {
+    if (!serviceDir) {
+      throw new ServerlessError(
+        'This command can only be run inside a service directory',
+        'MISSING_SERVICE_DIRECTORY'
+      );
+    }
+  },
+
+  getServerlessFilePath({ serviceDir, configurationFilename }) {
+    if (configurationFilename) {
+      return path.resolve(serviceDir, configurationFilename);
+    }
+    throw new ServerlessError(
+      'Could not find any serverless service definition file.',
+      'MISSING_SERVICE_CONFIGURATION_FILE'
+    );
+  },
+
+  getPluginInfo(name_) {
+    let name;
+    let version;
+    if (name_.startsWith('@')) {
+      [, name, version] = name_.split('@', 3);
+      name = `@${name}`;
+    } else {
+      [name, version] = name_.split('@', 2);
+    }
+    return { name, version };
+  },
+};
diff --git a/lib/configSchema.js b/lib/config-schema.js
similarity index 80%
rename from lib/configSchema.js
rename to lib/config-schema.js
index ae1a04ed24f..ce6b5232563 100644
--- a/lib/configSchema.js
+++ b/lib/config-schema.js
@@ -1,6 +1,7 @@
 'use strict';
 
 const functionNamePattern = '^[a-zA-Z0-9-_]+$';
+const stagePattern = '^[a-zA-Z0-9-]+$';
 
 const schema = {
   type: 'object',
@@ -20,6 +21,9 @@ const schema = {
       required: [],
       // User is free to add any properties for its own purpose
     },
+    deprecationNotificationMode: {
+      enum: ['error', 'warn', 'warn:summary'],
+    },
     disabledDeprecations: {
       anyOf: [
         { const: '*' },
@@ -29,7 +33,6 @@ const schema = {
         },
       ],
     },
-    enableLocalInstallationFallback: { type: 'boolean' },
     frameworkVersion: { type: 'string' },
     functions: {
       type: 'object',
@@ -82,6 +85,15 @@ const schema = {
       },
       additionalProperties: false,
     },
+    params: {
+      type: 'object',
+      patternProperties: {
+        [stagePattern]: {
+          type: 'object',
+        },
+      },
+      additionalProperties: false,
+    },
     plugins: {
       anyOf: [
         {
@@ -96,6 +108,10 @@ const schema = {
         { type: 'array', items: { type: 'string' } },
       ],
     },
+    projectDir: {
+      type: 'string',
+      pattern: '^(\\.\\/?|(\\.\\/)?\\.\\.(\\/\\.\\.)*\\/?)$',
+    },
     /*
      * Provider specific properties are extended in respected provider plugins.
      */
@@ -107,32 +123,13 @@ const schema = {
       required: ['name'],
       additionalProperties: false,
     },
-    service: {
-      anyOf: [
-        { $ref: '#/definitions/serviceName' },
-        {
-          type: 'object',
-          properties: {
-            name: { $ref: '#/definitions/serviceName' },
-            awsKmsKeyArn: { $ref: '#/definitions/awsKmsArn' },
-          },
-          additionalProperties: false,
-          required: ['name'],
-        },
-      ],
-    },
-    unresolvedVariablesNotificationMode: { enum: ['error', 'warn'] },
+    service: { $ref: '#/definitions/serviceName' },
     useDotenv: { const: true },
     variablesResolutionMode: { type: 'string', enum: ['20210219', '20210326'] },
   },
   additionalProperties: false,
   required: ['provider', 'service'],
   definitions: {
-    // TODO: awsKmsArn definition to be moved to lib/plugins/aws/provider/awsProvider.js once service.awsKmsKeyArn removed with v3.0.0, see https://github.com/serverless/serverless/issues/8261
-    // TODO: awsKmsArn to include #/definitions/awsCfFunction instead of type: object as one of the possible definition, see https://github.com/serverless/serverless/issues/8261
-    awsKmsArn: {
-      anyOf: [{ type: 'object' }, { type: 'string', pattern: '^arn:aws[a-z-]*:kms' }],
-    },
     errorCode: {
       type: 'string',
       pattern: '^[A-Z0-9_]+$',
@@ -142,6 +139,7 @@ const schema = {
       pattern: functionNamePattern,
     },
     serviceName: { type: 'string', pattern: '^[a-zA-Z][0-9a-zA-Z-]+$' },
+    stage: { type: 'string', pattern: stagePattern },
   },
 };
 
diff --git a/lib/configuration/read.js b/lib/configuration/read.js
index aaaaa632226..6667233d3d0 100644
--- a/lib/configuration/read.js
+++ b/lib/configuration/read.js
@@ -3,10 +3,9 @@
 const ensureString = require('type/string/ensure');
 const isPlainObject = require('type/plain-object/is');
 const path = require('path');
-const fs = require('fs').promises;
+const fsp = require('fs').promises;
 const yaml = require('js-yaml');
-const resolveModulePath = require('ncjsm/resolve');
-const isModuleNotFoundError = require('ncjsm/is-module-not-found-error');
+const getRequire = require('../utils/get-require');
 const spawn = require('child-process-ext/spawn');
 const cloudformationSchema = require('@serverless/utils/cloudformation-schema');
 const ServerlessError = require('../serverless-error');
@@ -14,30 +13,50 @@ const ServerlessError = require('../serverless-error');
 const resolveTsNode = async (serviceDir) => {
   // 1. If installed aside of a Framework, use it
   try {
-    return (await resolveModulePath(__dirname, 'ts-node')).realPath;
+    return getRequire(__dirname).resolve('ts-node');
   } catch (slsDepError) {
-    if (slsDepError.code !== 'MODULE_NOT_FOUND') throw slsDepError;
+    if (slsDepError.code !== 'MODULE_NOT_FOUND') {
+      throw new ServerlessError(
+        `Cannot resolve "ts-node" due to: ${slsDepError.message}`,
+        'TS_NODE_RESOLUTION_ERROR'
+      );
+    }
 
     // 2. If installed in a service, use it
     try {
-      return (await resolveModulePath(serviceDir, 'ts-node')).realPath;
+      return getRequire(serviceDir).resolve('ts-node');
     } catch (serviceDepError) {
-      if (serviceDepError.code !== 'MODULE_NOT_FOUND') throw serviceDepError;
+      if (serviceDepError.code !== 'MODULE_NOT_FOUND') {
+        throw new ServerlessError(
+          `Cannot resolve "ts-node" due to: ${serviceDepError.message}`,
+          'TS_NODE_IN_SERVICE_RESOLUTION_ERROR'
+        );
+      }
 
       // 3. If installed globally, use it
       const { stdoutBuffer } = await (async () => {
         try {
           return await spawn('npm', ['root', '-g']);
         } catch (error) {
-          if (error.code !== 'ENOENT') throw error;
-          throw new Error('"ts-node" not found');
+          if (error.code !== 'ENOENT') {
+            throw new ServerlessError(
+              `Cannot resolve "ts-node" due to unexpected "npm" error: ${error.message}`,
+              'TS_NODE_NPM_RESOLUTION_ERROR'
+            );
+          }
+          throw new ServerlessError('"ts-node" not found', 'TS_NODE_NOT_FOUND');
         }
       })();
       try {
         return require.resolve(`${String(stdoutBuffer).trim()}/ts-node`);
       } catch (globalDepError) {
-        if (globalDepError.code !== 'MODULE_NOT_FOUND') throw globalDepError;
-        throw new ServerlessError('"ts-node" not found');
+        if (globalDepError.code !== 'MODULE_NOT_FOUND') {
+          throw new ServerlessError(
+            `Cannot resolve "ts-node" due to: ${globalDepError.message}`,
+            'TS_NODE_NPM_GLOBAL_RESOLUTION_ERROR'
+          );
+        }
+        throw new ServerlessError('"ts-node" not found', 'TS_NODE_NOT_FOUND');
       }
     }
   }
@@ -45,7 +64,7 @@ const resolveTsNode = async (serviceDir) => {
 
 const readConfigurationFile = async (configurationPath) => {
   try {
-    return await fs.readFile(configurationPath, 'utf8');
+    return await fsp.readFile(configurationPath, 'utf8');
   } catch (error) {
     if (error.code === 'ENOENT') {
       throw new ServerlessError(
@@ -117,15 +136,17 @@ const parseConfigurationFile = async (configurationPath) => {
     // fallthrough
     case '.js': {
       const configurationEventuallyDeferred = (() => {
+        try {
+          require.resolve(configurationPath);
+        } catch {
+          throw new ServerlessError(
+            `Cannot load "${path.basename(configurationPath)}": File not found`,
+            'CONFIGURATION_NOT_FOUND'
+          );
+        }
         try {
           return require(configurationPath);
         } catch (error) {
-          if (isModuleNotFoundError(error, configurationPath)) {
-            throw new ServerlessError(
-              `Cannot load "${path.basename(configurationPath)}": File not found`,
-              'CONFIGURATION_NOT_FOUND'
-            );
-          }
           throw new ServerlessError(
             `Cannot load "${path.basename(configurationPath)}": Initialization error: ${
               error && error.stack ? error.stack : error
@@ -147,7 +168,7 @@ const parseConfigurationFile = async (configurationPath) => {
     }
     default:
       throw new ServerlessError(
-        `Cannot parse "${path.basename(configurationPath)}": Usupported file extension`,
+        `Cannot parse "${path.basename(configurationPath)}": Unsupported file extension`,
         'UNSUPPORTED_CONFIGURATION_TYPE'
       );
   }
diff --git a/lib/configuration/resolve-provider-name.js b/lib/configuration/resolve-provider-name.js
index d0ec19dd4c2..0a5d1022c73 100644
--- a/lib/configuration/resolve-provider-name.js
+++ b/lib/configuration/resolve-provider-name.js
@@ -12,6 +12,7 @@ module.exports = (configuration) => {
       {
         Error: ServerlessError,
         errorMessage: 'Invalid service configuration: "provider.name" property is missing',
+        errorCode: 'INVALID_CONFIGURATION_PROVIDER_NAME_MISSING',
       }
     );
   } catch (error) {
diff --git a/lib/configuration/variables/eventually-report-resolution-errors.js b/lib/configuration/variables/eventually-report-resolution-errors.js
index 5a8838c8790..c43da0c0d1d 100644
--- a/lib/configuration/variables/eventually-report-resolution-errors.js
+++ b/lib/configuration/variables/eventually-report-resolution-errors.js
@@ -1,10 +1,9 @@
 'use strict';
 
 const path = require('path');
-const log = require('@serverless/utils/log');
+const { log } = require('@serverless/utils/log');
 const ServerlessError = require('../../serverless-error');
 const resolveCliInput = require('../../cli/resolve-input');
-const logDeprecation = require('../../utils/logDeprecation');
 
 module.exports = (configurationPath, configuration, variablesMeta) => {
   const resolutionErrors = new Set(
@@ -14,35 +13,20 @@ module.exports = (configurationPath, configuration, variablesMeta) => {
   if (!resolutionErrors.size) return false;
 
   if (resolveCliInput().isHelpRequest) {
-    log(
+    log.warning(
       'Resolution of service configuration failed when resolving variables: ' +
-        `${Array.from(resolutionErrors, (error) => `\n  - ${error.message}`)}\n`,
-      { color: 'orange' }
+        `${Array.from(resolutionErrors, (error) => `\n  - ${error.message}`)}\n`
     );
-  } else {
-    if (configuration.variablesResolutionMode) {
-      throw new ServerlessError(
-        `Cannot resolve ${path.basename(
-          configurationPath
-        )}: Variables resolution errored with:${Array.from(
-          resolutionErrors,
-          (error) => `\n  - ${error.message}`
-        )}`,
-        'VARIABLES_RESOLUTION_ERROR'
-      );
-    }
-    logDeprecation(
-      'NEW_VARIABLES_RESOLVER',
-      'Variables resolver reports following resolution errors:' +
-        `${Array.from(resolutionErrors, (error) => `\n  - ${error.message}`)}\n` +
-        'From a next major this will be communicated with a thrown error.\n' +
-        'Set "variablesResolutionMode: 20210326" in your service config, ' +
-        'to adapt to new behavior now',
-      { serviceConfig: configuration }
-    );
-    // Hack to not duplicate the warning with similar deprecation
-    logDeprecation.triggeredDeprecations.add('VARIABLES_ERROR_ON_UNRESOLVED');
+    return true;
   }
 
-  return true;
+  throw new ServerlessError(
+    `Cannot resolve ${path.basename(
+      configurationPath
+    )}: Variables resolution errored with:${Array.from(
+      resolutionErrors,
+      (error) => `\n  - ${error.message}`
+    )}`,
+    'VARIABLES_RESOLUTION_ERROR'
+  );
 };
diff --git a/lib/configuration/variables/index.js b/lib/configuration/variables/index.js
index 7ea01aeaea0..2a24e4cf6ab 100644
--- a/lib/configuration/variables/index.js
+++ b/lib/configuration/variables/index.js
@@ -5,10 +5,11 @@
 
 const ensureString = require('type/string/ensure');
 const ensurePlainObject = require('type/plain-object/ensure');
+const ServerlessError = require('../../serverless-error');
 const resolveMeta = require('./resolve-meta');
 const resolve = require('./resolve');
 
-const sources = {
+const defaultSources = {
   env: require('./sources/env'),
   file: require('./sources/file'),
   opt: require('./sources/opt'),
@@ -23,7 +24,7 @@ const reportEventualErrors = (variablesMeta) => {
 
   if (!resolutionErrors.size) return;
 
-  throw new Error(
+  throw new ServerlessError(
     `Variables resolution errored with:${Array.from(
       resolutionErrors,
       (error) => `\n  - ${error.message}`
@@ -32,8 +33,7 @@ const reportEventualErrors = (variablesMeta) => {
   );
 };
 
-module.exports = async ({ serviceDir, servicePath, configuration, options }) => {
-  // TODO: Remove support for `servicePath` with next major
+module.exports = async ({ serviceDir, servicePath, configuration, options, sources = null }) => {
   serviceDir = ensureString(serviceDir || servicePath);
   ensurePlainObject(configuration);
   options = ensurePlainObject(options, { default: {} });
@@ -41,13 +41,14 @@ module.exports = async ({ serviceDir, servicePath, configuration, options }) =>
   const variablesMeta = resolveMeta(configuration);
   reportEventualErrors(variablesMeta);
 
+  if (!sources) sources = defaultSources;
   await resolve({
     serviceDir,
     configuration,
     variablesMeta,
     sources,
     options,
-    fulfilledSources: new Set(['env', 'file', 'opt', 'self', 'strToBool']),
+    fulfilledSources: new Set(Object.keys(sources)),
   });
 
   reportEventualErrors(variablesMeta);
diff --git a/lib/configuration/variables/parse.js b/lib/configuration/variables/parse.js
index a73e2159d86..c487304529b 100644
--- a/lib/configuration/variables/parse.js
+++ b/lib/configuration/variables/parse.js
@@ -45,6 +45,16 @@ const finalizeVariable = () => {
 };
 
 const registerVarEscape = () => {
+  if (!variables) variables = [];
+  variables.push({
+    start: escapeVarStart - contextStart,
+    end: index - contextStart,
+    value: '\\'.repeat(Math.ceil((index - 1 - escapeVarStart - 1) / 2)) + value[index - 1],
+  });
+  escapeVarStart = null;
+};
+
+const registerSlashEscape = () => {
   if (!variables) variables = [];
   variables.push({
     start: escapeVarStart - contextStart,
@@ -194,7 +204,7 @@ module.exports = (inputValue) => {
           break;
         case 'maybeVariableOpen':
           if (char === '{') {
-            if (escapeVarStart != null) registerVarEscape();
+            if (escapeVarStart != null) registerSlashEscape();
             state = 'maybeTypeStart';
           } else {
             escapeVarStart = null;
@@ -416,11 +426,6 @@ module.exports = (inputValue) => {
               contextVariables
             );
             finalizeSource();
-          } else if (char === ':') {
-            throw new ServerlessError(
-              `Invalid variable address at index ${sourceStart} in "${value}"`,
-              'INVALID_VARIABLE_ADDRESS'
-            );
           }
           break;
         case 'afterAddressString':
diff --git a/lib/configuration/variables/resolve-unresolved-source-types.js b/lib/configuration/variables/resolve-unresolved-source-types.js
index 2130c2546cc..bab1a8fec1b 100644
--- a/lib/configuration/variables/resolve-unresolved-source-types.js
+++ b/lib/configuration/variables/resolve-unresolved-source-types.js
@@ -1,21 +1,29 @@
 'use strict';
 
 const processVariables = (propertyPath, variablesMeta, resultMap) => {
-  if (!variablesMeta.variables) return;
+  let hasUnresolvedSources = false;
+  if (!variablesMeta.variables) return hasUnresolvedSources;
   for (const variableMeta of variablesMeta.variables) {
     if (!variableMeta.sources) continue;
-    for (const sourceData of variableMeta.sources) {
-      if (!sourceData.type) continue;
-      if (!resultMap.has(sourceData.type)) resultMap.set(sourceData.type, new Set());
-      resultMap.get(sourceData.type).add(propertyPath);
-      if (sourceData.params) {
-        for (const paramData of sourceData.params) {
-          processVariables(propertyPath, paramData, resultMap);
-        }
+    const sourceData = variableMeta.sources[0];
+    if (!sourceData.type) continue;
+    if (sourceData.params) {
+      for (const paramData of sourceData.params) {
+        if (processVariables(propertyPath, paramData, resultMap)) hasUnresolvedSources = true;
       }
-      if (sourceData.address) processVariables(propertyPath, sourceData.address, resultMap);
+      if (hasUnresolvedSources) continue;
     }
+    if (sourceData.address) {
+      if (processVariables(propertyPath, sourceData.address, resultMap)) {
+        hasUnresolvedSources = true;
+        continue;
+      }
+    }
+    hasUnresolvedSources = true;
+    if (!resultMap.has(sourceData.type)) resultMap.set(sourceData.type, new Set());
+    resultMap.get(sourceData.type).add(propertyPath);
   }
+  return hasUnresolvedSources;
 };
 
 module.exports = (propertiesVariablesMeta) => {
diff --git a/lib/configuration/variables/resolve.js b/lib/configuration/variables/resolve.js
index 583c26a4a1b..d6ee3c185ca 100644
--- a/lib/configuration/variables/resolve.js
+++ b/lib/configuration/variables/resolve.js
@@ -27,6 +27,33 @@ const variableProcessingErrorNames = new Set(['ServerlessError', 'VariableSource
 
 let lastResolutionBatchId = 0;
 
+const resolveSourceValuesVariables = (sourceValues) => {
+  // Value is a result of concatenation of string values coming from multiple sources.
+  // Parse variables in each string part individually - it's to avoid accidental
+  // resolution of variable-like notation which may surface after joining two values.
+  // Also that way we do not accidentally re-parse an escaped variables notation
+  let baseIndex = 0;
+  let resolvedValueVariables = null;
+  for (const sourceValue of sourceValues) {
+    const sourceValueVariables = parse(sourceValue);
+    if (sourceValueVariables) {
+      for (const sourceValueVariable of sourceValueVariables) {
+        if (sourceValueVariable.end) {
+          sourceValueVariable.start += baseIndex;
+          sourceValueVariable.end += baseIndex;
+        } else {
+          sourceValueVariable.start = baseIndex;
+          sourceValueVariable.end = baseIndex + sourceValue.length;
+        }
+      }
+      if (!resolvedValueVariables) resolvedValueVariables = [];
+      resolvedValueVariables.push(...sourceValueVariables);
+    }
+    baseIndex += sourceValue.length;
+  }
+  return resolvedValueVariables;
+};
+
 class VariablesResolver {
   constructor({
     serviceDir,
@@ -36,6 +63,7 @@ class VariablesResolver {
     options,
     fulfilledSources,
     propertyPathsToResolve,
+    variableSourcesInConfig,
   }) {
     this.serviceDir = serviceDir;
     this.configuration = configuration;
@@ -45,10 +73,12 @@ class VariablesResolver {
     this.fulfilledSources = fulfilledSources;
     this.propertyDependenciesMap = new Map();
     this.propertyResolutionNestDepthMap = new Map();
+    // It is used to record all encountered variable sources in configuration for telemetry purposes
+    this.variableSourcesInConfig = variableSourcesInConfig || new Set();
 
     // Resolve all variables simultaneously
     // Resolution batches are identified to ensure source resolution cache is not shared among them.
-    // (each new resolutioon batch has access to extended configuration structure
+    // (each new resolution batch has access to extended configuration structure
     // and cached source resolver may block access to already resolved structure)
     const resolutionBatchId = ++lastResolutionBatchId;
 
@@ -118,7 +148,7 @@ class VariablesResolver {
     // String value is either constructed from more than one variable
     // or is partially constructed with a variable.
     // In such case, end value is always a string, reconstructed below
-    const valueTokens = [];
+    const sourceValues = [];
     const rawValue = valueMeta.value;
     let lastIndex = 0;
     for (const { start, end, value } of valueMeta.variables) {
@@ -133,18 +163,23 @@ class VariablesResolver {
         );
         return;
       }
-      valueTokens.push(rawValue.slice(lastIndex, start), stringValue);
+      sourceValues.push(rawValue.slice(lastIndex, start), stringValue);
       lastIndex = end;
     }
-    valueTokens.push(rawValue.slice(lastIndex));
-    valueMeta.value = valueTokens.join('');
+    sourceValues.push(rawValue.slice(lastIndex));
+    valueMeta.value = sourceValues.join('');
+    valueMeta.sourceValues = sourceValues;
     delete valueMeta.variables;
-    valueMeta.isGeneratedFromMultipleSources = true;
   }
 
   async resolveVariable(resolutionBatchId, propertyPath, variableMeta) {
     // Resolve a single variable, which could be configured with multiple
     // (first-choice, and fallback) sources
+    for (const source of variableMeta.sources) {
+      if (source.type) {
+        this.variableSourcesInConfig.add(source.type);
+      }
+    }
     let sourceData = variableMeta.sources[0];
     do {
       const sourceMeta = this.sources[sourceData.type];
@@ -221,20 +256,14 @@ class VariablesResolver {
         sourceData.params.map(async (param) => {
           if (!param.variables) return;
           await this.resolveVariables(resolutionBatchId, propertyPath, param);
-          if (param.error) throw param.error;
+          await this.resolveInternalResult(resolutionBatchId, propertyPath, param);
         })
       );
-      if (sourceData.params.some((param) => param.variables)) {
-        throw new ServerlessError('Cannot resolve variable', 'MISSING_VARIABLE_DEPENDENCY');
-      }
     }
     if (sourceData.address && sourceData.address.variables) {
       // Ensure to have all eventual variables in address resolved
       await this.resolveVariables(resolutionBatchId, propertyPath, sourceData.address);
-      if (sourceData.address.error) throw sourceData.address.error;
-      if (sourceData.address.variables) {
-        throw new ServerlessError('Cannot resolve variable', 'MISSING_VARIABLE_DEPENDENCY');
-      }
+      await this.resolveInternalResult(resolutionBatchId, propertyPath, sourceData.address);
     }
     return JSON.parse(
       JSON.stringify(
@@ -274,6 +303,68 @@ class VariablesResolver {
       )
     );
   }
+
+  async resolveInternalResult(resolutionBatchId, propertyPath, valueMeta, nestTracker = 10) {
+    if (valueMeta.error) throw valueMeta.error;
+    if (valueMeta.variables) {
+      throw new ServerlessError('Cannot resolve variable', 'MISSING_VARIABLE_DEPENDENCY');
+    }
+    if (!nestTracker) {
+      throw new ServerlessError(
+        `Cannot resolve variable at "${humanizePropertyPath(
+          propertyPath.split('\0')
+        )}": Excessive variables nest depth`,
+        'EXCESSIVE_RESOLVED_VARIABLES_NEST_DEPTH'
+      );
+    }
+    if (typeof valueMeta.value === 'string') {
+      const valueVariables = (() => {
+        try {
+          if (valueMeta.sourceValues) return resolveSourceValuesVariables(valueMeta.sourceValues);
+          return parse(valueMeta.value);
+        } catch (error) {
+          error.message = `Cannot resolve variable at "${humanizePropertyPath(
+            propertyPath.split('\0')
+          )}": Approached variable syntax error in resolved value "${valueMeta.value}": ${
+            error.message
+          }`;
+          delete valueMeta.value;
+          valueMeta.error = error;
+          throw error;
+        }
+      })();
+
+      if (!valueVariables) return;
+      valueMeta.variables = valueVariables;
+      delete valueMeta.sourceValues;
+      await this.resolveVariables(resolutionBatchId, propertyPath, valueMeta);
+      await this.resolveInternalResult(resolutionBatchId, propertyPath, valueMeta, nestTracker - 1);
+      return;
+    }
+    const valueEntries = (() => {
+      if (isPlainObject(valueMeta.value)) return Object.entries(valueMeta.value);
+      return Array.isArray(valueMeta.value) ? valueMeta.value.entries() : null;
+    })();
+    if (!valueEntries) return;
+    const propertyVariablesMeta = parseEntries(valueEntries, [], new Map());
+    for (const [propertyKeyPath, propertyValueMeta] of propertyVariablesMeta) {
+      await this.resolveVariables(resolutionBatchId, propertyPath, propertyValueMeta);
+      await this.resolveInternalResult(
+        resolutionBatchId,
+        propertyPath,
+        propertyValueMeta,
+        nestTracker - 1
+      );
+      const propertyKeyPathKeys = propertyKeyPath.split('\0');
+      const targetKey = propertyKeyPathKeys[propertyKeyPathKeys.length - 1];
+      let targetObject = valueMeta.value;
+      for (const parentKey of propertyKeyPathKeys.slice(0, -1)) {
+        targetObject = targetObject[parentKey];
+      }
+      targetObject[targetKey] = propertyValueMeta.value;
+    }
+  }
+
   validateCrossPropertyDependency(dependentPropertyPath, dependencyPropertyPath) {
     if (dependentPropertyPath === dependencyPropertyPath) {
       throw new ServerlessError(
@@ -369,33 +460,20 @@ Object.defineProperties(
           // In such case resolution can be retried in later turn, after missing data is provided.
           //
           // Having `.error` means, resolution errored (with no recovery plan for it)
-          // Such error ideally should be exposed with command crash.
+          // Such error ideally should be exposed with command crash in resolution consumer logic
           return;
         }
 
         // Variable(s) for a property where successfully resolved, still it can be an object
         // (or an array) containing a values with variables in it.
         const propertyPathKeys = propertyPath.split('\0');
-        const { value, isGeneratedFromMultipleSources } = valueMeta;
+        const { value, sourceValues } = valueMeta;
 
-        const valueEntries = (() => {
-          if (isPlainObject(value)) return Object.entries(value);
-          return Array.isArray(value) ? value.entries() : null;
-        })();
         let propertyVariablesMeta;
-        if (valueEntries) {
-          propertyVariablesMeta = parseEntries(valueEntries, propertyPathKeys, new Map());
-        } else if (typeof value === 'string') {
+        if (typeof value === 'string') {
           const valueVariables = (() => {
-            if (isGeneratedFromMultipleSources) {
-              // Do not attempt to parse variables out of strings which are result of concatenation
-              // of values coming from multiple sources.
-              // Main reason, is to not re-attempt to parse values with eventually cleared escapes
-              // (e.g. escaped "\\${source:}" is at this point resolved to "${source:}".
-              // Parsing result string here will make escape in-effective).
-              return null;
-            }
             try {
+              if (sourceValues) return resolveSourceValuesVariables(sourceValues);
               return parse(value);
             } catch (error) {
               error.message = `Cannot resolve variable at "${humanizePropertyPath(
@@ -412,6 +490,14 @@ Object.defineProperties(
           } else if (valueMeta.error) {
             return;
           }
+        } else {
+          const valueEntries = (() => {
+            if (isPlainObject(value)) return Object.entries(value);
+            return Array.isArray(value) ? value.entries() : null;
+          })();
+          if (valueEntries) {
+            propertyVariablesMeta = parseEntries(valueEntries, propertyPathKeys, new Map());
+          }
         }
         if (propertyVariablesMeta && propertyVariablesMeta.size) {
           // Register variables found in resolved value
@@ -483,6 +569,43 @@ Object.defineProperties(
               propertyPath,
               ensureArray(dependencyPropertyPathKeys, { ensureItem: ensureString })
             ),
+          resolveVariable: async (variableString) => {
+            variableString = `\${${ensureString(variableString, {
+              Error: ServerlessError,
+              name: 'variableString',
+              errorCode: 'INVALID_VARIABLE_INPUT_TYPE',
+            })}}`;
+            const variableData = parse(variableString);
+            if (!variableData) {
+              throw new ServerlessError(
+                `Invalid variable value: "${variableString}"`,
+                'INVALID_VARIABLE_INPUT'
+              );
+            }
+            const meta = {
+              value: variableString,
+              variables: variableData,
+            };
+            await this.resolveVariables(resolutionBatchId, propertyPath, meta);
+            await this.resolveInternalResult(resolutionBatchId, propertyPath, meta);
+            return meta.value;
+          },
+          resolveVariablesInString: async (stringValue) => {
+            stringValue = ensureString(stringValue, {
+              Error: ServerlessError,
+              name: 'variableString',
+              errorCode: 'INVALID_STRING_INPUT_TYPE',
+            });
+            const variableData = parse(stringValue);
+            if (!variableData) return stringValue;
+            const meta = {
+              value: stringValue,
+              variables: variableData,
+            };
+            await this.resolveVariables(resolutionBatchId, propertyPath, meta);
+            await this.resolveInternalResult(resolutionBatchId, propertyPath, meta);
+            return meta.value;
+          },
         });
         ensurePlainObject(result, {
           errorMessage: `Unexpected "${sourceData.type}" source result: %v`,
@@ -496,19 +619,6 @@ Object.defineProperties(
           );
         }
         const resultValue = result.value;
-        if (isPlainObject(resultValue) || Array.isArray(resultValue)) {
-          try {
-            JSON.parse(JSON.stringify(resultValue));
-          } catch (error) {
-            throw new VariableSourceResolutionError(
-              `Source "${sourceData.type}" returned not supported result: "${util.inspect(
-                resultValue
-              )}"`,
-              'UNSUPPORTED_VARIABLE_RESOLUTION_RESULT'
-            );
-          }
-          return result;
-        }
         let normalizedResultValue;
         try {
           normalizedResultValue = JSON.parse(JSON.stringify(resultValue));
@@ -520,7 +630,11 @@ Object.defineProperties(
             'UNSUPPORTED_VARIABLE_RESOLUTION_RESULT'
           );
         }
-        if (resultValue !== normalizedResultValue) {
+        if (
+          !isPlainObject(resultValue) &&
+          !Array.isArray(resultValue) &&
+          resultValue !== normalizedResultValue
+        ) {
           throw new VariableSourceResolutionError(
             `Source "${sourceData.type}" returned not supported result: "${util.inspect(
               resultValue
diff --git a/lib/configuration/variables/sources/env.js b/lib/configuration/variables/sources/env.js
index 9e535c4103d..91fe1d737da 100644
--- a/lib/configuration/variables/sources/env.js
+++ b/lib/configuration/variables/sources/env.js
@@ -3,6 +3,10 @@
 const ensureString = require('type/string/ensure');
 const ServerlessError = require('../../../serverless-error');
 
+// Used to track env variable dependencies in specific resolution phases
+// This collection is cleared on demand externally
+const missingEnvVariables = new Set();
+
 module.exports = {
   resolve: ({ address, isSourceFulfilled }) => {
     if (!address) {
@@ -14,8 +18,11 @@ module.exports = {
     address = ensureString(address, {
       Error: ServerlessError,
       errorMessage: 'Non-string address argument in variable "env" source: %v',
+      errorCode: 'INVALID_ENV_SOURCE_ADDRESS',
     });
 
+    if (!process.env[address]) missingEnvVariables.add(address);
     return { value: process.env[address] || null, isPending: !isSourceFulfilled };
   },
+  missingEnvVariables,
 };
diff --git a/lib/configuration/variables/sources/file.js b/lib/configuration/variables/sources/file.js
index 9e2b217fe71..b9e952f55c4 100644
--- a/lib/configuration/variables/sources/file.js
+++ b/lib/configuration/variables/sources/file.js
@@ -3,14 +3,14 @@
 const ensureString = require('type/string/ensure');
 const isPlainFunction = require('type/plain-function/is');
 const path = require('path');
-const fs = require('fs').promises;
+const fsp = require('fs').promises;
 const yaml = require('js-yaml');
 const cloudformationSchema = require('@serverless/utils/cloudformation-schema');
 const ServerlessError = require('../../../serverless-error');
 
 const readFile = async (filePath, serviceDir) => {
   try {
-    return await fs.readFile(filePath, 'utf8');
+    return await fsp.readFile(filePath, 'utf8');
   } catch (error) {
     if (error.code === 'ENOENT') return null;
     throw new ServerlessError(
@@ -21,7 +21,15 @@ const readFile = async (filePath, serviceDir) => {
 };
 
 module.exports = {
-  resolve: async ({ serviceDir, params, address, resolveConfigurationProperty, options }) => {
+  resolve: async ({
+    serviceDir,
+    params,
+    address,
+    resolveConfigurationProperty,
+    resolveVariable,
+    resolveVariablesInString,
+    options,
+  }) => {
     if (!params || !params[0]) {
       throw new ServerlessError(
         'Missing path argument in variable "file" source',
@@ -33,18 +41,14 @@ module.exports = {
       ensureString(params[0], {
         Error: ServerlessError,
         errorMessage: 'Non-string path argument in variable "file" source: %v',
+        errorCode: 'INVALID_FILE_SOURCE_PATH_ARGUMENT',
       })
     );
-    if (!filePath.startsWith(`${serviceDir}${path.sep}`)) {
-      throw new ServerlessError(
-        'Cannot load file from outside of service folder',
-        'FILE_SOURCE_PATH_OUTSIDE_OF_SERVICE'
-      );
-    }
     if (address != null) {
       address = ensureString(address, {
         Error: ServerlessError,
         errorMessage: 'Non-string address argument for variable "file" source: %v',
+        errorCode: 'INVALID_FILE_SOURCE_ADDRESS',
       });
     }
 
@@ -102,21 +106,17 @@ module.exports = {
             );
           }
           if (isPlainFunction(result)) {
-            if (!(await resolveConfigurationProperty(['variablesResolutionMode']))) {
-              throw new ServerlessError(
-                `Cannot parse "${path.basename(
-                  filePath
-                )}": Approached a JS function resolver, confirm it's updated to work with a ` +
-                  'new parser by setting "variablesResolutionMode: 20210326" in service config. ' +
-                  'Falling back to old resolver',
-                'NOT_SUPPORTED_JS_FUNCTION_SOURCE'
-              );
-            }
             try {
               isResolvedByFunction = true;
-              return await result({ options, resolveConfigurationProperty });
+              return await result({ options, resolveConfigurationProperty, resolveVariable });
             } catch (error) {
               if (error.code === 'MISSING_VARIABLE_DEPENDENCY') throw error;
+              if (
+                error.constructor.name === 'ServerlessError' &&
+                error.message.startsWith('Cannot resolve variable at ')
+              ) {
+                throw error;
+              }
               throw new ServerlessError(
                 `Cannot resolve "${path.basename(filePath)}": Returned JS function errored with: ${
                   error && error.stack ? error.stack : error
@@ -147,23 +147,21 @@ module.exports = {
     const propertyKeys = address.split('.');
     let result = content;
     for (const propertyKey of propertyKeys) {
+      if (typeof result === 'string') result = await resolveVariablesInString(result);
       result = result[propertyKey];
       if (result == null) return { value: null };
       if (!isResolvedByFunction && isPlainFunction(result)) {
-        if (!(await resolveConfigurationProperty(['variablesResolutionMode']))) {
-          throw new ServerlessError(
-            `Cannot resolve "${address}" out of "${path.basename(
-              filePath
-            )}": Resolved a JS function not confirmed to work with a new parser, ` +
-              'falling back to old resolver',
-            'FILE_CONTENT_RESOLUTION_ERROR'
-          );
-        }
         isResolvedByFunction = true;
         try {
-          result = await result({ options, resolveConfigurationProperty });
+          result = await result({ options, resolveConfigurationProperty, resolveVariable });
         } catch (error) {
           if (error.code === 'MISSING_VARIABLE_DEPENDENCY') throw error;
+          if (
+            error.constructor.name === 'ServerlessError' &&
+            error.message.startsWith('Cannot resolve variable at ')
+          ) {
+            throw error;
+          }
           throw new ServerlessError(
             `Cannot resolve "${address}" out of "${path.basename(filePath)}": Received rejection: ${
               error && error.stack ? error.stack : error
diff --git a/lib/configuration/variables/sources/instance-dependent/get-aws.js b/lib/configuration/variables/sources/instance-dependent/get-aws.js
new file mode 100644
index 00000000000..45b7a021d01
--- /dev/null
+++ b/lib/configuration/variables/sources/instance-dependent/get-aws.js
@@ -0,0 +1,43 @@
+'use strict';
+
+const ensureString = require('type/string/ensure');
+const ServerlessError = require('../../../../serverless-error');
+
+module.exports = (serverlessInstance) => {
+  return {
+    resolve: async ({ address, options, resolveConfigurationProperty }) => {
+      if (!address) {
+        throw new ServerlessError(
+          'Missing address argument in variable "aws" source',
+          'MISSING_AWS_SOURCE_ADDRESS'
+        );
+      }
+
+      address = ensureString(address, {
+        Error: ServerlessError,
+        errorMessage: 'Non-string address argument in variable "sls" source: %v',
+        errorCode: 'INVALID_AWS_SOURCE_ADDRESS',
+      });
+
+      switch (address) {
+        case 'accountId': {
+          const { Account } = await serverlessInstance
+            .getProvider('aws')
+            .request('STS', 'getCallerIdentity', {}, { useCache: true });
+          return { value: Account };
+        }
+        case 'region': {
+          let region = options.region;
+          if (!region) region = await resolveConfigurationProperty(['provider', 'region']);
+          if (!region) region = 'us-east-1';
+          return { value: region };
+        }
+        default:
+          throw new ServerlessError(
+            `Unsupported "${address}" address argument in variable "aws" source`,
+            'UNSUPPORTED_AWS_SOURCE_ADDRESS'
+          );
+      }
+    },
+  };
+};
diff --git a/lib/configuration/variables/sources/instance-dependent/get-cf.js b/lib/configuration/variables/sources/instance-dependent/get-cf.js
index 2507012b845..26a14dce277 100644
--- a/lib/configuration/variables/sources/instance-dependent/get-cf.js
+++ b/lib/configuration/variables/sources/instance-dependent/get-cf.js
@@ -17,6 +17,7 @@ module.exports = (serverlessInstance) => {
       address = ensureString(address, {
         Error: ServerlessError,
         errorMessage: 'Non-string address argument in variable "cf" source: %v',
+        errorCode: 'INVALID_CF_SOURCE_ADDRESS',
       });
       const separatorIndex = address.indexOf('.');
       if (separatorIndex === -1) {
@@ -40,7 +41,10 @@ module.exports = (serverlessInstance) => {
               { useCache: true, region: params && params[0] }
             );
         } catch (error) {
-          if (error.code === 'ValidationError' && error.message.includes('does not exist')) {
+          if (
+            error.code === 'AWS_CLOUD_FORMATION_DESCRIBE_STACKS_VALIDATION_ERROR' &&
+            error.message.includes('does not exist')
+          ) {
             return null;
           }
           throw error;
diff --git a/lib/configuration/variables/sources/instance-dependent/get-s3.js b/lib/configuration/variables/sources/instance-dependent/get-s3.js
index 8da1a033800..32a12044619 100644
--- a/lib/configuration/variables/sources/instance-dependent/get-s3.js
+++ b/lib/configuration/variables/sources/instance-dependent/get-s3.js
@@ -16,6 +16,7 @@ module.exports = (serverlessInstance) => {
       address = ensureString(address, {
         Error: ServerlessError,
         errorMessage: 'Non-string address argument in variable "s3" source: %v',
+        errorCode: 'INVALID_S3_SOURCE_ADDRESS',
       });
       const separatorIndex = address.indexOf('/');
       if (separatorIndex === -1) {
@@ -34,7 +35,8 @@ module.exports = (serverlessInstance) => {
             .getProvider('aws')
             .request('S3', 'getObject', { Bucket: bucketName, Key: key }, { useCache: true });
         } catch (error) {
-          if (error.code === 'NoSuchKey') return null;
+          // Check for normalized error code instead of native one
+          if (error.code === 'AWS_S3_GET_OBJECT_NO_SUCH_KEY') return null;
           throw error;
         }
       })();
diff --git a/lib/configuration/variables/sources/instance-dependent/get-sls.js b/lib/configuration/variables/sources/instance-dependent/get-sls.js
index 127ad6f4d5e..b2c4832cf78 100644
--- a/lib/configuration/variables/sources/instance-dependent/get-sls.js
+++ b/lib/configuration/variables/sources/instance-dependent/get-sls.js
@@ -15,10 +15,12 @@ module.exports = (serverlessInstance) => {
       address = ensureString(address, {
         Error: ServerlessError,
         errorMessage: 'Non-string address argument in variable "sls" source: %v',
+        errorCode: 'INVALID_SLS_SOURCE_ADDRESS',
       });
 
       switch (address) {
         case 'instanceId':
+          if (!serverlessInstance) return { value: null, isPending: true };
           return { value: serverlessInstance.instanceId };
         case 'stage': {
           let stage = options.stage;
diff --git a/lib/configuration/variables/sources/instance-dependent/get-ssm.js b/lib/configuration/variables/sources/instance-dependent/get-ssm.js
index 36f7b424e3b..89cc31dfd3b 100644
--- a/lib/configuration/variables/sources/instance-dependent/get-ssm.js
+++ b/lib/configuration/variables/sources/instance-dependent/get-ssm.js
@@ -2,13 +2,11 @@
 
 const ensureString = require('type/string/ensure');
 const ServerlessError = require('../../../../serverless-error');
-const logDeprecation = require('../../../../utils/logDeprecation');
-
-const legacyInstructions = new Set(['true', 'split']);
+const _ = require('lodash');
 
 module.exports = (serverlessInstance) => {
   return {
-    resolve: async ({ address, params, resolveConfigurationProperty }) => {
+    resolve: async ({ address, params }) => {
       // ssm(region = null):param-path
       if (!address) {
         throw new ServerlessError(
@@ -19,37 +17,13 @@ module.exports = (serverlessInstance) => {
       address = ensureString(address, {
         Error: ServerlessError,
         errorMessage: 'Non-string address argument in variable "ssm" source: %v',
+        errorCode: 'INVALID_SSM_SOURCE_ADDRESS',
       });
-      const region = !params || !params[0] || params[0] === 'raw' ? undefined : params[0];
-      const shouldReturnRawValue = params && (params[0] === 'raw' || params[1] === 'raw');
+      const shouldReturnRawValue = params && params.includes('raw');
+      const shouldSkipDecryption = params && params.includes('noDecrypt');
+      _.pull(params, 'raw', 'noDecrypt');
+      const region = params && params[0];
 
-      // TODO: Remove legacy instruction separator handling with next major
-      let legacyShouldEnforceDecrypt = false;
-      let legacyShouldEnforceSplit = false;
-      const shouldEnforceModernResolver =
-        (await resolveConfigurationProperty(['variablesResolutionMode'])) >= 20210326;
-      if (!shouldEnforceModernResolver) {
-        const legacyInstructionSeparator = address.lastIndexOf('~');
-        if (legacyInstructionSeparator !== -1) {
-          const instruction = address.slice(legacyInstructionSeparator + 1);
-          if (legacyInstructions.has(instruction)) {
-            address = address.slice(0, legacyInstructionSeparator);
-            if (instruction === 'true') legacyShouldEnforceDecrypt = true;
-            else legacyShouldEnforceSplit = true;
-            logDeprecation(
-              'NEW_VARIABLES_RESOLVER',
-              'Syntax for referencing SSM parameters was upgraded with ' +
-                'automatic type detection ' +
-                'and there\'s no need to add "~true" or "~split" postfixes to variable references.\n' +
-                'Drop those postfixes and set "variablesResolutionMode: 20210326" in your ' +
-                'service config to adapt to a new behavior.\n' +
-                'Starting with next major release, ' +
-                'this will be communicated with a thrown error.\n',
-              { serviceConfig: serverlessInstance.configurationInput }
-            );
-          }
-        }
-      }
       const result = await (async () => {
         try {
           return await serverlessInstance.getProvider('aws').request(
@@ -57,12 +31,13 @@ module.exports = (serverlessInstance) => {
             'getParameter',
             {
               Name: address,
-              WithDecryption: true,
+              WithDecryption: !shouldSkipDecryption,
             },
             { useCache: true, region }
           );
         } catch (error) {
-          if (error.code === 'ParameterNotFound') return null;
+          // Check for normalized error code instead of native one
+          if (error.code === 'AWS_S_S_M_GET_PARAMETER_PARAMETER_NOT_FOUND') return null;
           throw error;
         }
       })();
@@ -70,55 +45,17 @@ module.exports = (serverlessInstance) => {
       if (!result) return { value: null };
       switch (result.Parameter.Type) {
         case 'String':
-          if (!shouldEnforceModernResolver && legacyShouldEnforceSplit) {
-            throw new ServerlessError(
-              'Unexpected "ssm" variable "~split" instruction for non "StringList" value type. ' +
-                "Please remove the postfix as it'll break the resolution in next major version." +
-                'Falling back to old resolver',
-              'NOT_COMPLIANT_LEGACY_SSM_INSTRUCTION'
-            );
-          }
           return { value: result.Parameter.Value };
         case 'StringList':
-          if (!shouldEnforceModernResolver && !shouldReturnRawValue && !legacyShouldEnforceSplit) {
-            throw new ServerlessError(
-              'Unexpected "ssm" variable with no "~split" instruction ' +
-                'for "StringList" value type. ' +
-                'Set "variablesResolutionMode: 20210326" in service config ' +
-                'to automatically split result string and adapt to new bahavior. ' +
-                'Falling back to old resolver',
-              'NOT_COMPLIANT_LEGACY_SSM_INSTRUCTION'
-            );
-          }
           return {
             value: shouldReturnRawValue
               ? result.Parameter.Value
               : result.Parameter.Value.split(','),
           };
         case 'SecureString':
-          if (!shouldEnforceModernResolver) {
-            if (!legacyShouldEnforceDecrypt) {
-              throw new ServerlessError(
-                'Unexpected "ssm" variable with no "~true" instruction ' +
-                  'for "SecureString" value type. ' +
-                  'Set "variablesResolutionMode: 20210326" in service config ' +
-                  'to automatically decrypt result string and adapt to new bahavior. ' +
-                  'Falling back to old resolver',
-                'NOT_COMPLIANT_LEGACY_SSM_INSTRUCTION'
-              );
-            }
-            if (!address.startsWith('/aws/reference/secretsmanager') && !shouldReturnRawValue) {
-              throw new ServerlessError(
-                'Unexpected "ssm" variable with "SecureString" value for ' +
-                  'non AWS Secrets manager param. ' +
-                  'Set "variablesResolutionMode: 20210326" in service config ' +
-                  'to automatically parse result string and adapt to new bahavior. ' +
-                  'Falling back to old resolver',
-                'NOT_COMPLIANT_LEGACY_SSM_INSTRUCTION'
-              );
-            }
+          if (shouldReturnRawValue || !result.Parameter.Value.startsWith('{')) {
+            return { value: result.Parameter.Value };
           }
-          if (shouldReturnRawValue) return { value: result.Parameter.Value };
           try {
             return { value: JSON.parse(result.Parameter.Value) };
           } catch {
diff --git a/lib/configuration/variables/sources/opt.js b/lib/configuration/variables/sources/opt.js
index c6dd838f4d6..6a7af5c4aac 100644
--- a/lib/configuration/variables/sources/opt.js
+++ b/lib/configuration/variables/sources/opt.js
@@ -9,6 +9,7 @@ module.exports = {
       isOptional: true,
       Error: ServerlessError,
       errorMessage: 'Non-string address argument in variable "opt" source: %v',
+      errorCode: 'INVALID_OPT_SOURCE_ADDRESS',
     });
     if (!isSourceFulfilled) {
       if (address == null) return { value: null, isPending: true };
diff --git a/lib/configuration/variables/sources/resolve-external-plugin-sources.js b/lib/configuration/variables/sources/resolve-external-plugin-sources.js
new file mode 100644
index 00000000000..816c7cf31d0
--- /dev/null
+++ b/lib/configuration/variables/sources/resolve-external-plugin-sources.js
@@ -0,0 +1,63 @@
+'use strict';
+
+const ensurePlainObject = require('type/plain-object/ensure');
+const ensurePlainFunction = require('type/plain-function/ensure');
+const ServerlessError = require('../../../serverless-error');
+const logDeprecation = require('../../../utils/log-deprecation');
+
+module.exports = (configuration, resolverConfiguration, externalPlugins) => {
+  for (const externalPlugin of externalPlugins) {
+    const pluginName = externalPlugin.constructor.name;
+    if (externalPlugin.configurationVariablesSources != null) {
+      ensurePlainObject(externalPlugin.configurationVariablesSources, {
+        errorMessage:
+          'Invalid "configurationVariablesSources" ' +
+          `configuration on "${pluginName}", expected object, got: %v"`,
+        Error: ServerlessError,
+        errorCode: 'INVALID_VARIABLE_SOURCES_CONFIGURATION',
+      });
+
+      for (const [sourceName, sourceConfig] of Object.entries(
+        externalPlugin.configurationVariablesSources
+      )) {
+        if (resolverConfiguration.sources[sourceName]) {
+          throw new ServerlessError(
+            `Cannot add "${sourceName}" configuration variable source ` +
+              `(through "${pluginName}" plugin) as resolution rules ` +
+              'for this source name are already configured',
+            'DUPLICATE_VARIABLE_SOURCE_CONFIGURATION'
+          );
+        }
+        ensurePlainFunction(
+          ensurePlainObject(sourceConfig, {
+            errorMessage:
+              `Invalid "configurationVariablesSources.${sourceName}" ` +
+              `configuration on "${pluginName}", expected object, got: %v"`,
+            Error: ServerlessError,
+            errorCode: 'INVALID_VARIABLE_SOURCE_CONFIGURATION',
+          }).resolve,
+          {
+            errorMessage:
+              `Invalid "configurationVariablesSources.${sourceName}.resolve" ` +
+              `value on "${pluginName}", expected function, got: %v"`,
+            Error: ServerlessError,
+            errorCode: 'INVALID_VARIABLE_SOURCE_RESOLVER_CONFIGURATION',
+          }
+        );
+
+        resolverConfiguration.sources[sourceName] = sourceConfig;
+        resolverConfiguration.fulfilledSources.add(sourceName);
+      }
+    } else if (externalPlugin.variableResolvers) {
+      logDeprecation(
+        'NEW_VARIABLES_RESOLVER',
+        `Plugin "${pluginName}" attempts to extend old variables resolver. ` +
+          'Ensure to rely on latest version of a plugin and if this warning is ' +
+          'still displayed please report the problem at plugin issue tracker' +
+          'Starting with next major release, ' +
+          'old variables resolver will not be supported.\n',
+        { serviceConfig: configuration }
+      );
+    }
+  }
+};
diff --git a/lib/configuration/variables/sources/str-to-bool.js b/lib/configuration/variables/sources/str-to-bool.js
index b9ab92b6c81..70afa78ae3e 100644
--- a/lib/configuration/variables/sources/str-to-bool.js
+++ b/lib/configuration/variables/sources/str-to-bool.js
@@ -15,7 +15,10 @@ module.exports = {
     const stringValue = ensureString(params[0], {
       Error: ServerlessError,
       errorMessage: 'Non-string "strToBool" input:. Received: %v',
-    }).trim();
+      errorCode: 'INVALID_STR_TO_BOOL_SOURCE_VALUE',
+    })
+      .trim()
+      .toLowerCase();
 
     if (trueStrings.has(stringValue)) return { value: true };
     if (falseStrings.has(stringValue)) return { value: false };
diff --git a/lib/plugins/aws/common/index.js b/lib/plugins/aws/common/index.js
index 53ed1d805cc..927c7f6eab9 100644
--- a/lib/plugins/aws/common/index.js
+++ b/lib/plugins/aws/common/index.js
@@ -7,7 +7,7 @@
  */
 
 const validate = require('../lib/validate');
-const cleanupTempDir = require('./lib/cleanupTempDir');
+const cleanupTempDir = require('./lib/cleanup-temp-dir');
 const artifacts = require('./lib/artifacts');
 
 class AwsCommon {
diff --git a/lib/plugins/aws/common/lib/cleanupTempDir.js b/lib/plugins/aws/common/lib/cleanup-temp-dir.js
similarity index 100%
rename from lib/plugins/aws/common/lib/cleanupTempDir.js
rename to lib/plugins/aws/common/lib/cleanup-temp-dir.js
diff --git a/lib/plugins/aws/configCredentials.js b/lib/plugins/aws/config-credentials.js
similarity index 68%
rename from lib/plugins/aws/configCredentials.js
rename to lib/plugins/aws/config-credentials.js
index 8996e291473..d26b8b9704c 100644
--- a/lib/plugins/aws/configCredentials.js
+++ b/lib/plugins/aws/config-credentials.js
@@ -4,6 +4,7 @@ const os = require('os');
 const credentials = require('./utils/credentials');
 const ServerlessError = require('../../serverless-error');
 const cliCommandsSchema = require('../../cli/commands-schema');
+const { log } = require('@serverless/utils/log');
 
 class AwsConfigCredentials {
   constructor(serverless, options) {
@@ -24,7 +25,10 @@ class AwsConfigCredentials {
     };
 
     if (!os.homedir()) {
-      throw new ServerlessError("Can't find home directory on your local file system.");
+      throw new ServerlessError(
+        "Can't find home directory on your local file system.",
+        'MISSING_HOME_DIRECTORY'
+      );
     }
 
     this.hooks = {
@@ -42,21 +46,20 @@ class AwsConfigCredentials {
 
     // validate
     if (!this.options.key || !this.options.secret) {
-      throw new ServerlessError('Please include --key and --secret options for AWS.');
+      throw new ServerlessError(
+        'Please include --key and --secret options for AWS.',
+        'MISSING_KEY_AND_SECRET_CLI_OPTIONS'
+      );
     }
 
-    this.serverless.cli.log('Setting up AWS...');
-
     const profiles = await credentials.resolveFileProfiles();
     if (profiles.has(this.options.profile)) {
       // Only update the profile if the overwrite flag was set
       if (!this.options.overwrite) {
-        const message = [
-          `Failed! ~/.aws/credentials already has a "${this.options.profile}" profile.`,
-          ' Use the overwrite flag ("-o" or "--overwrite") to force the update',
-        ].join('');
-        this.serverless.cli.log(message);
-        return null;
+        throw new ServerlessError(
+          `Profile "${this.options.profile}" is already configured in ~/.aws/credentials. Use the overwrite flag ("-o" or "--overwrite") to force the update.`,
+          'CREDENTIALS_PROFILE_ALREADY_CONFIGURED'
+        );
       }
     }
     profiles.set(this.options.profile, {
@@ -64,7 +67,9 @@ class AwsConfigCredentials {
       secretAccessKey: this.options.secret,
     });
 
-    return credentials.saveFileProfiles(profiles);
+    const result = await credentials.saveFileProfiles(profiles);
+    log.notice.success(`Profile "${this.options.profile}" has been configured`);
+    return result;
   }
 }
 
diff --git a/lib/plugins/aws/customResources/generateZip.js b/lib/plugins/aws/custom-resources/generate-zip.js
similarity index 69%
rename from lib/plugins/aws/customResources/generateZip.js
rename to lib/plugins/aws/custom-resources/generate-zip.js
index 2e572bccc08..5ad19e3fa2c 100644
--- a/lib/plugins/aws/customResources/generateZip.js
+++ b/lib/plugins/aws/custom-resources/generate-zip.js
@@ -2,9 +2,10 @@
 
 const path = require('path');
 const fse = require('fs-extra');
-const getTmpDirPath = require('../../../utils/fs/getTmpDirPath');
-const createZipFile = require('../../../utils/fs/createZipFile');
-const ensureArtifact = require('../../../utils/ensureArtifact');
+const getTmpDirPath = require('../../../utils/fs/get-tmp-dir-path');
+const createZipFile = require('../../../utils/fs/create-zip-file');
+const ensureArtifact = require('../../../utils/ensure-artifact');
+const safeMoveFile = require('../../../utils/fs/safe-move-file');
 
 const srcDirPath = path.join(__dirname, 'resources');
 
@@ -18,7 +19,7 @@ module.exports = async () => {
     const cachedZipFilePath = path.resolve(cachePath, artifactName);
     await fse.copy(srcDirPath, tmpInstalledLambdaPath);
     await createZipFile(tmpInstalledLambdaPath, tmpZipFilePath);
-    await fse.move(tmpZipFilePath, cachedZipFilePath);
+    await safeMoveFile(tmpZipFilePath, cachedZipFilePath);
   });
   return path.resolve(resultPath, artifactName);
 };
diff --git a/lib/plugins/aws/customResources/index.js b/lib/plugins/aws/custom-resources/index.js
similarity index 83%
rename from lib/plugins/aws/customResources/index.js
rename to lib/plugins/aws/custom-resources/index.js
index b95f57811b3..c394d0b12f5 100644
--- a/lib/plugins/aws/customResources/index.js
+++ b/lib/plugins/aws/custom-resources/index.js
@@ -5,14 +5,16 @@ const path = require('path');
 const crypto = require('crypto');
 const BbPromise = require('bluebird');
 const fse = require('fs-extra');
-const generateZip = require('./generateZip');
+const { log } = require('@serverless/utils/log');
+const generateZip = require('./generate-zip');
 const ServerlessError = require('../../../serverless-error');
 
-const prepareCustomResourcePackage = _.memoize(async (zipFilePath) =>
-  BbPromise.all([generateZip(), fse.mkdirs(path.dirname(zipFilePath))])
+const prepareCustomResourcePackage = _.memoize(async (zipFilePath) => {
+  log.info('Generating custom CloudFormation resources');
+  return BbPromise.all([generateZip(), fse.mkdirs(path.dirname(zipFilePath))])
     .then(([cachedZipFilePath]) => fse.copy(cachedZipFilePath, zipFilePath))
-    .then(() => path.basename(zipFilePath))
-);
+    .then(() => path.basename(zipFilePath));
+});
 
 async function addCustomResourceToService(awsProvider, resourceName, iamRoleStatements) {
   let functionName;
@@ -36,21 +38,29 @@ async function addCustomResourceToService(awsProvider, resourceName, iamRoleStat
   if (resourceName === 's3') {
     functionName = awsProvider.naming.getCustomResourceS3HandlerFunctionName();
     Handler = 's3/handler.handler';
-    customResourceFunctionLogicalId = awsProvider.naming.getCustomResourceS3HandlerFunctionLogicalId();
+    customResourceFunctionLogicalId =
+      awsProvider.naming.getCustomResourceS3HandlerFunctionLogicalId();
   } else if (resourceName === 'cognitoUserPool') {
     functionName = awsProvider.naming.getCustomResourceCognitoUserPoolHandlerFunctionName();
-    Handler = 'cognitoUserPool/handler.handler';
-    customResourceFunctionLogicalId = awsProvider.naming.getCustomResourceCognitoUserPoolHandlerFunctionLogicalId();
+    Handler = 'cognito-user-pool/handler.handler';
+    customResourceFunctionLogicalId =
+      awsProvider.naming.getCustomResourceCognitoUserPoolHandlerFunctionLogicalId();
   } else if (resourceName === 'eventBridge') {
     functionName = awsProvider.naming.getCustomResourceEventBridgeHandlerFunctionName();
-    Handler = 'eventBridge/handler.handler';
-    customResourceFunctionLogicalId = awsProvider.naming.getCustomResourceEventBridgeHandlerFunctionLogicalId();
+    Handler = 'event-bridge/handler.handler';
+    customResourceFunctionLogicalId =
+      awsProvider.naming.getCustomResourceEventBridgeHandlerFunctionLogicalId();
   } else if (resourceName === 'apiGatewayCloudWatchRole') {
-    functionName = awsProvider.naming.getCustomResourceApiGatewayAccountCloudWatchRoleHandlerFunctionName();
-    Handler = 'apiGatewayCloudWatchRole/handler.handler';
-    customResourceFunctionLogicalId = awsProvider.naming.getCustomResourceApiGatewayAccountCloudWatchRoleHandlerFunctionLogicalId();
+    functionName =
+      awsProvider.naming.getCustomResourceApiGatewayAccountCloudWatchRoleHandlerFunctionName();
+    Handler = 'api-gateway-cloud-watch-role/handler.handler';
+    customResourceFunctionLogicalId =
+      awsProvider.naming.getCustomResourceApiGatewayAccountCloudWatchRoleHandlerFunctionLogicalId();
   } else {
-    throw new ServerlessError(`No implementation found for Custom Resource "${resourceName}"`);
+    throw new ServerlessError(
+      `No implementation found for Custom Resource "${resourceName}"`,
+      'MISSING_CUSTOM_RESOURCE_IMPLEMENTATION'
+    );
   }
   absoluteFunctionName = `${funcPrefix}-${functionName}`;
   if (absoluteFunctionName.length > 64) {
@@ -63,9 +73,6 @@ async function addCustomResourceToService(awsProvider, resourceName, iamRoleStat
       .digest('hex')}`;
   }
 
-  // TODO: check every once in a while if external packages are still necessary
-  serverless.cli.log('Installing dependencies for custom CloudFormation resources...');
-
   const zipFileBasename = await prepareCustomResourcePackage(zipFilePath);
   let S3Bucket = {
     Ref: awsProvider.naming.getDeploymentBucketLogicalId(),
@@ -165,7 +172,7 @@ async function addCustomResourceToService(awsProvider, resourceName, iamRoleStat
       FunctionName: absoluteFunctionName,
       Handler,
       MemorySize: 1024,
-      Runtime: 'nodejs12.x',
+      Runtime: 'nodejs14.x',
       Timeout: 180,
     },
     DependsOn: [],
diff --git a/lib/plugins/aws/customResources/resources/README.md b/lib/plugins/aws/custom-resources/resources/README.md
similarity index 100%
rename from lib/plugins/aws/customResources/resources/README.md
rename to lib/plugins/aws/custom-resources/resources/README.md
diff --git a/lib/plugins/aws/customResources/resources/apiGatewayCloudWatchRole/handler.js b/lib/plugins/aws/custom-resources/resources/api-gateway-cloud-watch-role/handler.js
similarity index 100%
rename from lib/plugins/aws/customResources/resources/apiGatewayCloudWatchRole/handler.js
rename to lib/plugins/aws/custom-resources/resources/api-gateway-cloud-watch-role/handler.js
diff --git a/lib/plugins/aws/customResources/resources/cognitoUserPool/handler.js b/lib/plugins/aws/custom-resources/resources/cognito-user-pool/handler.js
similarity index 98%
rename from lib/plugins/aws/customResources/resources/cognitoUserPool/handler.js
rename to lib/plugins/aws/custom-resources/resources/cognito-user-pool/handler.js
index 56d45ad7795..f2c390b0035 100644
--- a/lib/plugins/aws/customResources/resources/cognitoUserPool/handler.js
+++ b/lib/plugins/aws/custom-resources/resources/cognito-user-pool/handler.js
@@ -1,7 +1,7 @@
 'use strict';
 
 const { addPermission, removePermission } = require('./lib/permissions');
-const { updateConfiguration, removeConfiguration, findUserPoolByName } = require('./lib/userPool');
+const { updateConfiguration, removeConfiguration, findUserPoolByName } = require('./lib/user-pool');
 const { getEnvironment, getLambdaArn, handlerWrapper } = require('../utils');
 
 async function handler(event, context) {
diff --git a/lib/plugins/aws/customResources/resources/cognitoUserPool/lib/permissions.js b/lib/plugins/aws/custom-resources/resources/cognito-user-pool/lib/permissions.js
similarity index 100%
rename from lib/plugins/aws/customResources/resources/cognitoUserPool/lib/permissions.js
rename to lib/plugins/aws/custom-resources/resources/cognito-user-pool/lib/permissions.js
diff --git a/lib/plugins/aws/customResources/resources/cognitoUserPool/lib/userPool.js b/lib/plugins/aws/custom-resources/resources/cognito-user-pool/lib/user-pool.js
similarity index 100%
rename from lib/plugins/aws/customResources/resources/cognitoUserPool/lib/userPool.js
rename to lib/plugins/aws/custom-resources/resources/cognito-user-pool/lib/user-pool.js
diff --git a/lib/plugins/aws/customResources/resources/eventBridge/handler.js b/lib/plugins/aws/custom-resources/resources/event-bridge/handler.js
similarity index 97%
rename from lib/plugins/aws/customResources/resources/eventBridge/handler.js
rename to lib/plugins/aws/custom-resources/resources/event-bridge/handler.js
index 5c0ad4f85a5..d6002a31f46 100644
--- a/lib/plugins/aws/customResources/resources/eventBridge/handler.js
+++ b/lib/plugins/aws/custom-resources/resources/event-bridge/handler.js
@@ -8,7 +8,7 @@ const {
   updateTargetConfiguration,
   removeRuleConfiguration,
   removeTargetConfiguration,
-} = require('./lib/eventBridge');
+} = require('./lib/event-bridge');
 const { getEnvironment, getLambdaArn, handlerWrapper } = require('../utils');
 
 async function handler(event, context) {
@@ -49,6 +49,7 @@ async function create(event, context) {
         eventBus: EventBridgeConfig.EventBus,
         pattern: EventBridgeConfig.Pattern,
         schedule: EventBridgeConfig.Schedule,
+        state: EventBridgeConfig.State,
       })
     )
     .then(() =>
@@ -76,6 +77,7 @@ async function update(event, context) {
     eventBus: EventBridgeConfig.EventBus,
     pattern: EventBridgeConfig.Pattern,
     schedule: EventBridgeConfig.Schedule,
+    state: EventBridgeConfig.State,
   }).then(() =>
     updateTargetConfiguration({
       lambdaArn,
diff --git a/lib/plugins/aws/customResources/resources/eventBridge/lib/eventBridge.js b/lib/plugins/aws/custom-resources/resources/event-bridge/lib/event-bridge.js
similarity index 96%
rename from lib/plugins/aws/customResources/resources/eventBridge/lib/eventBridge.js
rename to lib/plugins/aws/custom-resources/resources/event-bridge/lib/event-bridge.js
index 4f0acd5c90b..a8879b246fe 100644
--- a/lib/plugins/aws/customResources/resources/eventBridge/lib/eventBridge.js
+++ b/lib/plugins/aws/custom-resources/resources/event-bridge/lib/event-bridge.js
@@ -33,7 +33,7 @@ async function deleteEventBus(config) {
 }
 
 async function updateRuleConfiguration(config) {
-  const { ruleName, eventBus, pattern, schedule, region } = config;
+  const { ruleName, eventBus, pattern, schedule, region, state } = config;
 
   const EventBusName = getEventBusName(eventBus);
 
@@ -42,7 +42,7 @@ async function updateRuleConfiguration(config) {
     EventBusName,
     EventPattern: JSON.stringify(pattern),
     ScheduleExpression: schedule,
-    State: 'ENABLED',
+    State: state,
   });
 }
 
diff --git a/lib/plugins/aws/customResources/resources/eventBridge/lib/permissions.js b/lib/plugins/aws/custom-resources/resources/event-bridge/lib/permissions.js
similarity index 100%
rename from lib/plugins/aws/customResources/resources/eventBridge/lib/permissions.js
rename to lib/plugins/aws/custom-resources/resources/event-bridge/lib/permissions.js
diff --git a/lib/plugins/aws/customResources/resources/eventBridge/lib/utils.js b/lib/plugins/aws/custom-resources/resources/event-bridge/lib/utils.js
similarity index 100%
rename from lib/plugins/aws/customResources/resources/eventBridge/lib/utils.js
rename to lib/plugins/aws/custom-resources/resources/event-bridge/lib/utils.js
diff --git a/lib/plugins/aws/customResources/resources/s3/handler.js b/lib/plugins/aws/custom-resources/resources/s3/handler.js
similarity index 100%
rename from lib/plugins/aws/customResources/resources/s3/handler.js
rename to lib/plugins/aws/custom-resources/resources/s3/handler.js
diff --git a/lib/plugins/aws/customResources/resources/s3/lib/bucket.js b/lib/plugins/aws/custom-resources/resources/s3/lib/bucket.js
similarity index 86%
rename from lib/plugins/aws/customResources/resources/s3/lib/bucket.js
rename to lib/plugins/aws/custom-resources/resources/s3/lib/bucket.js
index 8920eb186a8..41f84cd5789 100644
--- a/lib/plugins/aws/customResources/resources/s3/lib/bucket.js
+++ b/lib/plugins/aws/custom-resources/resources/s3/lib/bucket.js
@@ -48,9 +48,10 @@ async function updateConfiguration(config) {
 
   return getConfiguration(config).then((NotificationConfiguration) => {
     // remove configurations for this specific function
-    NotificationConfiguration.LambdaFunctionConfigurations = NotificationConfiguration.LambdaFunctionConfigurations.filter(
-      (conf) => !conf.Id.startsWith(functionName)
-    );
+    NotificationConfiguration.LambdaFunctionConfigurations =
+      NotificationConfiguration.LambdaFunctionConfigurations.filter(
+        (conf) => !conf.Id.startsWith(functionName)
+      );
 
     // add the events to the existing NotificationConfiguration
     bucketConfigs.forEach((bucketConfig) => {
@@ -84,9 +85,10 @@ async function removeConfiguration(config) {
 
   return getConfiguration(config).then((NotificationConfiguration) => {
     // remove configurations for this specific function
-    NotificationConfiguration.LambdaFunctionConfigurations = NotificationConfiguration.LambdaFunctionConfigurations.filter(
-      (conf) => !conf.Id.startsWith(functionName)
-    );
+    NotificationConfiguration.LambdaFunctionConfigurations =
+      NotificationConfiguration.LambdaFunctionConfigurations.filter(
+        (conf) => !conf.Id.startsWith(functionName)
+      );
 
     const payload = {
       Bucket,
diff --git a/lib/plugins/aws/customResources/resources/s3/lib/permissions.js b/lib/plugins/aws/custom-resources/resources/s3/lib/permissions.js
similarity index 100%
rename from lib/plugins/aws/customResources/resources/s3/lib/permissions.js
rename to lib/plugins/aws/custom-resources/resources/s3/lib/permissions.js
diff --git a/lib/plugins/aws/customResources/resources/utils.js b/lib/plugins/aws/custom-resources/resources/utils.js
similarity index 100%
rename from lib/plugins/aws/customResources/resources/utils.js
rename to lib/plugins/aws/custom-resources/resources/utils.js
diff --git a/lib/plugins/aws/deployFunction.js b/lib/plugins/aws/deploy-function.js
similarity index 67%
rename from lib/plugins/aws/deployFunction.js
rename to lib/plugins/aws/deploy-function.js
index 2a204d29f68..1822669b53a 100644
--- a/lib/plugins/aws/deployFunction.js
+++ b/lib/plugins/aws/deploy-function.js
@@ -6,8 +6,11 @@ const path = require('path');
 const fs = require('fs');
 const wait = require('timers-ext/promise/sleep');
 const validate = require('./lib/validate');
-const filesize = require('filesize');
+const filesize = require('../../utils/filesize');
 const ServerlessError = require('../../serverless-error');
+const { log, style, progress } = require('@serverless/utils/log');
+
+const mainProgress = progress.get('main');
 
 class AwsDeployFunction {
   constructor(serverless, options) {
@@ -19,40 +22,45 @@ class AwsDeployFunction {
       path.join(this.serverless.serviceDir || '.', '.serverless');
     this.provider = this.serverless.getProvider('aws');
 
+    this.shouldEnsureFunctionState = false;
+
     Object.assign(this, validate);
 
     this.hooks = {
+      'initialize': () => {
+        const commandName = this.serverless.processedInput.commands.join(' ');
+        if (commandName !== 'deploy function') return;
+        log.notice();
+        log.notice(
+          `Deploying function ${this.options.function} to stage ${this.serverless
+            .getProvider('aws')
+            .getStage()} ${style.aside(`(${this.serverless.getProvider('aws').getRegion()})`)}`
+        );
+        log.info();
+      },
+      'before:deploy:function:initialize': () =>
+        mainProgress.notice('Validating', { isMainEvent: true }),
       'deploy:function:initialize': async () => {
         await this.validate();
         await this.checkIfFunctionExists();
         this.checkIfFunctionChangesBetweenImageAndHandler();
-
-        if (_.get(this.serverless.service.serviceObject, 'awsKmsKeyArn')) {
-          this.serverless._logDeprecation(
-            'AWS_KMS_KEY_ARN',
-            'Starting with next major version, ' +
-              '"awsKmsKeyArn" service property will be replaced by "provider.kmsKeyArn"'
-          );
-        }
-        if (
-          Object.values(this.serverless.service.functions).some(({ awsKmsKeyArn }) => awsKmsKeyArn)
-        ) {
-          this.serverless._logDeprecation(
-            'AWS_KMS_KEY_ARN',
-            'Starting with next major version, ' +
-              '"awsKmsKeyArn" function property will be replaced by "kmsKeyArn"'
-          );
-        }
       },
 
+      'before:deploy:function:packageFunction': () =>
+        mainProgress.notice('Retrieving function info', { isMainEvent: true }),
       'deploy:function:packageFunction': async () =>
         this.serverless.pluginManager.spawn('package:function'),
 
+      'before:deploy:function:deploy': () =>
+        mainProgress.notice('Packaging', { isMainEvent: true }),
       'deploy:function:deploy': async () => {
         if (!this.options['update-config']) {
           await this.deployFunction();
         }
         await this.updateFunctionConfiguration();
+        if (this.shouldEnsureFunctionState) {
+          await this.ensureFunctionState();
+        }
         await this.serverless.pluginManager.spawn('aws:common:cleanupTempDir');
       },
     };
@@ -78,7 +86,7 @@ class AwsDeployFunction {
             ' After that you can redeploy your services functions with the',
             ' "serverless deploy function" command.',
           ].join('');
-          throw new ServerlessError(errorMessage);
+          throw new ServerlessError(errorMessage, 'FUNCTION_NOT_YET_DEPLOYED');
         }
         throw error;
       }
@@ -89,8 +97,8 @@ class AwsDeployFunction {
 
   checkIfFunctionChangesBetweenImageAndHandler() {
     const functionObject = this.serverless.service.getFunction(this.options.function);
-    const remoteFunctionPackageType = this.serverless.service.provider.remoteFunctionData
-      .Configuration.PackageType;
+    const remoteFunctionPackageType =
+      this.serverless.service.provider.remoteFunctionData.Configuration.PackageType;
 
     if (functionObject.handler && remoteFunctionPackageType === 'Image') {
       throw new ServerlessError(
@@ -116,11 +124,17 @@ class AwsDeployFunction {
       const roleResource = this.serverless.service.resources.Resources[role];
 
       if (roleResource.Type !== 'AWS::IAM::Role') {
-        throw new Error('Provided resource is not IAM Role.');
+        throw new ServerlessError(
+          'Provided resource is not IAM Role',
+          'ROLE_REFERENCES_NON_AWS_IAM_ROLE'
+        );
       }
       const roleProperties = roleResource.Properties;
       if (!roleProperties.RoleName) {
-        throw new ServerlessError('Role resource missing RoleName property');
+        throw new ServerlessError(
+          'Role resource missing RoleName property',
+          'MISSING_ROLENAME_FOR_ROLE'
+        );
       }
       const compiledFullRoleName = `${roleProperties.Path || '/'}${roleProperties.RoleName}`;
 
@@ -134,6 +148,37 @@ class AwsDeployFunction {
     return data.Arn;
   }
 
+  async ensureFunctionState() {
+    this.options.functionObj = this.serverless.service.getFunction(this.options.function);
+    const params = {
+      FunctionName: this.options.functionObj.name,
+    };
+    const startTime = Date.now();
+
+    const callWithRetry = async () => {
+      const result = await this.provider.request('Lambda', 'getFunction', params);
+      if (
+        result &&
+        result.Configuration.State === 'Active' &&
+        result.Configuration.LastUpdateStatus === 'Successful'
+      ) {
+        return;
+      }
+      const didOneMinutePass = Date.now() - startTime > 60 * 1000;
+      if (didOneMinutePass) {
+        throw new ServerlessError(
+          'Ensuring function state timed out. Please try to deploy your function once again.',
+          'DEPLOY_FUNCTION_ENSURE_STATE_TIMED_OUT'
+        );
+      }
+      log.info(`Retrying ensure function state for function: ${this.options.function}.`);
+      await wait(500);
+      await callWithRetry();
+    };
+
+    await callWithRetry();
+  }
+
   async callUpdateFunctionConfiguration(params) {
     const startTime = Date.now();
 
@@ -146,10 +191,11 @@ class AwsDeployFunction {
         if (err.providerError && err.providerError.code === 'ResourceConflictException') {
           if (didOneMinutePass) {
             throw new ServerlessError(
-              'Retry timed out. Please try to deploy your function once again.'
+              'Retry timed out. Please try to deploy your function once again.',
+              'DEPLOY_FUNCTION_CONFIGURATION_UPDATE_TIMED_OUT'
             );
           }
-          this.serverless.cli.log(
+          log.info(
             `Retrying configuration update for function: ${this.options.function}. Reason: ${err.message}`
           );
           await wait(1000);
@@ -160,24 +206,18 @@ class AwsDeployFunction {
       }
     };
     await callWithRetry();
-    this.serverless.cli.log(`Successfully updated function: ${this.options.function}`);
   }
 
   async updateFunctionConfiguration() {
     const functionObj = this.options.functionObj;
-    const serviceObj = this.serverless.service.serviceObject;
     const providerObj = this.serverless.service.provider;
-    const remoteFunctionConfiguration = this.serverless.service.provider.remoteFunctionData
-      .Configuration;
+    const remoteFunctionConfiguration =
+      this.serverless.service.provider.remoteFunctionData.Configuration;
     const params = {
       FunctionName: functionObj.name,
     };
 
-    const kmsKeyArn =
-      functionObj.kmsKeyArn ||
-      providerObj.kmsKeyArn ||
-      functionObj.awsKmsKeyArn ||
-      serviceObj.awsKmsKeyArn;
+    const kmsKeyArn = functionObj.kmsKeyArn || providerObj.kmsKeyArn;
 
     if (kmsKeyArn) {
       params.KMSKeyArn = kmsKeyArn;
@@ -258,7 +298,7 @@ class AwsDeployFunction {
           // taken from the bash man pages
           if (!key.match(/^[A-Za-z_][a-zA-Z0-9_]*$/)) {
             const errorMessage = 'Invalid characters in environment variable';
-            throw new ServerlessError(errorMessage);
+            throw new ServerlessError(errorMessage, 'DEPLOY_FUNCTION_INVALID_ENV_VARIABLE');
           }
 
           if (params.Environment.Variables[key] != null) {
@@ -280,31 +320,27 @@ class AwsDeployFunction {
       const vpc = functionObj.vpc || providerObj.vpc;
       params.VpcConfig = {};
 
-      if (
-        _.isObject(vpc.securityGroupIds['Fn::Split']) ||
-        (Array.isArray(vpc.securityGroupIds) && !vpc.securityGroupIds.some(_.isObject))
-      ) {
+      if (Array.isArray(vpc.securityGroupIds) && !vpc.securityGroupIds.some(_.isObject)) {
         params.VpcConfig.SecurityGroupIds = vpc.securityGroupIds;
       }
 
-      if (
-        _.isObject(vpc.subnetIds['Fn::Split']) ||
-        (Array.isArray(vpc.subnetIds) && !vpc.subnetIds.some(_.isObject))
-      ) {
+      if (Array.isArray(vpc.subnetIds) && !vpc.subnetIds.some(_.isObject)) {
         params.VpcConfig.SubnetIds = vpc.subnetIds;
       }
 
       const didVpcChange = () => {
         const remoteConfigToCompare = { SecurityGroupIds: [], SubnetIds: [] };
         if (remoteFunctionConfiguration.VpcConfig) {
-          remoteConfigToCompare.SecurityGroupIds =
-            remoteFunctionConfiguration.VpcConfig.SecurityGroupIds || [];
-          remoteConfigToCompare.SubnetIds = remoteFunctionConfiguration.VpcConfig.SubnetIds || [];
+          remoteConfigToCompare.SecurityGroupIds = new Set(
+            remoteFunctionConfiguration.VpcConfig.SecurityGroupIds || []
+          );
+          remoteConfigToCompare.SubnetIds = new Set(
+            remoteFunctionConfiguration.VpcConfig.SubnetIds || []
+          );
         }
         const localConfigToCompare = {
-          SecurityGroupIds: [],
-          SubnetIds: [],
-          ...params.VpcConfig,
+          SecurityGroupIds: new Set(params.VpcConfig.SecurityGroupIds || []),
+          SubnetIds: new Set(params.VpcConfig.SubnetIds || []),
         };
         return _.isEqual(remoteConfigToCompare, localConfigToCompare);
       };
@@ -348,13 +384,26 @@ class AwsDeployFunction {
     }
 
     if (!Object.keys(_.omit(params, 'FunctionName')).length) {
-      this.serverless.cli.log(
-        'Configuration did not change. Skipping function configuration update.'
+      if (this.options['update-config']) log.notice();
+      log.notice.skip(
+        `Configuration did not change. Configuration update skipped. ${style.aside(
+          `(${Math.floor(
+            (Date.now() - this.serverless.pluginManager.commandRunStartTime) / 1000
+          )}s)`
+        )}`
       );
       return;
     }
 
+    mainProgress.notice('Updating function configuration', { isMainEvent: true });
     await this.callUpdateFunctionConfiguration(params);
+    this.shouldEnsureFunctionState = true;
+    if (this.options['update-config']) log.notice();
+    log.notice.success(
+      `Function configuration updated ${style.aside(
+        `(${Math.floor((Date.now() - this.serverless.pluginManager.commandRunStartTime) / 1000)}s)`
+      )}\n`
+    );
   }
 
   async deployFunction() {
@@ -367,10 +416,17 @@ class AwsDeployFunction {
       const { functionImageUri, functionImageSha } = await this.provider.resolveImageUriAndSha(
         this.options.function
       );
-      const remoteImageSha = this.serverless.service.provider.remoteFunctionData.Configuration
-        .CodeSha256;
+      const remoteImageSha =
+        this.serverless.service.provider.remoteFunctionData.Configuration.CodeSha256;
       if (remoteImageSha === functionImageSha && !this.options.force) {
-        this.serverless.cli.log('Image did not change. Skipping function deployment.');
+        log.notice();
+        log.notice.skip(
+          `Image did not change. Function deployment skipped. ${style.aside(
+            `(${Math.floor(
+              (Date.now() - this.serverless.pluginManager.commandRunStartTime) / 1000
+            )}s)`
+          )}`
+        );
         return;
       }
       params.ImageUri = functionImageUri;
@@ -385,25 +441,39 @@ class AwsDeployFunction {
 
       const data = fs.readFileSync(artifactFilePath);
 
-      const remoteHash = this.serverless.service.provider.remoteFunctionData.Configuration
-        .CodeSha256;
+      const remoteHash =
+        this.serverless.service.provider.remoteFunctionData.Configuration.CodeSha256;
       const localHash = crypto.createHash('sha256').update(data).digest('base64');
 
       if (remoteHash === localHash && !this.options.force) {
-        this.serverless.cli.log('Code not changed. Skipping function deployment.');
+        log.notice();
+        log.notice.skip(
+          `Code did not change. Function deployment skipped. ${style.aside(
+            `(${Math.floor(
+              (Date.now() - this.serverless.pluginManager.commandRunStartTime) / 1000
+            )}s)`
+          )}`
+        );
         return;
       }
 
       params.ZipFile = data;
 
       const stats = fs.statSync(artifactFilePath);
-      this.serverless.cli.log(
-        `Uploading function: ${this.options.function} (${filesize(stats.size)})...`
-      );
+      mainProgress.notice(`Uploading ${style.aside(`(${filesize(stats.size)})`)}`, {
+        isMainEvent: true,
+      });
     }
 
+    mainProgress.notice('Deploying', { isMainEvent: true });
     await this.provider.request('Lambda', 'updateFunctionCode', params);
-    this.serverless.cli.log(`Successfully deployed function: ${this.options.function}`);
+    this.shouldEnsureFunctionState = true;
+    log.notice();
+    log.notice.success(
+      `Function code deployed ${style.aside(
+        `(${Math.floor((Date.now() - this.serverless.pluginManager.commandRunStartTime) / 1000)}s)`
+      )}`
+    );
   }
 }
 
diff --git a/lib/plugins/aws/deployList.js b/lib/plugins/aws/deploy-list.js
similarity index 73%
rename from lib/plugins/aws/deployList.js
rename to lib/plugins/aws/deploy-list.js
index 8c02da65559..3ac6899b691 100644
--- a/lib/plugins/aws/deployList.js
+++ b/lib/plugins/aws/deploy-list.js
@@ -1,8 +1,9 @@
 'use strict';
 
+const { log, writeText } = require('@serverless/utils/log');
 const validate = require('./lib/validate');
-const findAndGroupDeployments = require('./utils/findAndGroupDeployments');
-const setBucketName = require('./lib/setBucketName');
+const findAndGroupDeployments = require('./utils/find-and-group-deployments');
+const setBucketName = require('./lib/set-bucket-name');
 
 class AwsDeployList {
   constructor(serverless, options) {
@@ -38,20 +39,29 @@ class AwsDeployList {
     const deployments = findAndGroupDeployments(response, prefix, service, stage);
 
     if (deployments.length === 0) {
-      this.serverless.cli.log("Couldn't find any existing deployments.");
-      this.serverless.cli.log('Please verify that stage and region are correct.');
+      log.notice();
+      log.notice.skip(
+        "No deployments found, if that's unexpected ensure that stage and region are correct"
+      );
       return;
     }
 
-    this.serverless.cli.log('Listing deployments:');
     deployments.forEach((deployment) => {
-      this.serverless.cli.log('-------------');
       const match = deployment[0].directory.match(directoryRegex);
-      this.serverless.cli.log(`Timestamp: ${match[1]}`);
-      this.serverless.cli.log(`Datetime: ${match[2]}`);
-      this.serverless.cli.log('Files:');
+      const date = new Date(Date.parse(match[2]));
+      writeText(
+        `${date.getUTCFullYear()}-${String(date.getUTCMonth() + 1).padStart(2, 0)}-${String(
+          date.getUTCDate()
+        ).padStart(2, 0)} ` +
+          `${String(date.getUTCHours()).padStart(2, 0)}:${String(date.getUTCMinutes()).padStart(
+            2,
+            0
+          )}:${String(date.getUTCSeconds()).padStart(2, 0)} UTC`,
+        `Timestamp: ${match[1]}`,
+        'Files:'
+      );
       deployment.forEach((entry) => {
-        this.serverless.cli.log(`- ${entry.file}`);
+        writeText(`  - ${entry.file}`);
       });
     });
   }
@@ -106,23 +116,18 @@ class AwsDeployList {
   }
 
   displayFunctions(funcs) {
-    this.serverless.cli.log('Listing functions and their last 5 versions:');
-    this.serverless.cli.log('-------------');
-
     funcs.forEach((func) => {
-      let message = '';
-
       let name = func.Versions[0].FunctionName;
       name = name.replace(`${this.serverless.service.service}-`, '');
       name = name.replace(`${this.provider.getStage()}-`, '');
 
-      message += `${name}: `;
+      writeText(name);
+      const versionsLength = func.Versions.length;
       const versions = func.Versions.map((funcEntry) => funcEntry.Version).slice(
         Math.max(0, func.Versions.length - 5)
       );
-
-      message += versions.join(', ');
-      this.serverless.cli.log(message);
+      if (versionsLength < 6) writeText(`  All versions: ${versions.join(', ')}`);
+      else writeText(`  Last 5 versions: ${versions.join(', ')}`);
     });
   }
 }
diff --git a/lib/plugins/aws/deploy/index.js b/lib/plugins/aws/deploy/index.js
index e2cd8a8e4f6..d0b0eaf2f5e 100644
--- a/lib/plugins/aws/deploy/index.js
+++ b/lib/plugins/aws/deploy/index.js
@@ -1,17 +1,26 @@
 'use strict';
 
-const BbPromise = require('bluebird');
-const extendedValidate = require('./lib/extendedValidate');
-const setBucketName = require('../lib/setBucketName');
-const checkForChanges = require('./lib/checkForChanges');
-const monitorStack = require('../lib/monitorStack');
-const createStack = require('./lib/createStack');
-const cleanupS3Bucket = require('./lib/cleanupS3Bucket');
-const uploadArtifacts = require('./lib/uploadArtifacts');
-const validateTemplate = require('./lib/validateTemplate');
-const updateStack = require('../lib/updateStack');
-const existsDeploymentBucket = require('./lib/existsDeploymentBucket');
+const _ = require('lodash');
+const writeServiceOutputs = require('../../../cli/write-service-outputs');
+const extendedValidate = require('./lib/extended-validate');
+const setBucketName = require('../lib/set-bucket-name');
+const checkForChanges = require('./lib/check-for-changes');
+const monitorStack = require('../lib/monitor-stack');
+const checkIfBucketExists = require('../lib/check-if-bucket-exists');
+const getCreateChangeSetParams = require('../lib/get-create-change-set-params');
+const getExecuteChangeSetParams = require('../lib/get-execute-change-set-params');
+const waitForChangeSetCreation = require('../lib/wait-for-change-set-creation');
+const createStack = require('./lib/create-stack');
+const cleanupS3Bucket = require('./lib/cleanup-s3-bucket');
+const uploadArtifacts = require('./lib/upload-artifacts');
+const validateTemplate = require('./lib/validate-template');
+const updateStack = require('../lib/update-stack');
+const ensureValidBucketExists = require('./lib/ensure-valid-bucket-exists');
 const path = require('path');
+const { style, log, progress, writeText } = require('@serverless/utils/log');
+const memoize = require('memoizee');
+
+const mainProgress = progress.get('main');
 
 class AwsDeploy {
   constructor(serverless, options) {
@@ -31,13 +40,19 @@ class AwsDeploy {
       setBucketName,
       checkForChanges,
       cleanupS3Bucket,
+      ensureValidBucketExists,
       uploadArtifacts,
       validateTemplate,
       updateStack,
-      existsDeploymentBucket,
-      monitorStack
+      monitorStack,
+      checkIfBucketExists,
+      waitForChangeSetCreation,
+      getCreateChangeSetParams,
+      getExecuteChangeSetParams
     );
 
+    this.getFileStats = memoize(this.getFileStats.bind(this), { promise: true });
+
     // Define the internal lifecycle model
     this.commands = {
       aws: {
@@ -64,63 +79,85 @@ class AwsDeploy {
     };
 
     this.hooks = {
-      'before:deploy:deploy': async () =>
-        BbPromise.bind(this)
-          .then(() => this.serverless.pluginManager.spawn('aws:common:validate'))
-          .then(() => {
-            const bucketName = this.serverless.service.provider.deploymentBucket;
-            if (bucketName) {
-              return this.existsDeploymentBucket(bucketName);
-            }
+      'initialize': () => {
+        const isDeployCommand = this.serverless.processedInput.commands.join(' ') === 'deploy';
+        if (isDeployCommand && !this.options.function) {
+          const dashboardProviderName = _.get(
+            this.provider.cachedCredentials,
+            'dashboardProviderAlias'
+          );
+          log.notice();
+          log.notice(
+            `Deploying ${this.serverless.service.service} to stage ${this.serverless
+              .getProvider('aws')
+              .getStage()} ${style.aside(
+              `(${this.serverless.getProvider('aws').getRegion()}${
+                dashboardProviderName ? `, "${dashboardProviderName}" provider` : ''
+              })`
+            )}`
+          );
+          log.info(); // Ensure gap between verbose logging
 
-            return BbPromise.resolve();
-          })
-          .then(() => {
-            if (!this.options.package && !this.serverless.service.package.path) {
-              return this.extendedValidate();
+          // This is used to ensure that for `deploy` command, the `accountId` will be resolved and available
+          // for `generatePayload` telemetry logic
+          this.provider.getAccountId().then(
+            (accountId) => (this.provider.accountId = accountId),
+            () => {
+              /* pass on all errors */
             }
-            return BbPromise.bind(this)
-              .then(() => this.serverless.pluginManager.spawn('aws:common:moveArtifactsToTemp'))
-              .then(this.extendedValidate);
-          }),
+          );
+        }
+      },
+
+      'before:deploy:deploy': async () => {
+        await this.serverless.pluginManager.spawn('aws:common:validate');
+
+        if (!this.options.package && !this.serverless.service.package.path) {
+          return this.extendedValidate();
+        }
+        await this.serverless.pluginManager.spawn('aws:common:moveArtifactsToTemp');
+        return this.extendedValidate();
+      },
 
       // Deploy outer lifecycle
-      'deploy:deploy': async () =>
-        BbPromise.bind(this).then(() => {
-          return this.serverless.pluginManager.spawn('aws:deploy:deploy');
-        }),
+      'deploy:deploy': async () => this.serverless.pluginManager.spawn('aws:deploy:deploy'),
 
       'deploy:finalize': async () => this.serverless.pluginManager.spawn('aws:deploy:finalize'),
 
       // Deploy deploy inner lifecycle
-      'aws:deploy:deploy:createStack': async () => BbPromise.bind(this).then(this.createStack),
-
-      'aws:deploy:deploy:checkForChanges': async () =>
-        BbPromise.bind(this).then(this.setBucketName).then(this.checkForChanges),
-
-      'aws:deploy:deploy:uploadArtifacts': async () =>
-        BbPromise.bind(this).then(() => {
-          if (this.serverless.service.provider.shouldNotDeploy) {
-            return BbPromise.resolve();
-          }
-          return BbPromise.bind(this).then(this.uploadArtifacts);
-        }),
-
-      'aws:deploy:deploy:validateTemplate': async () =>
-        BbPromise.bind(this).then(() => {
-          if (this.serverless.service.provider.shouldNotDeploy) {
-            return BbPromise.resolve();
-          }
-          return BbPromise.bind(this).then(this.validateTemplate);
-        }),
-
-      'aws:deploy:deploy:updateStack': async () =>
-        BbPromise.bind(this).then(() => {
-          if (this.serverless.service.provider.shouldNotDeploy) {
-            return BbPromise.resolve();
-          }
-          return BbPromise.bind(this).then(this.updateStack);
-        }),
+      'before:aws:deploy:deploy:createStack': () =>
+        mainProgress.notice('Retrieving CloudFormation stack', { isMainEvent: true }),
+      'aws:deploy:deploy:createStack': async () => this.createStack(),
+
+      'aws:deploy:deploy:checkForChanges': async () => {
+        await this.ensureValidBucketExists();
+        await this.checkForChanges();
+      },
+
+      'before:aws:deploy:deploy:uploadArtifacts': () => {
+        if (this.serverless.service.provider.shouldNotDeploy) return;
+        mainProgress.notice('Uploading', { isMainEvent: true });
+      },
+      'aws:deploy:deploy:uploadArtifacts': async () => {
+        if (this.serverless.service.provider.shouldNotDeploy) return;
+        await this.uploadArtifacts();
+      },
+
+      'aws:deploy:deploy:validateTemplate': async () => {
+        if (this.serverless.service.provider.shouldNotDeploy) return;
+        await this.validateTemplate();
+      },
+
+      'before:aws:deploy:deploy:updateStack': () => {
+        if (this.serverless.service.provider.shouldNotDeploy) return;
+        mainProgress.notice('Updating CloudFormation stack', { isMainEvent: true });
+      },
+      'aws:deploy:deploy:updateStack': async () => {
+        if (this.serverless.service.provider.shouldNotDeploy) return;
+        await this.updateStack();
+      },
+
+      'after:deploy:deploy': () => mainProgress.notice('Updating'),
 
       // Deploy finalize inner lifecycle
       'aws:deploy:finalize:cleanup': async () => {
@@ -130,6 +167,71 @@ class AwsDeploy {
           await this.serverless.pluginManager.spawn('aws:common:cleanupTempDir');
         }
       },
+
+      'error': () => {
+        const isDeployCommand =
+          this.serverless.processedInput.commands.length === 1 &&
+          this.serverless.processedInput.commands[0] === 'deploy';
+        if (isDeployCommand && !this.options.function) {
+          log.error(); // In order to ensure extra new line before the error message
+          log.error(
+            `Stack ${serverless
+              .getProvider('aws')
+              .naming.getStackName()} failed to deploy ${style.aside(
+              `(${Math.floor(
+                (Date.now() - this.serverless.pluginManager.commandRunStartTime) / 1000
+              )}s)`
+            )}`
+          );
+        }
+      },
+
+      'finalize': () => {
+        if (this.serverless.processedInput.commands.join(' ') !== 'deploy') return;
+        if (this.options.function) return;
+        if (this.serverless.service.provider.shouldNotDeploy) {
+          log.notice();
+          log.notice.skip(
+            `No changes to deploy. Deployment skipped. ${style.aside(
+              `(${Math.floor(
+                (Date.now() - this.serverless.pluginManager.commandRunStartTime) / 1000
+              )}s)`
+            )}`
+          );
+          return;
+        }
+        if (this.serverless.service.provider.deploymentWithEmptyChangeSet) {
+          log.notice();
+          log.notice.skip(
+            `Change set did not include any changes to be deployed. ${style.aside(
+              `(${Math.floor(
+                (Date.now() - this.serverless.pluginManager.commandRunStartTime) / 1000
+              )}s)`
+            )}`
+          );
+          return;
+        }
+        log.notice();
+        log.notice.success(
+          `Service deployed to stack ${this.serverless
+            .getProvider('aws')
+            .naming.getStackName()} ${style.aside(
+            `(${Math.floor(
+              (Date.now() - this.serverless.pluginManager.commandRunStartTime) / 1000
+            )}s)`
+          )}`
+        );
+        writeText();
+        writeServiceOutputs(this.serverless.serviceOutputs);
+        writeServiceOutputs(this.serverless.servicePluginOutputs);
+
+        if (this.options['enforce-hash-update']) {
+          log.notice();
+          log.notice(
+            'Your service has been deployed with new hashing algorithm. Please remove "provider.lambdaHashingVersion" from your service configuration and re-deploy without "--enforce-hash-update" flag to restore function descriptions.'
+          );
+        }
+      },
     };
   }
 }
diff --git a/lib/plugins/aws/deploy/lib/checkForChanges.js b/lib/plugins/aws/deploy/lib/check-for-changes.js
similarity index 56%
rename from lib/plugins/aws/deploy/lib/checkForChanges.js
rename to lib/plugins/aws/deploy/lib/check-for-changes.js
index 4fd4ad11cc8..a3dc20b546c 100644
--- a/lib/plugins/aws/deploy/lib/checkForChanges.js
+++ b/lib/plugins/aws/deploy/lib/check-for-changes.js
@@ -6,8 +6,9 @@ const crypto = require('crypto');
 const globby = require('globby');
 const BbPromise = require('bluebird');
 const _ = require('lodash');
-const normalizeFiles = require('../../lib/normalizeFiles');
+const normalizeFiles = require('../../lib/normalize-files');
 const ServerlessError = require('../../../../serverless-error');
+const { log } = require('@serverless/utils/log');
 
 module.exports = {
   async checkForChanges() {
@@ -59,7 +60,8 @@ module.exports = {
               `The serverless deployment bucket "${params.Bucket}" does not exist.`,
               `Create it manually if you want to reuse the CloudFormation stack "${stackName}",`,
               'or delete the stack if it is no longer required.',
-            ].join(' ')
+            ].join(' '),
+            'DEPLOYMENT_BUCKET_DOES_NOT_EXIST'
           )
         );
       })
@@ -106,13 +108,8 @@ module.exports = {
 
     return BbPromise.all(getFunctionResults).then((results) => {
       if (couldNotAccessFunction) {
-        this.serverless.cli.log(
-          [
-            'WARNING: Not authorized to perform: lambda:GetFunction for at least one of the lambda functions.',
-            ' Deployment will not be skipped even if service files did not change. ',
-          ].join(''),
-          'Serverless',
-          { color: 'orange' }
+        log.warning(
+          'Not authorized to perform: lambda:GetFunction for at least one of the lambda functions. Deployment will not be skipped even if service files did not change.'
         );
       }
 
@@ -183,9 +180,6 @@ module.exports = {
 
         if (!changedAfterDeploy && _.isEqual(remoteHashes.sort(), localHashes.sort())) {
           this.serverless.service.provider.shouldNotDeploy = true;
-
-          const message = ['Service files not changed. Skipping deployment...'].join('');
-          this.serverless.cli.log(message, 'Serverless', { color: 'orange' });
         }
       });
     }
@@ -194,9 +188,9 @@ module.exports = {
   },
 
   /**
-   * @description Cloudwatch imposes a hard limit of 1 subscription filter per log group.
+   * @description Cloudwatch imposes a hard limit of 2 subscription filter per log group.
    * If we change a cloudwatchLog event entry to add a subscription filter to a log group
-   * that already had one before, it will throw an error because CloudFormation firstly
+   * that already had two before, it will throw an error because CloudFormation firstly
    * tries to create and replace the new subscription filter (therefore hitting the limit)
    * before deleting the old one. This precompile process aims to delete existent
    * subscription filters of functions that a new filter was provided, by checking the
@@ -206,54 +200,41 @@ module.exports = {
   async checkLogGroupSubscriptionFilterResourceLimitExceeded() {
     const region = this.provider.getRegion();
 
-    return this.provider.getAccountInfo().then((account) =>
-      Promise.all(
-        this.serverless.service.getAllFunctions().map((functionName) => {
-          const functionObj = this.serverless.service.getFunction(functionName);
-
-          if (!functionObj.events) {
-            return BbPromise.resolve();
-          }
-
-          let logSubscriptionSerialNumber = 0;
-          const promises = functionObj.events.map((event) => {
-            if (!event.cloudwatchLog) {
-              return BbPromise.resolve();
-            }
-
-            let logGroupName;
-
-            /*
-              it isn't necessary to run sanity checks here as they already happened during the
-              compile step
-            */
-            if (typeof event.cloudwatchLog === 'object') {
-              logGroupName = event.cloudwatchLog.logGroup.replace(/\r?\n/g, '');
-            } else {
-              logGroupName = event.cloudwatchLog.replace(/\r?\n/g, '');
-            }
-
-            const accountId = account.accountId;
-            const partition = account.partition;
+    const account = await this.provider.getAccountInfo();
+    const accountId = account.accountId;
+    const partition = account.partition;
+
+    const functionNames = await this.serverless.service.getAllFunctions();
+    const cloudwatchLogEvents = _.flatten(
+      functionNames.map((functionName) => {
+        const functionObj = this.serverless.service.getFunction(functionName);
+        const FunctionName = functionObj.name;
+        const events = functionObj.events;
+        let logSubscriptionSerialNumber = 0;
+        return events
+          .filter((event) => !!event.cloudwatchLog)
+          .map((event) => {
+            const rawLogGroupName = event.cloudwatchLog.logGroup || event.cloudwatchLog;
+            const logGroupName = rawLogGroupName.replace(/\r?\n/g, '');
 
             logSubscriptionSerialNumber++;
 
-            /*
-              return a new promise that will check the resource limit exceeded and will fix it if
-              the option is enabled
-            */
-            return this.fixLogGroupSubscriptionFilters({
-              accountId,
-              logGroupName,
-              functionName,
-              functionObj,
-              region,
-              partition,
-              logSubscriptionSerialNumber,
-            });
+            return { FunctionName, functionName, logGroupName, logSubscriptionSerialNumber };
           });
+      })
+    );
 
-          return Promise.all(promises);
+    const cloudwatchLogEventsMap = _.groupBy(cloudwatchLogEvents, 'logGroupName');
+    const logGroupNames = Object.keys(cloudwatchLogEventsMap);
+
+    return Promise.all(
+      logGroupNames.map((logGroupName) =>
+        this.fixLogGroupSubscriptionFilters({
+          accountId,
+          region,
+          partition,
+          logGroupName,
+          cloudwatchLogEvents: cloudwatchLogEventsMap[logGroupName],
         })
       )
     );
@@ -261,58 +242,93 @@ module.exports = {
 
   async fixLogGroupSubscriptionFilters(params) {
     const accountId = params.accountId;
-    const logGroupName = params.logGroupName;
-    const functionName = params.functionName;
-    const functionObj = params.functionObj;
     const region = params.region;
     const partition = params.partition;
-    const logSubscriptionSerialNumber = params.logSubscriptionSerialNumber;
-
-    return (
-      this.provider
-        .request(
-          'CloudWatchLogs',
-          'describeSubscriptionFilters',
-          { logGroupName },
-          { useCache: true }
-        )
-        .then((response) => {
-          const subscriptionFilter = response.subscriptionFilters[0];
+    const logGroupName = params.logGroupName;
+    const cloudwatchLogEvents = params.cloudwatchLogEvents;
+    const CLOUDWATCHLOG_LOG_GROUP_EVENT_PER_FUNCTION_LIMIT = 2;
+
+    const response = await this.provider
+      .request(
+        'CloudWatchLogs',
+        'describeSubscriptionFilters',
+        { logGroupName },
+        { useCache: true }
+      )
+      .catch(() => ({ subscriptionFilters: [] }));
+    if (response.subscriptionFilters.length === 0) {
+      return false;
+    }
 
-          // log group doesn't have any subscription filters currently
-          if (!subscriptionFilter) {
-            return false;
-          }
+    const stackName = this.provider.naming.getStackName();
+    const oldSubscriptionFilters = await Promise.all(
+      response.subscriptionFilters.map(async (subscriptionFilter) => {
+        const { destinationArn, filterName } = subscriptionFilter;
+        const logicalId = this.getLogicalIdFromFilterName(filterName);
+        const isInternal = await this.isInternalSubscriptionFilter(
+          stackName,
+          logicalId,
+          filterName
+        );
 
-          const filterName = subscriptionFilter.filterName;
+        return { destinationArn, logicalId, filterName, isInternal };
+      })
+    );
 
-          const oldDestinationArn = subscriptionFilter.destinationArn;
-          const newDestinationArn = `arn:${partition}:lambda:${region}:${accountId}:function:${functionObj.name}`;
-          const oldLogicalId = this.getLogicalIdFromFilterName(filterName);
-          const newLogicalId = this.provider.naming.getCloudWatchLogLogicalId(
-            functionName,
-            logSubscriptionSerialNumber
-          );
+    const newSubscriptionFilters = cloudwatchLogEvents.map((cloudwatchLogEvent) => {
+      const destinationArn = `arn:${partition}:lambda:${region}:${accountId}:function:${cloudwatchLogEvent.FunctionName}`;
+      const logicalId = this.provider.naming.getCloudWatchLogLogicalId(
+        cloudwatchLogEvent.functionName,
+        cloudwatchLogEvent.logSubscriptionSerialNumber
+      );
 
-          // everything is fine, just return
-          if (oldDestinationArn === newDestinationArn && oldLogicalId === newLogicalId) {
-            return false;
-          }
+      return { destinationArn, logicalId };
+    });
 
-          /*
-            If the destinations functions' ARNs doesn't match, we need to delete the current
-            subscription filter to prevent the resource limit exceeded error to happen
-          */
-          return this.provider.request('CloudWatchLogs', 'deleteSubscriptionFilter', {
-            logGroupName,
-            filterName,
-          });
+    // If subscription filters defined externally cause a situation where we cannot create all
+    // subscription filters defined as a part of current service, we want to throw an error
+    // instead of silently removing external filters.
+    const externalOldSubscriptionFilters = oldSubscriptionFilters.filter(
+      (oldSubscriptionFilter) => !oldSubscriptionFilter.isInternal
+    );
+    if (
+      externalOldSubscriptionFilters.length + newSubscriptionFilters.length >
+      CLOUDWATCHLOG_LOG_GROUP_EVENT_PER_FUNCTION_LIMIT
+    ) {
+      const errorMessage = [
+        `Only ${CLOUDWATCHLOG_LOG_GROUP_EVENT_PER_FUNCTION_LIMIT} subscription filters can be configured per log group.`,
+        ` There are subscription filters defined outside of the service definition for "${logGroupName}" that have to be deleted manually.`,
+      ].join('');
+      throw new ServerlessError(
+        errorMessage,
+        'CLOUDWATCHLOG_LOG_GROUP_EVENT_PER_FUNCTION_LIMIT_EXCEEDED'
+      );
+    }
+
+    const sameDestinationArn = (sf1, sf2) => sf1.destinationArn === sf2.destinationArn;
+    const sameLogicalId = (sf1, sf2) => sf1.logicalId === sf2.logicalId;
+    const subscriptionFilterComparator = (sf1, sf2) =>
+      sameDestinationArn(sf1, sf2) && sameLogicalId(sf1, sf2);
+
+    const internalOldSubscriptionFilters = oldSubscriptionFilters.filter(
+      (oldSubscriptionFilter) => oldSubscriptionFilter.isInternal
+    );
+    const notMatchedInternalOldSubscriptionFilters = internalOldSubscriptionFilters.filter(
+      (internalOldSubscriptionFilter) => {
+        const matchNewSubscriptionFilter = newSubscriptionFilters.find((newSubscriptionFilter) =>
+          subscriptionFilterComparator(newSubscriptionFilter, internalOldSubscriptionFilter)
+        );
+        return !matchNewSubscriptionFilter;
+      }
+    );
+
+    return Promise.all(
+      notMatchedInternalOldSubscriptionFilters.map((oldSubscriptionFilter) =>
+        this.provider.request('CloudWatchLogs', 'deleteSubscriptionFilter', {
+          logGroupName,
+          filterName: oldSubscriptionFilter.filterName,
         })
-        /*
-        it will throw when trying to get subscription filters of a log group that was just added
-        to the serverless.yml (therefore not created in AWS yet), we can safely ignore this error
-      */
-        .catch(() => undefined)
+      )
     );
   },
 
@@ -323,4 +339,21 @@ module.exports = {
     const split = filterName.split('-');
     return split[split.length - 2];
   },
+
+  async isInternalSubscriptionFilter(stackName, logicalResourceId, physicalResourceId) {
+    try {
+      const { StackResourceDetail } = await this.provider.request(
+        'CloudFormation',
+        'describeStackResource',
+        {
+          StackName: stackName,
+          LogicalResourceId: logicalResourceId,
+        }
+      );
+
+      return physicalResourceId === StackResourceDetail.PhysicalResourceId;
+    } catch {
+      return false;
+    }
+  },
 };
diff --git a/lib/plugins/aws/deploy/lib/cleanup-s3-bucket.js b/lib/plugins/aws/deploy/lib/cleanup-s3-bucket.js
new file mode 100644
index 00000000000..67a0e2dd869
--- /dev/null
+++ b/lib/plugins/aws/deploy/lib/cleanup-s3-bucket.js
@@ -0,0 +1,66 @@
+'use strict';
+
+const _ = require('lodash');
+const findAndGroupDeployments = require('../../utils/find-and-group-deployments');
+const getS3ObjectsFromStacks = require('../../utils/get-s3-objects-from-stacks');
+const { log } = require('@serverless/utils/log');
+
+module.exports = {
+  async getObjectsToRemove() {
+    const stacksToKeepCount = _.get(
+      this.serverless,
+      'service.provider.deploymentBucketObject.maxPreviousDeploymentArtifacts',
+      5
+    );
+
+    const service = this.serverless.service.service;
+    const stage = this.provider.getStage();
+    const prefix = this.provider.getDeploymentPrefix();
+
+    const response = await this.provider.request('S3', 'listObjectsV2', {
+      Bucket: this.bucketName,
+      Prefix: `${prefix}/${service}/${stage}`,
+    });
+    const stacks = findAndGroupDeployments(response, prefix, service, stage);
+    const stacksToRemove = stacks.slice(0, -stacksToKeepCount || Infinity);
+
+    return getS3ObjectsFromStacks(stacksToRemove, prefix, service, stage);
+  },
+
+  async removeObjects(objectsToRemove) {
+    if (!objectsToRemove || !objectsToRemove.length) return;
+    await this.provider.request('S3', 'deleteObjects', {
+      Bucket: this.bucketName,
+      Delete: { Objects: objectsToRemove },
+    });
+  },
+
+  async cleanupS3Bucket() {
+    if (this.serverless.service.provider.deploymentWithEmptyChangeSet) {
+      log.info('Removing unnecessary service artifacts from S3');
+      await this.cleanupArtifactsForEmptyChangeSet();
+    } else {
+      log.info('Removing old service artifacts from S3');
+      const objectsToRemove = await this.getObjectsToRemove();
+      await this.removeObjects(objectsToRemove);
+    }
+  },
+
+  async cleanupArtifactsForEmptyChangeSet() {
+    const response = await this.provider.request('S3', 'listObjectsV2', {
+      Bucket: this.bucketName,
+      Prefix: this.serverless.service.package.artifactDirectoryName,
+    });
+    const service = this.serverless.service.service;
+    const stage = this.provider.getStage();
+    const deploymentPrefix = this.provider.getDeploymentPrefix();
+
+    const objectsToRemove = getS3ObjectsFromStacks(
+      findAndGroupDeployments(response, deploymentPrefix, service, stage),
+      deploymentPrefix,
+      service,
+      stage
+    );
+    await this.removeObjects(objectsToRemove);
+  },
+};
diff --git a/lib/plugins/aws/deploy/lib/cleanupS3Bucket.js b/lib/plugins/aws/deploy/lib/cleanupS3Bucket.js
deleted file mode 100644
index 7716799c981..00000000000
--- a/lib/plugins/aws/deploy/lib/cleanupS3Bucket.js
+++ /dev/null
@@ -1,55 +0,0 @@
-'use strict';
-
-const BbPromise = require('bluebird');
-const _ = require('lodash');
-const findAndGroupDeployments = require('../../utils/findAndGroupDeployments');
-const getS3ObjectsFromStacks = require('../../utils/getS3ObjectsFromStacks');
-
-module.exports = {
-  async getObjectsToRemove() {
-    const stacksToKeepCount = _.get(
-      this.serverless,
-      'service.provider.deploymentBucketObject.maxPreviousDeploymentArtifacts',
-      5
-    );
-
-    const service = this.serverless.service.service;
-    const stage = this.provider.getStage();
-    const prefix = this.provider.getDeploymentPrefix();
-
-    return this.provider
-      .request('S3', 'listObjectsV2', {
-        Bucket: this.bucketName,
-        Prefix: `${prefix}/${service}/${stage}`,
-      })
-      .then((response) => {
-        const stacks = findAndGroupDeployments(response, prefix, service, stage);
-        const stacksToRemove = stacks.slice(0, -stacksToKeepCount || Infinity);
-
-        const objectsToRemove = getS3ObjectsFromStacks(stacksToRemove, prefix, service, stage);
-
-        if (objectsToRemove.length) {
-          return BbPromise.resolve(objectsToRemove);
-        }
-
-        return BbPromise.resolve([]);
-      });
-  },
-
-  async removeObjects(objectsToRemove) {
-    if (objectsToRemove && objectsToRemove.length) {
-      this.serverless.cli.log('Removing old service artifacts from S3...');
-
-      return this.provider.request('S3', 'deleteObjects', {
-        Bucket: this.bucketName,
-        Delete: { Objects: objectsToRemove },
-      });
-    }
-
-    return BbPromise.resolve();
-  },
-
-  async cleanupS3Bucket() {
-    return BbPromise.bind(this).then(this.getObjectsToRemove).then(this.removeObjects);
-  },
-};
diff --git a/lib/plugins/aws/deploy/lib/createStack.js b/lib/plugins/aws/deploy/lib/create-stack.js
similarity index 55%
rename from lib/plugins/aws/deploy/lib/createStack.js
rename to lib/plugins/aws/deploy/lib/create-stack.js
index d39e407813a..cea65f63bb3 100644
--- a/lib/plugins/aws/deploy/lib/createStack.js
+++ b/lib/plugins/aws/deploy/lib/create-stack.js
@@ -2,58 +2,46 @@
 
 const BbPromise = require('bluebird');
 const ServerlessError = require('../../../../serverless-error');
+const { progress, log } = require('@serverless/utils/log');
+const isChangeSetWithoutChanges = require('../../utils/is-change-set-without-changes');
 
 module.exports = {
   async create() {
     // Note: using three dots instead of ellipsis to support non uni-code consoles.
-    this.serverless.cli.log('Creating Stack...');
+    progress.get('main').notice('Creating CloudFormation stack', { isMainEvent: true });
     const stackName = this.provider.naming.getStackName();
+    const changeSetName = this.provider.naming.getStackChangeSetName();
+    const createChangeSetParams = this.getCreateChangeSetParams({
+      changeSetType: 'CREATE',
+      templateBody: this.serverless.service.provider.coreCloudFormationTemplate,
+    });
 
-    let stackTags = { STAGE: this.provider.getStage() };
+    const executeChangeSetParams = this.getExecuteChangeSetParams();
 
-    // Merge additional stack tags
-    if (this.serverless.service.provider.stackTags) {
-      const customKeys = Object.keys(this.serverless.service.provider.stackTags);
-      const collisions = Object.keys(stackTags).filter((defaultKey) =>
-        customKeys.some((key) => defaultKey.toLowerCase() === key.toLowerCase())
-      );
+    // Create new change set
+    log.info('Creating new change set');
+    await this.provider.request('CloudFormation', 'createChangeSet', createChangeSetParams);
 
-      // Delete collisions upfront
-      for (const key of collisions) {
-        delete stackTags[key];
-      }
+    // Wait for changeset to be created
+    log.info('Waiting for new change set to be created');
+    const changeSetDescription = await this.waitForChangeSetCreation(changeSetName, stackName);
 
-      stackTags = Object.assign(stackTags, this.serverless.service.provider.stackTags);
-    }
-
-    const params = {
-      StackName: stackName,
-      OnFailure: 'DELETE',
-      Capabilities: ['CAPABILITY_IAM', 'CAPABILITY_NAMED_IAM'],
-      Parameters: [],
-      TemplateBody: JSON.stringify(this.serverless.service.provider.coreCloudFormationTemplate),
-      Tags: Object.keys(stackTags).map((key) => ({ Key: key, Value: stackTags[key] })),
-    };
-
-    if (
-      this.serverless.service.provider.compiledCloudFormationTemplate &&
-      this.serverless.service.provider.compiledCloudFormationTemplate.Transform
-    ) {
-      params.Capabilities.push('CAPABILITY_AUTO_EXPAND');
-    }
-
-    const customDeploymentRole = this.provider.getCustomDeploymentRole();
-    if (customDeploymentRole) {
-      params.RoleARN = customDeploymentRole;
-    }
-
-    if (this.serverless.service.provider.notificationArns) {
-      params.NotificationARNs = this.serverless.service.provider.notificationArns;
+    // Check if stack has changes
+    if (isChangeSetWithoutChanges(changeSetDescription)) {
+      // Cleanup changeset when it does not include any changes
+      log.info('Created change set does not include any changes, removing it');
+      await this.provider.request('CloudFormation', 'deleteChangeSet', {
+        StackName: stackName,
+        ChangeSetName: changeSetName,
+      });
+      this.serverless.service.provider.deploymentWithEmptyChangeSet = true;
+      return;
     }
 
-    return this.provider
-      .request('CloudFormation', 'createStack', params)
-      .then((cfData) => this.monitorStack('create', cfData));
+    this.provider.didCreateService = true;
+    log.info('Executing created change set');
+    await this.provider.request('CloudFormation', 'executeChangeSet', executeChangeSetParams);
+    await this.monitorStack('create', changeSetDescription);
   },
 
   async createStack() {
@@ -85,7 +73,7 @@ module.exports = {
               );
 
               if (!isAlreadyAccelerated) {
-                this.serverless.cli.log('Not using S3 Transfer Acceleration (1st deploy)');
+                log.info('Not using S3 Transfer Acceleration (1st deploy)');
                 this.provider.disableTransferAccelerationForCurrentDeploy();
               }
             }
diff --git a/lib/plugins/aws/deploy/lib/ensure-valid-bucket-exists.js b/lib/plugins/aws/deploy/lib/ensure-valid-bucket-exists.js
new file mode 100644
index 00000000000..cc2372a21b4
--- /dev/null
+++ b/lib/plugins/aws/deploy/lib/ensure-valid-bucket-exists.js
@@ -0,0 +1,127 @@
+'use strict';
+
+const ServerlessError = require('../../../../serverless-error');
+const { log, progress } = require('@serverless/utils/log');
+
+const mainProgress = progress.get('main');
+
+module.exports = {
+  async ensureValidBucketExists() {
+    // Ensure to set bucket name if it can be resolved
+    // Result of this operation will determine how further validation will be performed
+    try {
+      await this.setBucketName();
+    } catch (err) {
+      // If there is a validation error with expected message, it means that logical resource for
+      // S3 bucket does not exist and we want to proceed with handling that situation
+      if (
+        err.providerError.code !== 'ValidationError' ||
+        !err.message.includes('does not exist for stack')
+      ) {
+        throw err;
+      }
+    }
+
+    // Validate that custom deployment bucket exists and has proper location
+    if (this.serverless.service.provider.deploymentBucket) {
+      let result;
+      try {
+        result = await this.provider.request('S3', 'getBucketLocation', {
+          Bucket: this.bucketName,
+        });
+      } catch (err) {
+        throw new ServerlessError(
+          `Could not locate deployment bucket. Error: ${err.message}`,
+          'DEPLOYMENT_BUCKET_NOT_FOUND'
+        );
+      }
+
+      if (result.LocationConstraint === '') result.LocationConstraint = 'us-east-1';
+      if (result.LocationConstraint === 'EU') result.LocationConstraint = 'eu-west-1';
+      if (result.LocationConstraint !== this.provider.getRegion()) {
+        throw new ServerlessError(
+          'Deployment bucket is not in the same region as the lambda function',
+          'DEPLOYMENT_BUCKET_INVALID_REGION'
+        );
+      }
+      // If above is satisfied, then custom S3 bucket is valid
+      return;
+    }
+
+    // If bucket name is set, it means it's defined as a part of CloudFormation template (custom bucket case was handled by logic above)
+    if (this.bucketName) {
+      if (!(await this.checkIfBucketExists(this.bucketName))) {
+        // It means that bucket was removed manually but is still a part of the CloudFormation stack, we cannot manually fix it
+        throw new ServerlessError(
+          'Deployment bucket has been removed manually. Please recreate it or remove your service and attempt to deploy it again',
+          'DEPLOYMENT_BUCKET_REMOVED_MANUALLY'
+        );
+      }
+      return;
+    }
+
+    log.info(
+      'Deployment bucket not found. Updating stack to include deployment bucket definition.'
+    );
+    const stackName = this.provider.naming.getStackName();
+    const changeSetName = this.provider.naming.getStackChangeSetName();
+
+    // This is situation where the bucket is not defined in the template at all
+    // It covers the case where someone was using custom deployment bucket
+    // but removed that setting from the configuration
+    mainProgress.notice('Ensuring that deployment bucket exists', { isMainEvent: true });
+    const getTemplateResult = await this.provider.request('CloudFormation', 'getTemplate', {
+      StackName: stackName,
+      TemplateStage: 'Original',
+    });
+
+    const templateBody = JSON.parse(getTemplateResult.TemplateBody);
+    if (!templateBody.Resources) {
+      templateBody.Resources = {};
+    }
+    if (!templateBody.Outputs) {
+      templateBody.Outputs = {};
+    }
+    Object.assign(
+      templateBody.Resources,
+      this.serverless.service.provider.coreCloudFormationTemplate.Resources
+    );
+    Object.assign(
+      templateBody.Outputs,
+      this.serverless.service.provider.coreCloudFormationTemplate.Outputs
+    );
+
+    const createChangeSetParams = this.getCreateChangeSetParams({
+      changeSetType: 'UPDATE',
+      templateBody,
+    });
+
+    const executeChangeSetParams = this.getExecuteChangeSetParams();
+
+    // Ensure that previous change set has been removed
+    await this.provider.request('CloudFormation', 'deleteChangeSet', {
+      StackName: stackName,
+      ChangeSetName: changeSetName,
+    });
+
+    log.info('Creating new change set.');
+    // Create new change set
+    const changeSet = await this.provider.request(
+      'CloudFormation',
+      'createChangeSet',
+      createChangeSetParams
+    );
+
+    // Wait for changeset to be created
+    log.info('Waiting for new change set to be created.');
+    await this.waitForChangeSetCreation(changeSetName, stackName);
+
+    // We are not checking if change set has any changes here because we already know that there was no deployment bucket
+    // that needs to be created as a part of change set
+    // If that would not be the case, that means we have a bug in the logic above
+
+    await this.provider.request('CloudFormation', 'executeChangeSet', executeChangeSetParams);
+    await this.monitorStack('update', changeSet);
+    await this.setBucketName();
+  },
+};
diff --git a/lib/plugins/aws/deploy/lib/existsDeploymentBucket.js b/lib/plugins/aws/deploy/lib/existsDeploymentBucket.js
deleted file mode 100644
index af3cd33bbe6..00000000000
--- a/lib/plugins/aws/deploy/lib/existsDeploymentBucket.js
+++ /dev/null
@@ -1,29 +0,0 @@
-'use strict';
-
-const BbPromise = require('bluebird');
-const ServerlessError = require('../../../../serverless-error');
-
-module.exports = {
-  async existsDeploymentBucket(bucketName) {
-    return BbPromise.resolve()
-      .then(() =>
-        this.provider.request('S3', 'getBucketLocation', {
-          Bucket: bucketName,
-        })
-      )
-      .then((resultParam) => {
-        const result = resultParam;
-        if (result.LocationConstraint === '') result.LocationConstraint = 'us-east-1';
-        if (result.LocationConstraint === 'EU') result.LocationConstraint = 'eu-west-1';
-        if (result.LocationConstraint !== this.provider.getRegion()) {
-          throw new ServerlessError(
-            'Deployment bucket is not in the same region as the lambda function'
-          );
-        }
-        return BbPromise.resolve();
-      })
-      .catch((err) => {
-        throw new ServerlessError(`Could not locate deployment bucket. Error: ${err.message}`);
-      });
-  },
-};
diff --git a/lib/plugins/aws/deploy/lib/extendedValidate.js b/lib/plugins/aws/deploy/lib/extended-validate.js
similarity index 86%
rename from lib/plugins/aws/deploy/lib/extendedValidate.js
rename to lib/plugins/aws/deploy/lib/extended-validate.js
index d4b2ffc8661..0cd56854418 100644
--- a/lib/plugins/aws/deploy/lib/extendedValidate.js
+++ b/lib/plugins/aws/deploy/lib/extended-validate.js
@@ -2,8 +2,9 @@
 
 const path = require('path');
 const _ = require('lodash');
-const findReferences = require('../../utils/findReferences');
+const findReferences = require('../../utils/find-references');
 const ServerlessError = require('../../../../serverless-error');
+const { log } = require('@serverless/utils/log');
 
 module.exports = {
   extendedValidate() {
@@ -16,7 +17,8 @@ module.exports = {
     );
     if (!this.serverless.utils.fileExistsSync(serviceStateFilePath)) {
       throw new ServerlessError(
-        `No ${serviceStateFileName} file found in the package path you provided.`
+        `No ${serviceStateFileName} file found in the package path you provided.`,
+        'MISSING_SERVICE_STATE_FILE'
       );
     }
     const state = this.serverless.utils.readFileSync(serviceStateFilePath);
@@ -44,13 +46,13 @@ module.exports = {
         if (functionObject.timeout > 30 && functionObject.events) {
           functionObject.events.forEach((event) => {
             if (Object.keys(event)[0] === 'http' && !event.http.async) {
-              const warnMessage = [
-                `WARNING: Function ${functionName} has timeout of ${functionObject.timeout} `,
-                "seconds, however, it's attached to API Gateway so it's automatically ",
-                'limited to 30 seconds.',
-              ].join('');
-
-              this.serverless.cli.log(warnMessage);
+              log.warning(
+                [
+                  `Function ${functionName} has timeout of ${functionObject.timeout} `,
+                  "seconds, however, it's attached to API Gateway so it's automatically ",
+                  'limited to 30 seconds.',
+                ].join('')
+              );
             }
           });
         }
@@ -86,7 +88,8 @@ module.exports = {
 
         if (!this.serverless.utils.fileExistsSync(artifactFilePath)) {
           throw new ServerlessError(
-            `No ${artifactFileName} file found in the package path you provided.`
+            `No ${artifactFileName} file found in the package path you provided.`,
+            'MISSING_ARTIFACT_FILE'
           );
         }
       });
diff --git a/lib/plugins/aws/deploy/lib/upload-artifacts.js b/lib/plugins/aws/deploy/lib/upload-artifacts.js
new file mode 100644
index 00000000000..fa91e962169
--- /dev/null
+++ b/lib/plugins/aws/deploy/lib/upload-artifacts.js
@@ -0,0 +1,234 @@
+'use strict';
+
+const _ = require('lodash');
+const fs = require('fs');
+const fsp = require('fs').promises;
+const path = require('path');
+const crypto = require('crypto');
+const limit = require('ext/promise/limit').bind(Promise);
+const filesize = require('filesize');
+const normalizeFiles = require('../../lib/normalize-files');
+const getLambdaLayerArtifactPath = require('../../utils/get-lambda-layer-artifact-path');
+const ServerlessError = require('../../../../serverless-error');
+const { progress, log } = require('@serverless/utils/log');
+
+const MAX_CONCURRENT_ARTIFACTS_UPLOADS =
+  Number(process.env.SLS_MAX_CONCURRENT_ARTIFACTS_UPLOADS) || 3;
+
+module.exports = {
+  async getFileStats(filepath) {
+    try {
+      return await fsp.stat(filepath);
+    } catch (error) {
+      throw new ServerlessError(
+        `Cannot read file artifact "${filepath}": ${error.message}`,
+        'INACCESSIBLE_FILE_ARTIFACT'
+      );
+    }
+  },
+
+  async uploadArtifacts() {
+    const artifactFilePaths = [
+      ...(await this.getFunctionArtifactFilePaths()),
+      ...this.getLayerArtifactFilePaths(),
+    ];
+    if (artifactFilePaths.length === 1) {
+      const stats = await this.getFileStats(artifactFilePaths[0]);
+      progress.get('main').notice(`Uploading (${filesize(stats.size)})`);
+    } else {
+      progress.get('main').notice(`Uploading (0/${artifactFilePaths.length})`);
+    }
+
+    await this.uploadCloudFormationFile();
+    await this.uploadFunctionsAndLayers();
+    await this.uploadCustomResources();
+  },
+
+  async uploadCloudFormationFile() {
+    log.info('Uploading CloudFormation file to S3');
+
+    const compiledTemplateFileName = this.provider.naming.getCompiledTemplateS3Suffix();
+
+    const compiledCfTemplate = this.serverless.service.provider.compiledCloudFormationTemplate;
+    const normCfTemplate = normalizeFiles.normalizeCloudFormationTemplate(compiledCfTemplate);
+    const fileHash = crypto
+      .createHash('sha256')
+      .update(JSON.stringify(normCfTemplate))
+      .digest('base64');
+
+    let params = {
+      Bucket: this.bucketName,
+      Key: `${this.serverless.service.package.artifactDirectoryName}/${compiledTemplateFileName}`,
+      Body: JSON.stringify(compiledCfTemplate),
+      ContentType: 'application/json',
+      Metadata: {
+        filesha256: fileHash,
+      },
+    };
+
+    const deploymentBucketObject = this.serverless.service.provider.deploymentBucketObject;
+    if (deploymentBucketObject) {
+      params = setServersideEncryptionOptions(params, deploymentBucketObject);
+    }
+
+    return this.provider.request('S3', 'upload', params);
+  },
+
+  async uploadZipFile(artifactFilePath) {
+    const fileName = artifactFilePath.split(path.sep).pop();
+
+    // TODO refactor to be async (use util function to compute checksum async)
+    const data = fs.readFileSync(artifactFilePath);
+    const fileHash = crypto.createHash('sha256').update(data).digest('base64');
+
+    const artifactStream = fs.createReadStream(artifactFilePath);
+    // As AWS SDK request might be postponed (requests are queued)
+    // eventual stream error may crash the process (it's thrown as uncaught if not observed).
+    // Below lines prevent that
+    let streamError;
+    artifactStream.on('error', (error) => (streamError = error));
+
+    let params = {
+      Bucket: this.bucketName,
+      Key: `${this.serverless.service.package.artifactDirectoryName}/${fileName}`,
+      Body: artifactStream,
+      ContentType: 'application/zip',
+      Metadata: {
+        filesha256: fileHash,
+      },
+    };
+
+    const deploymentBucketObject = this.serverless.service.provider.deploymentBucketObject;
+    if (deploymentBucketObject) {
+      params = setServersideEncryptionOptions(params, deploymentBucketObject);
+    }
+
+    const response = await this.provider.request('S3', 'upload', params);
+    // Interestingly, if request handling was queued, and stream errored (before being consumed by
+    // AWS SDK) then SDK call succeeds without actually uploading a file to S3 bucket.
+    // Below line ensures that eventual stream error is communicated
+    if (streamError) throw streamError;
+    return response;
+  },
+
+  async getFunctionArtifactFilePaths() {
+    const functionNames = this.serverless.service.getAllFunctions();
+    return _.uniq(
+      (
+        await Promise.all(
+          functionNames.map(async (name) => {
+            const functionObject = this.serverless.service.getFunction(name);
+            if (functionObject.image) return null;
+            const functionArtifactFileName = this.provider.naming.getFunctionArtifactName(name);
+            functionObject.package = functionObject.package || {};
+            let artifactFilePath =
+              functionObject.package.artifact || this.serverless.service.package.artifact;
+
+            if (
+              !artifactFilePath ||
+              (this.serverless.service.artifact && !functionObject.package.artifact)
+            ) {
+              if (
+                this.serverless.service.package.individually ||
+                functionObject.package.individually
+              ) {
+                const artifactFileName = functionArtifactFileName;
+                artifactFilePath = path.join(this.packagePath, artifactFileName);
+              } else {
+                artifactFilePath = path.join(
+                  this.packagePath,
+                  this.provider.naming.getServiceArtifactName()
+                );
+              }
+            }
+            functionObject.artifactSize = (await this.getFileStats(artifactFilePath)).size;
+            return artifactFilePath;
+          })
+        )
+      ).filter(Boolean)
+    );
+  },
+
+  getLayerArtifactFilePaths() {
+    const layerNames = this.serverless.service.getAllLayers();
+    return layerNames
+      .map((name) => {
+        const layerObject = this.serverless.service.getLayer(name);
+        if (layerObject.artifactAlreadyUploaded) {
+          log.info(`Skipped uploading ${name}`);
+          return null;
+        }
+        return getLambdaLayerArtifactPath(
+          this.packagePath,
+          name,
+          this.provider.serverless.service,
+          this.provider.naming
+        );
+      })
+      .filter(Boolean);
+  },
+
+  async uploadFunctionsAndLayers() {
+    const artifactFilePaths = [
+      ...(await this.getFunctionArtifactFilePaths()),
+      ...this.getLayerArtifactFilePaths(),
+    ];
+
+    const shouldReportDetailedProgress = artifactFilePaths.length > 1;
+    let alreadyUploadedCount = 0;
+
+    const limitedUpload = limit(MAX_CONCURRENT_ARTIFACTS_UPLOADS, async (artifactFilePath) => {
+      const stats = await this.getFileStats(artifactFilePath);
+      const fileName = path.basename(artifactFilePath);
+      log.info(`Uploading service ${fileName} file to S3 (${filesize(stats.size)})`);
+      if (shouldReportDetailedProgress) {
+        progress
+          .get(`upload:${fileName}`)
+          .notice(`Uploading service ${fileName} file to S3 (${filesize(stats.size)})`);
+      }
+      const result = await this.uploadZipFile(artifactFilePath);
+      alreadyUploadedCount += 1;
+      if (shouldReportDetailedProgress) {
+        progress
+          .get('main')
+          .notice(`Uploading (${alreadyUploadedCount}/${artifactFilePaths.length})`);
+        progress.get(`upload:${fileName}`).remove();
+      }
+      return result;
+    });
+    await Promise.all(artifactFilePaths.map((file) => limitedUpload(file)));
+  },
+
+  async uploadCustomResources() {
+    const artifactFilePath = path.join(
+      this.serverless.serviceDir,
+      '.serverless',
+      this.provider.naming.getCustomResourcesArtifactName()
+    );
+
+    if (this.serverless.utils.fileExistsSync(artifactFilePath)) {
+      log.info('Uploading custom CloudFormation resources');
+      await this.uploadZipFile(artifactFilePath);
+    }
+  },
+};
+
+function setServersideEncryptionOptions(putParams, deploymentBucketOptions) {
+  const encryptionFields = [
+    ['serverSideEncryption', 'ServerSideEncryption'],
+    ['sseCustomerAlgorithim', 'SSECustomerAlgorithm'],
+    ['sseCustomerKey', 'SSECustomerKey'],
+    ['sseCustomerKeyMD5', 'SSECustomerKeyMD5'],
+    ['sseKMSKeyId', 'SSEKMSKeyId'],
+  ];
+
+  const params = putParams;
+
+  encryptionFields.forEach((element) => {
+    if (deploymentBucketOptions[element[0]]) {
+      params[element[1]] = deploymentBucketOptions[element[0]];
+    }
+  }, this);
+
+  return params;
+}
diff --git a/lib/plugins/aws/deploy/lib/uploadArtifacts.js b/lib/plugins/aws/deploy/lib/uploadArtifacts.js
deleted file mode 100644
index 5c9443b120a..00000000000
--- a/lib/plugins/aws/deploy/lib/uploadArtifacts.js
+++ /dev/null
@@ -1,190 +0,0 @@
-'use strict';
-
-const _ = require('lodash');
-const fs = require('fs');
-const path = require('path');
-const crypto = require('crypto');
-const BbPromise = require('bluebird');
-const filesize = require('filesize');
-const normalizeFiles = require('../../lib/normalizeFiles');
-const getLambdaLayerArtifactPath = require('../../utils/getLambdaLayerArtifactPath');
-
-const MAX_CONCURRENT_ARTIFACTS_UPLOADS =
-  Number(process.env.SLS_MAX_CONCURRENT_ARTIFACTS_UPLOADS) || 3;
-
-module.exports = {
-  async uploadArtifacts() {
-    return BbPromise.bind(this)
-      .then(this.uploadCloudFormationFile)
-      .then(this.uploadFunctionsAndLayers)
-      .then(this.uploadCustomResources);
-  },
-
-  async uploadCloudFormationFile() {
-    this.serverless.cli.log('Uploading CloudFormation file to S3...');
-
-    const compiledTemplateFileName = this.provider.naming.getCompiledTemplateS3Suffix();
-
-    const compiledCfTemplate = this.serverless.service.provider.compiledCloudFormationTemplate;
-    const normCfTemplate = normalizeFiles.normalizeCloudFormationTemplate(compiledCfTemplate);
-    const fileHash = crypto
-      .createHash('sha256')
-      .update(JSON.stringify(normCfTemplate))
-      .digest('base64');
-
-    let params = {
-      Bucket: this.bucketName,
-      Key: `${this.serverless.service.package.artifactDirectoryName}/${compiledTemplateFileName}`,
-      Body: JSON.stringify(compiledCfTemplate),
-      ContentType: 'application/json',
-      Metadata: {
-        filesha256: fileHash,
-      },
-    };
-
-    const deploymentBucketObject = this.serverless.service.provider.deploymentBucketObject;
-    if (deploymentBucketObject) {
-      params = setServersideEncryptionOptions(params, deploymentBucketObject);
-    }
-
-    return this.provider.request('S3', 'upload', params);
-  },
-
-  async uploadZipFile(artifactFilePath) {
-    const fileName = artifactFilePath.split(path.sep).pop();
-
-    // TODO refactor to be async (use util function to compute checksum async)
-    const data = fs.readFileSync(artifactFilePath);
-    const fileHash = crypto.createHash('sha256').update(data).digest('base64');
-
-    const artifactStream = fs.createReadStream(artifactFilePath);
-    // As AWS SDK request might be postponed (requests are queued)
-    // eventual stream error may crash the process (it's thrown as uncaught if not observed).
-    // Below lines prevent that
-    let streamError;
-    artifactStream.on('error', (error) => (streamError = error));
-
-    let params = {
-      Bucket: this.bucketName,
-      Key: `${this.serverless.service.package.artifactDirectoryName}/${fileName}`,
-      Body: artifactStream,
-      ContentType: 'application/zip',
-      Metadata: {
-        filesha256: fileHash,
-      },
-    };
-
-    const deploymentBucketObject = this.serverless.service.provider.deploymentBucketObject;
-    if (deploymentBucketObject) {
-      params = setServersideEncryptionOptions(params, deploymentBucketObject);
-    }
-
-    const response = await this.provider.request('S3', 'upload', params);
-    // Interestingly, if request handling was queued, and stream errored (before being consumed by
-    // AWS SDK) then SDK call succeeds without actually uploading a file to S3 bucket.
-    // Below line ensures that eventual stream error is communicated
-    if (streamError) throw streamError;
-    return response;
-  },
-
-  async uploadFunctionsAndLayers() {
-    this.serverless.cli.log('Uploading artifacts...');
-
-    const functionNames = this.serverless.service.getAllFunctions();
-    let artifactFilePaths = _.uniq(
-      functionNames
-        .map((name) => {
-          const functionObject = this.serverless.service.getFunction(name);
-          if (functionObject.image) return null;
-          const functionArtifactFileName = this.provider.naming.getFunctionArtifactName(name);
-          functionObject.package = functionObject.package || {};
-          const artifactFilePath =
-            functionObject.package.artifact || this.serverless.service.package.artifact;
-
-          if (
-            !artifactFilePath ||
-            (this.serverless.service.artifact && !functionObject.package.artifact)
-          ) {
-            if (
-              this.serverless.service.package.individually ||
-              functionObject.package.individually
-            ) {
-              const artifactFileName = functionArtifactFileName;
-              return path.join(this.packagePath, artifactFileName);
-            }
-            return path.join(this.packagePath, this.provider.naming.getServiceArtifactName());
-          }
-
-          return artifactFilePath;
-        })
-        .filter(Boolean)
-    );
-
-    const layerNames = this.serverless.service.getAllLayers();
-    artifactFilePaths = artifactFilePaths.concat(
-      layerNames
-        .map((name) => {
-          const layerObject = this.serverless.service.getLayer(name);
-          if (layerObject.artifactAlreadyUploaded) {
-            this.serverless.cli.log(`Skip uploading ${name}`);
-            return null;
-          }
-          return getLambdaLayerArtifactPath(
-            this.packagePath,
-            name,
-            this.provider.serverless.service,
-            this.provider.naming
-          );
-        })
-        .filter(Boolean)
-    );
-
-    return BbPromise.map(
-      artifactFilePaths,
-      (artifactFilePath) => {
-        const stats = fs.statSync(artifactFilePath);
-        const fileName = path.basename(artifactFilePath);
-        this.serverless.cli.log(
-          `Uploading service ${fileName} file to S3 (${filesize(stats.size)})...`
-        );
-        return this.uploadZipFile(artifactFilePath);
-      },
-      { concurrency: MAX_CONCURRENT_ARTIFACTS_UPLOADS }
-    );
-  },
-
-  async uploadCustomResources() {
-    const artifactFilePath = path.join(
-      this.serverless.serviceDir,
-      '.serverless',
-      this.provider.naming.getCustomResourcesArtifactName()
-    );
-
-    if (this.serverless.utils.fileExistsSync(artifactFilePath)) {
-      this.serverless.cli.log('Uploading custom CloudFormation resources...');
-      return this.uploadZipFile(artifactFilePath);
-    }
-
-    return BbPromise.resolve();
-  },
-};
-
-function setServersideEncryptionOptions(putParams, deploymentBucketOptions) {
-  const encryptionFields = [
-    ['serverSideEncryption', 'ServerSideEncryption'],
-    ['sseCustomerAlgorithim', 'SSECustomerAlgorithm'],
-    ['sseCustomerKey', 'SSECustomerKey'],
-    ['sseCustomerKeyMD5', 'SSECustomerKeyMD5'],
-    ['sseKMSKeyId', 'SSEKMSKeyId'],
-  ];
-
-  const params = putParams;
-
-  encryptionFields.forEach((element) => {
-    if (deploymentBucketOptions[element[0]]) {
-      params[element[1]] = deploymentBucketOptions[element[0]];
-    }
-  }, this);
-
-  return params;
-}
diff --git a/lib/plugins/aws/deploy/lib/validateTemplate.js b/lib/plugins/aws/deploy/lib/validate-template.js
similarity index 65%
rename from lib/plugins/aws/deploy/lib/validateTemplate.js
rename to lib/plugins/aws/deploy/lib/validate-template.js
index 2bb32204c02..405f4a9c49c 100644
--- a/lib/plugins/aws/deploy/lib/validateTemplate.js
+++ b/lib/plugins/aws/deploy/lib/validate-template.js
@@ -1,14 +1,14 @@
 'use strict';
-const getCompiledTemplateS3Suffix = require('../../lib/naming').getCompiledTemplateS3Suffix;
-const getS3EndpointForRegion = require('../../utils/getS3EndpointForRegion');
+
+const getS3EndpointForRegion = require('../../utils/get-s3-endpoint-for-region');
+const ServerlessError = require('../../../../serverless-error');
 
 module.exports = {
   async validateTemplate() {
     const bucketName = this.bucketName;
     const artifactDirectoryName = this.serverless.service.package.artifactDirectoryName;
-    const compiledTemplateFileName = getCompiledTemplateS3Suffix();
+    const compiledTemplateFileName = this.provider.naming.getCompiledTemplateS3Suffix();
     const s3Endpoint = getS3EndpointForRegion(this.provider.getRegion());
-    this.serverless.cli.log('Validating template...');
     const params = {
       TemplateURL: `https://${s3Endpoint}/${bucketName}/${artifactDirectoryName}/${compiledTemplateFileName}`,
     };
@@ -17,7 +17,7 @@ module.exports = {
       const errorMessage = ['The CloudFormation template is invalid:', ` ${error.message}`].join(
         ''
       );
-      throw new Error(errorMessage);
+      throw new ServerlessError(errorMessage, 'INVALID_AWS_CLOUDFORMATION_TEMPLATE');
     });
   },
 };
diff --git a/lib/plugins/aws/info/display.js b/lib/plugins/aws/info/display.js
index 6c08a61121b..6d1f84b3905 100644
--- a/lib/plugins/aws/info/display.js
+++ b/lib/plugins/aws/info/display.js
@@ -1,55 +1,39 @@
 'use strict';
 
-const chalk = require('chalk');
+const filesize = require('../../../utils/filesize');
+const { isVerboseMode, style } = require('@serverless/utils/log');
 
 module.exports = {
   displayServiceInfo() {
-    const info = this.gatheredData.info;
-
-    let message = '';
-    message += `${chalk.yellow.underline('Service Information')}\n`;
-    message += `${chalk.yellow('service:')} ${info.service}\n`;
-    message += `${chalk.yellow('stage:')} ${info.stage}\n`;
-    message += `${chalk.yellow('region:')} ${info.region}\n`;
-    message += `${chalk.yellow('stack:')} ${info.stack}\n`;
-    message += `${chalk.yellow('resources:')} ${info.resourceCount}`;
-
-    if (info.resourceCount >= 450) {
-      message += `\n${chalk.red('WARNING:')}\n`;
-      message += `  You have ${info.resourceCount} resources in your service.\n`;
-      message += '  CloudFormation has a hard limit of 500 resources in a service.\n';
-      message += '  For advice on avoiding this limit, check out this link: http://bit.ly/2IiYB38.';
+    if (this.serverless.processedInput.commands.join(' ') === 'info') {
+      this.serverless.serviceOutputs.set('service', this.serverless.service.service);
+      this.serverless.serviceOutputs.set('stage', this.provider.getStage());
+      this.serverless.serviceOutputs.set('region', this.provider.getRegion());
+      this.serverless.serviceOutputs.set('stack', this.provider.naming.getStackName());
     }
-
-    this.serverless.cli.consoleLog(message);
-    return message;
   },
 
   displayApiKeys() {
     const conceal = this.options.conceal;
     const info = this.gatheredData.info;
-    let apiKeysMessage = `${chalk.yellow('api keys:')}`;
 
     if (info.apiKeys && info.apiKeys.length > 0) {
+      const outputSectionItems = [];
       info.apiKeys.forEach((apiKeyInfo) => {
         const description = apiKeyInfo.description ? ` - ${apiKeyInfo.description}` : '';
         if (conceal) {
-          apiKeysMessage += `\n  ${apiKeyInfo.name}${description}`;
+          outputSectionItems.push(`${apiKeyInfo.name}${description}`);
         } else {
-          apiKeysMessage += `\n  ${apiKeyInfo.name}: ${apiKeyInfo.value}${description}`;
+          outputSectionItems.push(`${apiKeyInfo.name}: ${apiKeyInfo.value}${description}`);
         }
       });
-    } else {
-      apiKeysMessage += '\n  None';
+      this.serverless.serviceOutputs.set('api keys', outputSectionItems);
     }
-
-    this.serverless.cli.consoleLog(apiKeysMessage);
-    return apiKeysMessage;
   },
 
   displayEndpoints() {
     const info = this.gatheredData.info;
-    let endpointsMessage = `${chalk.yellow('endpoints:')}`;
+    const outputSectionItems = [];
 
     if (info.endpoints && info.endpoints.length) {
       info.endpoints.forEach((endpoint) => {
@@ -75,7 +59,7 @@ module.exports = {
                         .filter((p) => p !== '')
                         .join('/')}`
                     : '';
-                endpointsMessage += `\n  ${method} - ${endpoint}${path}`;
+                outputSectionItems.push(`${method} - ${endpoint}${path}`);
               }
             });
           });
@@ -87,73 +71,65 @@ module.exports = {
           for (const functionData of Object.values(this.serverless.service.functions)) {
             for (const event of functionData.events) {
               if (!event.httpApi) continue;
-              endpointsMessage += `\n  ${event.resolvedMethod} - ${endpoint}${
-                event.resolvedPath || ''
-              }`;
+              outputSectionItems.push(
+                `${event.resolvedMethod} - ${endpoint}${event.resolvedPath || ''}`
+              );
             }
           }
         } else {
           // if the endpoint is not of type http(s) (e.g. wss) we just display
-          endpointsMessage += `\n  ${endpoint}`;
+          outputSectionItems.push(endpoint);
         }
       });
     }
 
     if (info.cloudFront) {
-      endpointsMessage += `\n  CloudFront - ${info.cloudFront}`;
+      outputSectionItems.push(`CloudFront - ${info.cloudFront}`);
     }
 
-    if (!info.endpoints.length && !info.cloudFront) {
-      endpointsMessage += '\n  None';
+    if (outputSectionItems.length > 1) {
+      this.serverless.serviceOutputs.set('endpoints', outputSectionItems);
+    } else if (outputSectionItems.length) {
+      this.serverless.serviceOutputs.set('endpoint', outputSectionItems[0]);
     }
-
-    this.serverless.cli.consoleLog(endpointsMessage);
-    return endpointsMessage;
   },
 
   displayFunctions() {
     const info = this.gatheredData.info;
-    let functionsMessage = `${chalk.yellow('functions:')}`;
 
     if (info.functions && info.functions.length > 0) {
+      const outputSectionItems = [];
       info.functions.forEach((f) => {
-        functionsMessage += `\n  ${f.name}: ${f.deployedName}`;
+        outputSectionItems.push(
+          `${f.name}: ${f.deployedName}${
+            f.artifactSize ? style.aside(` (${filesize(f.artifactSize)})`) : ''
+          }`
+        );
       });
-    } else {
-      functionsMessage += '\n  None';
+      this.serverless.serviceOutputs.set('functions', outputSectionItems);
     }
-
-    this.serverless.cli.consoleLog(functionsMessage);
-    return functionsMessage;
   },
 
   displayLayers() {
     const info = this.gatheredData.info;
-    let layersMessage = `${chalk.yellow('layers:')}`;
 
     if (info.layers && info.layers.length > 0) {
+      const outputSectionItems = [];
       info.layers.forEach((l) => {
-        layersMessage += `\n  ${l.name}: ${l.arn}`;
+        outputSectionItems.push(`${l.name}: ${l.arn}`);
       });
-    } else {
-      layersMessage += '\n  None';
+      this.serverless.serviceOutputs.set('layers', outputSectionItems);
     }
-
-    this.serverless.cli.consoleLog(layersMessage);
-    return layersMessage;
   },
 
   displayStackOutputs() {
-    let message = '';
-    if (this.options.verbose) {
-      message = `${chalk.yellow.underline('\nStack Outputs\n')}`;
+    if (isVerboseMode && this.gatheredData.outputs.length) {
+      const outputSectionItems = [];
       this.gatheredData.outputs.forEach((output) => {
-        message += `${chalk.yellow(output.OutputKey)}: ${output.OutputValue}\n`;
+        outputSectionItems.push(`${output.OutputKey}: ${output.OutputValue}`);
       });
 
-      this.serverless.cli.consoleLog(message);
+      this.serverless.serviceOutputs.set('\nStack Outputs', outputSectionItems);
     }
-
-    return message;
   },
 };
diff --git a/lib/plugins/aws/info/getApiKeyValues.js b/lib/plugins/aws/info/get-api-key-values.js
similarity index 89%
rename from lib/plugins/aws/info/getApiKeyValues.js
rename to lib/plugins/aws/info/get-api-key-values.js
index eaed6657706..6b7ac5daf60 100644
--- a/lib/plugins/aws/info/getApiKeyValues.js
+++ b/lib/plugins/aws/info/get-api-key-values.js
@@ -51,9 +51,12 @@ module.exports = {
         })
         .then((apiKeys) => {
           if (apiKeys && apiKeys.length) {
-            info.apiKeys = apiKeys.map((apiKey) =>
-              _.pick(apiKey, ['name', 'value', 'description', 'customerId'])
-            );
+            info.apiKeys = apiKeys.map((apiKey) => ({
+              name: apiKey.name,
+              value: apiKey.value,
+              description: apiKey.description,
+              customerId: apiKey.customerId,
+            }));
           }
           return BbPromise.resolve();
         });
diff --git a/lib/plugins/aws/info/getResourceCount.js b/lib/plugins/aws/info/get-resource-count.js
similarity index 100%
rename from lib/plugins/aws/info/getResourceCount.js
rename to lib/plugins/aws/info/get-resource-count.js
diff --git a/lib/plugins/aws/info/getStackInfo.js b/lib/plugins/aws/info/get-stack-info.js
similarity index 92%
rename from lib/plugins/aws/info/getStackInfo.js
rename to lib/plugins/aws/info/get-stack-info.js
index 73706e45700..186e6005c0a 100644
--- a/lib/plugins/aws/info/getStackInfo.js
+++ b/lib/plugins/aws/info/get-stack-info.js
@@ -1,7 +1,7 @@
 'use strict';
 
 const BbPromise = require('bluebird');
-const resolveCfImportValue = require('../utils/resolveCfImportValue');
+const resolveCfImportValue = require('../utils/resolve-cf-import-value');
 const ServerlessError = require('../../../serverless-error');
 
 module.exports = {
@@ -47,7 +47,8 @@ module.exports = {
             },
             (error) => {
               throw new ServerlessError(
-                `Could not resolve provider.httpApi.id parameter. ${error.message}`
+                `Could not resolve provider.httpApi.id parameter. ${error.message}`,
+                'UNABLE_TO_RESOLVE_HTTP_API_ID'
               );
             }
           )
@@ -68,9 +69,11 @@ module.exports = {
 
         // Functions
         this.serverless.service.getAllFunctions().forEach((func) => {
+          const functionObj = this.serverless.service.getFunction(func);
           const functionInfo = {};
           functionInfo.name = func;
-          functionInfo.deployedName = this.serverless.service.getFunction(func).name;
+          functionInfo.deployedName = functionObj.name;
+          functionInfo.artifactSize = functionObj.artifactSize;
           this.gatheredData.info.functions.push(functionInfo);
         });
 
diff --git a/lib/plugins/aws/info/index.js b/lib/plugins/aws/info/index.js
index 6cf512f4c06..58b28e07abb 100644
--- a/lib/plugins/aws/info/index.js
+++ b/lib/plugins/aws/info/index.js
@@ -1,11 +1,16 @@
 'use strict';
 
 const BbPromise = require('bluebird');
+const { progress, style } = require('@serverless/utils/log');
+const writeServiceOutputs = require('../../../cli/write-service-outputs');
 const validate = require('../lib/validate');
-const getStackInfo = require('./getStackInfo');
-const getResourceCount = require('./getResourceCount');
-const getApiKeyValues = require('./getApiKeyValues');
+const getStackInfo = require('./get-stack-info');
+const getResourceCount = require('./get-resource-count');
+const getApiKeyValues = require('./get-api-key-values');
 const display = require('./display');
+const { log } = require('@serverless/utils/log');
+
+const mainProgress = progress.get('main');
 
 class AwsInfo {
   constructor(serverless, options) {
@@ -42,6 +47,11 @@ class AwsInfo {
           return this.serverless.pluginManager.spawn('aws:info');
         }),
 
+      'before:aws:info:validate': () => {
+        const isDeployCommand = this.serverless.processedInput.commands.join(' ') === 'deploy';
+        if (!isDeployCommand) return;
+        mainProgress.notice('Retrieving CloudFormation stack', { isMainEvent: true });
+      },
       'aws:info:validate': async () => BbPromise.bind(this).then(this.validate),
 
       'aws:info:gatherData': async () =>
@@ -62,6 +72,24 @@ class AwsInfo {
 
       'aws:info:displayStackOutputs': async () =>
         BbPromise.bind(this).then(this.displayStackOutputs),
+
+      'after:aws:info:gatherData': () => {
+        if (this.gatheredData && this.gatheredData.info.resourceCount >= 450) {
+          log.warning(
+            `You have ${
+              this.gatheredData.info.resourceCount
+            } resources in your service. CloudFormation has a hard limit of 500 resources in a service. For advice on avoiding this limit, check out this link: ${style.link(
+              'http://slss.io/2q2'
+            )}.`
+          );
+        }
+      },
+
+      'finalize': () => {
+        if (this.serverless.processedInput.commands.join(' ') !== 'info') return;
+        writeServiceOutputs(this.serverless.serviceOutputs);
+        writeServiceOutputs(this.serverless.servicePluginOutputs);
+      },
     };
   }
 }
diff --git a/lib/plugins/aws/invoke-local/.gitignore b/lib/plugins/aws/invoke-local/.gitignore
new file mode 100644
index 00000000000..3d0f114e1c1
--- /dev/null
+++ b/lib/plugins/aws/invoke-local/.gitignore
@@ -0,0 +1,5 @@
+*.pyc
+runtime-wrappers/java/target
+runtime-wrappers/java/.project
+runtime-wrappers/java/.settings
+runtime-wrappers/java/.classpath
diff --git a/lib/plugins/aws/invokeLocal/index.js b/lib/plugins/aws/invoke-local/index.js
similarity index 79%
rename from lib/plugins/aws/invokeLocal/index.js
rename to lib/plugins/aws/invoke-local/index.js
index 84aabe565c6..52c4f4aa947 100644
--- a/lib/plugins/aws/invokeLocal/index.js
+++ b/lib/plugins/aws/invoke-local/index.js
@@ -2,33 +2,38 @@
 
 const _ = require('lodash');
 const os = require('os');
+const fsp = require('fs').promises;
 const fse = require('fs-extra');
 const path = require('path');
+const stripAnsi = require('strip-ansi');
 const validate = require('../lib/validate');
-const chalk = require('chalk');
 const stdin = require('get-stdin');
 const spawnExt = require('child-process-ext/spawn');
 const { spawn } = require('child_process');
 const inspect = require('util').inspect;
-const download = require('download');
+const download = require('@serverless/utils/download');
 const { ensureDir } = require('fs-extra');
 const cachedir = require('cachedir');
 const decompress = require('decompress');
 const { v4: uuidv4 } = require('uuid');
 const ServerlessError = require('../../../serverless-error');
-const dirExists = require('../../../utils/fs/dirExists');
-const fileExists = require('../../../utils/fs/fileExists');
-const isStandalone = require('../../../utils/isStandaloneExecutable');
-const ensureArtifact = require('../../../utils/ensureArtifact');
-const resolveCfImportValue = require('../utils/resolveCfImportValue');
-const resolveCfRefValue = require('../utils/resolveCfRefValue');
+const dirExists = require('../../../utils/fs/dir-exists');
+const fileExists = require('../../../utils/fs/file-exists');
+const isStandalone = require('../../../utils/is-standalone-executable');
+const ensureArtifact = require('../../../utils/ensure-artifact');
+const resolveCfImportValue = require('../utils/resolve-cf-import-value');
+const resolveCfRefValue = require('../utils/resolve-cf-ref-value');
+const { writeText, progress, log } = require('@serverless/utils/log');
 
 const cachePath = path.join(cachedir('serverless'), 'invokeLocal');
 
+const mainProgress = progress.get('main');
+const dockerProgress = progress.get('invokeLocalDocker');
+
 const ensureRuntimeWrappers = isStandalone
   ? async () =>
-      ensureArtifact('runtimeWrappers/validationFile', async (runtimeCachePath) => {
-        await fse.copy(path.resolve(__dirname, 'runtimeWrappers'), runtimeCachePath);
+      ensureArtifact('runtime-wrappers/validationFile', async (runtimeCachePath) => {
+        await fse.copy(path.resolve(__dirname, 'runtime-wrappers'), runtimeCachePath);
         return fse.ensureFile(path.resolve(runtimeCachePath, 'validationFile'));
       })
   : () => __dirname;
@@ -56,7 +61,7 @@ class AwsInvokeLocal {
 
   async resolveRuntimeWrapperPath(filename) {
     const artifactsPath = await ensureRuntimeWrappers();
-    return path.resolve(artifactsPath, 'runtimeWrappers', filename);
+    return path.resolve(artifactsPath, 'runtime-wrappers', filename);
   }
 
   async validateFile(filePath, key) {
@@ -67,14 +72,26 @@ class AwsInvokeLocal {
     const exists = await fileExists(absolutePath);
 
     if (!exists) {
-      throw new ServerlessError(`The file you provided does not exist: ${absolutePath}`);
+      throw new ServerlessError(
+        `The file you provided does not exist: ${absolutePath}`,
+        'INVOKE_LOCAL_MISSING_FILE'
+      );
     }
     if (absolutePath.endsWith('.js')) {
       // to support js - export as an input data
       this.options[key] = require(absolutePath);
       return;
     }
-    const contents = await this.serverless.utils.readFile(absolutePath);
+    const contents = await (async () => {
+      try {
+        return await this.serverless.utils.readFile(absolutePath);
+      } catch (error) {
+        throw new ServerlessError(
+          `Parsing of "${absolutePath}" failed with: ${error.message}`,
+          'INVOKE_LOCAL_INVALID_FILE_CONTENT'
+        );
+      }
+    })();
     this.options[key] = contents;
   }
 
@@ -86,7 +103,8 @@ class AwsInvokeLocal {
 
     if (this.options.functionObj.image) {
       throw new ServerlessError(
-        'Local invocation of lambdas pointing AWS ECR images is not supported'
+        'Local invocation of lambdas pointing AWS ECR images is not supported',
+        'INVOKE_LOCAL_IMAGE_BACKED_FUNCTIONS_NOT_SUPPORTED'
       );
     }
     if (this.options.contextPath) {
@@ -194,11 +212,15 @@ class AwsInvokeLocal {
           } else if (value.Ref) {
             configuredEnvVars[name] = await resolveCfRefValue(this.provider, value.Ref);
           } else {
-            throw new Error(`Unsupported format: ${inspect(value)}`);
+            throw new ServerlessError(
+              `Unsupported environment variable format: ${inspect(value)}`,
+              'INVOKE_LOCAL_UNSUPPORTED_ENV_VARIABLE'
+            );
           }
         } catch (error) {
           throw new ServerlessError(
-            `Could not resolve "${name}" environment variable: ${error.message}`
+            `Could not resolve "${name}" environment variable: ${error.message}`,
+            'INVOKE_LOCAL_INVALID_ENV_VARIABLE'
           );
         }
       })
@@ -227,7 +249,7 @@ class AwsInvokeLocal {
       );
     }
 
-    if (['python2.7', 'python3.6', 'python3.7', 'python3.8'].includes(runtime)) {
+    if (['python2.7', 'python3.6', 'python3.7', 'python3.8', 'python3.9'].includes(runtime)) {
       const handlerComponents = handler.split(/\./);
       const handlerPath = handlerComponents.slice(0, -1).join('.');
       const handlerName = handlerComponents.pop();
@@ -277,7 +299,10 @@ class AwsInvokeLocal {
     try {
       return await spawnExt('docker', ['version']);
     } catch {
-      throw new Error('Please start the Docker daemon to use the invoke local Docker integration.');
+      throw new ServerlessError(
+        'Please start the Docker daemon to use the invoke local Docker integration.',
+        'DOCKER_DAEMON_NOT_FOUND'
+      );
     }
   }
 
@@ -289,7 +314,7 @@ class AwsInvokeLocal {
   async pullDockerImage() {
     const runtime = this.getRuntime();
 
-    this.serverless.cli.log('Downloading base Docker image...');
+    dockerProgress.notice('Downloading base Docker image');
     return spawnExt('docker', [
       'pull',
       '--disable-content-trust=false',
@@ -305,6 +330,7 @@ class AwsInvokeLocal {
     return Promise.all(
       (this.options.functionObj.layers || this.serverless.service.provider.layers || []).map(
         async (layer) => {
+          const layerProgress = progress.get(`layer:${layer}`);
           if (layer.Ref) {
             const targetLayer = layers[layer.Ref];
 
@@ -317,7 +343,7 @@ class AwsInvokeLocal {
               if (exists) {
                 return layerArtifactContentPath;
               }
-              this.serverless.cli.log(`Unziping ${layer.Ref}...`);
+              layerProgress.notice(`Unzipping ${layer.Ref}`);
               await decompress(targetLayer.package.artifact, layerArtifactContentPath);
               return layerArtifactContentPath;
             }
@@ -333,7 +359,7 @@ class AwsInvokeLocal {
           if (!exists) {
             const cacheExists = await dirExists(layerContentsCachePath);
             if (!cacheExists) {
-              this.serverless.cli.log(`Downloading layer ${layer}...`);
+              layerProgress.notice(`Downloading layer ${layer}`);
               await ensureDir(path.join(layerContentsCachePath));
 
               const layerInfo = await this.provider.request('Lambda', 'getLayerVersion', {
@@ -347,6 +373,7 @@ class AwsInvokeLocal {
             }
           }
           await fse.copy(layerContentsCachePath, layerContentsPath);
+          layerProgress.remove();
           return layerContentsPath;
         }
       )
@@ -372,7 +399,7 @@ class AwsInvokeLocal {
     const dockerfileCachePath = path.join(cachePath, 'dockerfiles', runtime, 'Dockerfile');
 
     if (await fileExists(dockerfileCachePath)) {
-      const contents = await fse.readFile(dockerfileCachePath);
+      const contents = await fsp.readFile(dockerfileCachePath);
 
       if (contents.toString() === dockerFileContent) {
         if (await this.checkDockerImage(imageName)) return imageName;
@@ -384,13 +411,13 @@ class AwsInvokeLocal {
       ensureDir(path.join(cachePath, 'dockerfiles', runtime)),
     ]);
 
-    this.serverless.cli.log('Writing Dockerfile...');
+    dockerProgress.notice('Writing Dockerfile');
     await Promise.all([
-      fse.writeFile(dockerfilePath, dockerFileContent),
-      fse.writeFile(dockerfileCachePath, dockerFileContent),
+      fsp.writeFile(dockerfilePath, dockerFileContent),
+      fsp.writeFile(dockerfileCachePath, dockerFileContent),
     ]);
 
-    this.serverless.cli.log('Building Docker image...');
+    dockerProgress.notice('Building Docker image');
     try {
       await spawnExt('docker', [
         'build',
@@ -403,9 +430,14 @@ class AwsInvokeLocal {
       return imageName;
     } catch (err) {
       if (err.stdBuffer) {
-        process.stdout.write(err.stdBuffer);
+        log.info(stripAnsi(err.stdBuffer.toString().trimRight()));
       }
-      throw new Error(`Failed to build docker image (exit code ${err.code}})`);
+      throw new ServerlessError(
+        `Failed to build docker image (exit code ${err.code}})`,
+        'DOCKER_IMAGE_BUILD_FAILED'
+      );
+    } finally {
+      dockerProgress.remove();
     }
   }
 
@@ -446,7 +478,7 @@ class AwsInvokeLocal {
   async ensurePackage() {
     if (this.options['skip-package']) {
       try {
-        await fse.access(
+        await fsp.access(
           path.join(this.serverless.serviceDir, '.serverless', 'serverless-state.json')
         );
         return;
@@ -462,6 +494,7 @@ class AwsInvokeLocal {
     const runtime = this.getRuntime();
 
     await this.ensurePackage();
+    mainProgress.notice('Invoking function locally', { isMainEvent: true });
     await this.checkDockerDaemonStatus();
     const results = await Promise.all([
       this.checkDockerImage(`lambci/lambda:${runtime}`).then((exists) => {
@@ -497,28 +530,26 @@ class AwsInvokeLocal {
     const envVarsDockerArgs = _.flatMap(envVars, (value, key) => ['--env', `${key}=${value}`]);
 
     const dockerArgsFromOptions = this.getDockerArgsFromOptions();
-    const dockerArgs = [
-      'run',
-      '--rm',
-      '-v',
-      `${artifactPath}:/var/task:ro,delegated`,
-    ].concat(envVarsDockerArgs, dockerArgsFromOptions, [
-      imageName,
-      handler,
-      JSON.stringify(this.options.data),
-    ]);
+    const dockerArgs = ['run', '--rm', '-v', `${artifactPath}:/var/task:ro,delegated`].concat(
+      envVarsDockerArgs,
+      dockerArgsFromOptions,
+      [imageName, handler, JSON.stringify(this.options.data)]
+    );
 
     try {
       const { stdBuffer } = await spawnExt('docker', dockerArgs);
       if (stdBuffer) {
-        process.stdout.write(stdBuffer);
+        writeText(stripAnsi(stdBuffer.toString().trimRight()));
       }
       return imageName;
     } catch (err) {
       if (err.stdBuffer) {
-        process.stdout.write(err.stdBuffer);
+        writeText(stripAnsi(err.stdBuffer.toString().trimRight()));
       }
-      throw new Error(`Failed to run docker for ${runtime} image (exit code ${err.code}})`);
+      throw new ServerlessError(
+        `Failed to run docker for ${runtime} image (exit code ${err.code}})`,
+        'DOCKER_IMAGE_RUN_FAILED'
+      );
     }
   }
 
@@ -565,8 +596,12 @@ class AwsInvokeLocal {
         { env: process.env },
         { shell: true }
       );
-      python.stdout.on('data', (buf) => this.serverless.cli.consoleLog(buf.toString()));
-      python.stderr.on('data', (buf) => this.serverless.cli.consoleLog(buf.toString()));
+      python.stdout.on('data', (buf) => {
+        writeText(buf.toString());
+      });
+      python.stderr.on('data', (buf) => {
+        writeText(buf.toString());
+      });
       python.on('close', () => resolve());
       let isRejected = false;
       python.on('error', (error) => {
@@ -597,15 +632,16 @@ class AwsInvokeLocal {
         { shell: true }
       );
 
-      this.serverless.cli.log(
-        [
-          'In order to get human-readable output,',
-          ' please implement "toString()" method of your "ApiGatewayResponse" object.',
-        ].join('')
+      log.warning(
+        'In order to get human-readable output, please implement "toString()" method of your "ApiGatewayResponse" object.'
       );
 
-      java.stdout.on('data', (buf) => this.serverless.cli.consoleLog(buf.toString()));
-      java.stderr.on('data', (buf) => this.serverless.cli.consoleLog(buf.toString()));
+      java.stdout.on('data', (buf) => {
+        writeText(buf.toString());
+      });
+      java.stderr.on('data', (buf) => {
+        writeText(buf.toString());
+      });
       java.on('close', () => resolve());
       let isRejected = false;
       java.on('error', (error) => {
@@ -623,9 +659,12 @@ class AwsInvokeLocal {
 
   async invokeLocalJava(runtime, className, handlerName, artifactPath, event, customContext) {
     try {
-      await fse.stat(artifactPath);
+      await fsp.stat(artifactPath);
     } catch {
-      throw new Error(`Artifact ${artifactPath} doesn't exists, please compile it first.`);
+      throw new ServerlessError(
+        `Artifact ${artifactPath} doesn't exists, please compile it first.`,
+        'JAVA_ARTIFACT_NOT_FOUND'
+      );
     }
     const timeout =
       Number(this.options.functionObj.timeout) ||
@@ -645,22 +684,20 @@ class AwsInvokeLocal {
     const executablePath = path.join(javaBridgePath, 'target');
 
     try {
-      await fse.stat(executablePath);
+      await fsp.stat(executablePath);
     } catch (err) {
       return new Promise((resolve, reject) => {
+        const javaBridgeProgress = progress.get('javaBridge');
+        javaBridgeProgress.notice('Building Java bridge', { isMainEvent: true });
         const mvn = spawn('mvn', ['package', '-f', path.join(javaBridgePath, 'pom.xml')], {
           shell: true,
         });
 
-        this.serverless.cli.log('Building Java bridge, first invocation might take a bit longer.');
-
-        mvn.stderr.on('data', (buf) =>
-          this.serverless.cli.consoleLog(`mvn(stderr) - ${buf.toString()}`)
-        );
+        mvn.stderr.on('data', (buf) => {
+          log.info(`mvn(stderr) - ${buf.toString()}`);
+        });
         const chunk = [];
-        if (process.env.SLS_DEBUG) {
-          mvn.stdout.on('data', (buf) => chunk.push(buf));
-        }
+        mvn.stdout.on('data', (buf) => chunk.push(buf));
 
         let isRejected = false;
         mvn.on('error', (error) => {
@@ -671,21 +708,23 @@ class AwsInvokeLocal {
         });
 
         mvn.on('exit', (code, signal) => {
+          javaBridgeProgress.remove();
           if (code === 0) {
             resolve(this.callJavaBridge(artifactPath, className, handlerName, input));
           } else if (!isRejected) {
-            if (process.env.SLS_DEBUG) {
-              chunk
-                .map((elem) => elem.toString())
-                .join('')
-                .split(/\n/)
-                .forEach((line) => {
-                  this.serverless.cli.consoleLog(`mvn(stdout) - ${line}`);
-                });
-            }
+            chunk
+              .map((elem) => elem.toString())
+              .join('')
+              .split(/\n/)
+              .forEach((line) => {
+                log.info(`mvn(stdout) - ${line}`);
+              });
             isRejected = true;
             reject(
-              new Error(`Failed to build the Java bridge. exit code=${code} signal=${signal}`)
+              new ServerlessError(
+                `Failed to build the Java bridge. exit code=${code} signal=${signal}`,
+                'JAVA_BRIDGE_BUILD_FAILED'
+              )
             );
           }
         });
@@ -711,8 +750,12 @@ class AwsInvokeLocal {
         env: process.env,
         shell: true,
       });
-      ruby.stdout.on('data', (buf) => this.serverless.cli.consoleLog(buf.toString()));
-      ruby.stderr.on('data', (buf) => this.serverless.cli.consoleLog(buf.toString()));
+      ruby.stdout.on('data', (buf) => {
+        writeText(buf.toString());
+      });
+      ruby.stderr.on('data', (buf) => {
+        writeText(buf.toString());
+      });
       ruby.on('close', () => resolve());
       let isRejected = false;
       ruby.on('error', (error) => {
@@ -745,8 +788,18 @@ class AwsInvokeLocal {
       const handlersContainer = require(pathToHandler);
       lambda = handlersContainer[handlerName];
     } catch (error) {
-      this.serverless.cli.consoleLog(chalk.red(inspect(error)));
-      throw new Error(`Exception encountered when loading ${pathToHandler}`);
+      log.error(inspect(error));
+      throw new ServerlessError(
+        `Exception encountered when loading ${pathToHandler}`,
+        'INVOKE_LOCAL_LAMBDA_INITIALIZATION_FAILED'
+      );
+    }
+
+    if (typeof lambda !== 'function') {
+      throw new ServerlessError(
+        `Lambda handler "${handlerPath}" does not point function property`,
+        'INVALID_LAMBDA_HANDLER_PATH'
+      );
     }
 
     function handleError(err) {
@@ -763,7 +816,7 @@ class AwsInvokeLocal {
         };
       }
 
-      this.serverless.cli.consoleLog(chalk.red(JSON.stringify(errorResult, null, 4)));
+      writeText(JSON.stringify(errorResult, null, 4));
       process.exitCode = 1;
     }
 
@@ -771,19 +824,32 @@ class AwsInvokeLocal {
       if (result instanceof Error) {
         handleError.call(this, result);
         return;
-      } else if (result.headers && result.headers['Content-Type'] === 'application/json') {
+      }
+      try {
+        JSON.stringify(result);
+      } catch (error) {
+        throw new ServerlessError(
+          `Function returned invalid (not a JSON stringifiable) value: ${inspect(result)}`,
+          'INVALID_INVOKE_LOCAL_RESULT'
+        );
+      }
+
+      if (result.headers && result.headers['Content-Type'] === 'application/json') {
         if (result.body) {
           try {
             Object.assign(result, {
               body: JSON.parse(result.body),
             });
           } catch (e) {
-            throw new Error('Content-Type of response is application/json but body is not json');
+            throw new ServerlessError(
+              'Content-Type of response is application/json but body is not json',
+              'INVOKE_LOCAL_RESPONSE_TYPE_MISMATCH'
+            );
           }
         }
       }
 
-      this.serverless.cli.consoleLog(JSON.stringify(result, null, 4));
+      writeText(JSON.stringify(result, null, 4));
     }
 
     return new Promise((resolve) => {
diff --git a/lib/plugins/aws/invokeLocal/runtimeWrappers/invoke.py b/lib/plugins/aws/invoke-local/runtime-wrappers/invoke.py
similarity index 90%
rename from lib/plugins/aws/invokeLocal/runtimeWrappers/invoke.py
rename to lib/plugins/aws/invoke-local/runtime-wrappers/invoke.py
index 0df5bc4bc27..5279f5e53c9 100755
--- a/lib/plugins/aws/invokeLocal/runtimeWrappers/invoke.py
+++ b/lib/plugins/aws/invoke-local/runtime-wrappers/invoke.py
@@ -3,9 +3,17 @@
 import json
 import logging
 import sys
+import decimal
 from time import strftime, time
 from importlib import import_module
 
+def decimal_serializer(o):
+    if isinstance(o, decimal.Decimal):
+        f = float(o)
+        if f.is_integer():
+          return int(f)
+        return f
+    
 class FakeLambdaContext(object):
     def __init__(self, name='Fake', version='LATEST', timeout=6, **kwargs):
         self.name = name
@@ -84,4 +92,4 @@ def log(self):
 
     context = FakeLambdaContext(**input.get('context', {}))
     result = handler(input['event'], context)
-    sys.stdout.write(json.dumps(result, indent=4))
+    sys.stdout.write(json.dumps(result, default=decimal_serializer, indent=4))
diff --git a/lib/plugins/aws/invokeLocal/runtimeWrappers/invoke.rb b/lib/plugins/aws/invoke-local/runtime-wrappers/invoke.rb
similarity index 100%
rename from lib/plugins/aws/invokeLocal/runtimeWrappers/invoke.rb
rename to lib/plugins/aws/invoke-local/runtime-wrappers/invoke.rb
diff --git a/lib/plugins/aws/invokeLocal/runtimeWrappers/java/MANIFEST.mf b/lib/plugins/aws/invoke-local/runtime-wrappers/java/MANIFEST.mf
similarity index 100%
rename from lib/plugins/aws/invokeLocal/runtimeWrappers/java/MANIFEST.mf
rename to lib/plugins/aws/invoke-local/runtime-wrappers/java/MANIFEST.mf
diff --git a/lib/plugins/aws/invokeLocal/runtimeWrappers/java/pom.xml b/lib/plugins/aws/invoke-local/runtime-wrappers/java/pom.xml
similarity index 97%
rename from lib/plugins/aws/invokeLocal/runtimeWrappers/java/pom.xml
rename to lib/plugins/aws/invoke-local/runtime-wrappers/java/pom.xml
index 23b45cf5a13..c069ceef634 100644
--- a/lib/plugins/aws/invokeLocal/runtimeWrappers/java/pom.xml
+++ b/lib/plugins/aws/invoke-local/runtime-wrappers/java/pom.xml
@@ -22,12 +22,12 @@
     <dependency>
       <groupId>com.amazonaws</groupId>
       <artifactId>aws-lambda-java-log4j</artifactId>
-      <version>1.0.1</version>
+      <version>1.5.0</version>
     </dependency>
     <dependency>
       <groupId>com.amazonaws</groupId>
       <artifactId>aws-lambda-java-events</artifactId>
-      <version>3.1.0</version>
+      <version>3.1.1</version>
     </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
diff --git a/lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/main/java/com/serverless/Context.java b/lib/plugins/aws/invoke-local/runtime-wrappers/java/src/main/java/com/serverless/Context.java
similarity index 100%
rename from lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/main/java/com/serverless/Context.java
rename to lib/plugins/aws/invoke-local/runtime-wrappers/java/src/main/java/com/serverless/Context.java
diff --git a/lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/main/java/com/serverless/InvokeBridge.java b/lib/plugins/aws/invoke-local/runtime-wrappers/java/src/main/java/com/serverless/InvokeBridge.java
similarity index 100%
rename from lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/main/java/com/serverless/InvokeBridge.java
rename to lib/plugins/aws/invoke-local/runtime-wrappers/java/src/main/java/com/serverless/InvokeBridge.java
diff --git a/lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/main/java/com/serverless/LambdaLogger.java b/lib/plugins/aws/invoke-local/runtime-wrappers/java/src/main/java/com/serverless/LambdaLogger.java
similarity index 100%
rename from lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/main/java/com/serverless/LambdaLogger.java
rename to lib/plugins/aws/invoke-local/runtime-wrappers/java/src/main/java/com/serverless/LambdaLogger.java
diff --git a/lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/main/java/com/serverless/mapper/AbstractMapper.java b/lib/plugins/aws/invoke-local/runtime-wrappers/java/src/main/java/com/serverless/mapper/AbstractMapper.java
similarity index 100%
rename from lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/main/java/com/serverless/mapper/AbstractMapper.java
rename to lib/plugins/aws/invoke-local/runtime-wrappers/java/src/main/java/com/serverless/mapper/AbstractMapper.java
diff --git a/lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/main/java/com/serverless/mapper/DefaultEventMapper.java b/lib/plugins/aws/invoke-local/runtime-wrappers/java/src/main/java/com/serverless/mapper/DefaultEventMapper.java
similarity index 100%
rename from lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/main/java/com/serverless/mapper/DefaultEventMapper.java
rename to lib/plugins/aws/invoke-local/runtime-wrappers/java/src/main/java/com/serverless/mapper/DefaultEventMapper.java
diff --git a/lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/main/java/com/serverless/mapper/DefaultMapper.java b/lib/plugins/aws/invoke-local/runtime-wrappers/java/src/main/java/com/serverless/mapper/DefaultMapper.java
similarity index 100%
rename from lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/main/java/com/serverless/mapper/DefaultMapper.java
rename to lib/plugins/aws/invoke-local/runtime-wrappers/java/src/main/java/com/serverless/mapper/DefaultMapper.java
diff --git a/lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/main/java/com/serverless/mapper/HashMapWrapper.java b/lib/plugins/aws/invoke-local/runtime-wrappers/java/src/main/java/com/serverless/mapper/HashMapWrapper.java
similarity index 100%
rename from lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/main/java/com/serverless/mapper/HashMapWrapper.java
rename to lib/plugins/aws/invoke-local/runtime-wrappers/java/src/main/java/com/serverless/mapper/HashMapWrapper.java
diff --git a/lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/main/java/com/serverless/mapper/Mapper.java b/lib/plugins/aws/invoke-local/runtime-wrappers/java/src/main/java/com/serverless/mapper/Mapper.java
similarity index 100%
rename from lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/main/java/com/serverless/mapper/Mapper.java
rename to lib/plugins/aws/invoke-local/runtime-wrappers/java/src/main/java/com/serverless/mapper/Mapper.java
diff --git a/lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/main/java/com/serverless/mapper/MapperFactory.java b/lib/plugins/aws/invoke-local/runtime-wrappers/java/src/main/java/com/serverless/mapper/MapperFactory.java
similarity index 100%
rename from lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/main/java/com/serverless/mapper/MapperFactory.java
rename to lib/plugins/aws/invoke-local/runtime-wrappers/java/src/main/java/com/serverless/mapper/MapperFactory.java
diff --git a/lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/main/java/com/serverless/mapper/S3EventMapper.java b/lib/plugins/aws/invoke-local/runtime-wrappers/java/src/main/java/com/serverless/mapper/S3EventMapper.java
similarity index 100%
rename from lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/main/java/com/serverless/mapper/S3EventMapper.java
rename to lib/plugins/aws/invoke-local/runtime-wrappers/java/src/main/java/com/serverless/mapper/S3EventMapper.java
diff --git a/lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/test/java/com/serverless/AbstractRequestHandler.java b/lib/plugins/aws/invoke-local/runtime-wrappers/java/src/test/java/com/serverless/AbstractRequestHandler.java
similarity index 100%
rename from lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/test/java/com/serverless/AbstractRequestHandler.java
rename to lib/plugins/aws/invoke-local/runtime-wrappers/java/src/test/java/com/serverless/AbstractRequestHandler.java
diff --git a/lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/test/java/com/serverless/ConcreteRequestHandler.java b/lib/plugins/aws/invoke-local/runtime-wrappers/java/src/test/java/com/serverless/ConcreteRequestHandler.java
similarity index 100%
rename from lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/test/java/com/serverless/ConcreteRequestHandler.java
rename to lib/plugins/aws/invoke-local/runtime-wrappers/java/src/test/java/com/serverless/ConcreteRequestHandler.java
diff --git a/lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/test/java/com/serverless/InvokeBridgeInheritanceTest.java b/lib/plugins/aws/invoke-local/runtime-wrappers/java/src/test/java/com/serverless/InvokeBridgeInheritanceTest.java
similarity index 100%
rename from lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/test/java/com/serverless/InvokeBridgeInheritanceTest.java
rename to lib/plugins/aws/invoke-local/runtime-wrappers/java/src/test/java/com/serverless/InvokeBridgeInheritanceTest.java
diff --git a/lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/test/java/com/serverless/InvokeBridgeTest.java b/lib/plugins/aws/invoke-local/runtime-wrappers/java/src/test/java/com/serverless/InvokeBridgeTest.java
similarity index 100%
rename from lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/test/java/com/serverless/InvokeBridgeTest.java
rename to lib/plugins/aws/invoke-local/runtime-wrappers/java/src/test/java/com/serverless/InvokeBridgeTest.java
diff --git a/lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/test/java/com/serverless/RequestHandler.java b/lib/plugins/aws/invoke-local/runtime-wrappers/java/src/test/java/com/serverless/RequestHandler.java
similarity index 100%
rename from lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/test/java/com/serverless/RequestHandler.java
rename to lib/plugins/aws/invoke-local/runtime-wrappers/java/src/test/java/com/serverless/RequestHandler.java
diff --git a/lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/test/java/com/serverless/RequestHandlerAPIGatewayProxyRequestEvent.java b/lib/plugins/aws/invoke-local/runtime-wrappers/java/src/test/java/com/serverless/RequestHandlerAPIGatewayProxyRequestEvent.java
similarity index 100%
rename from lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/test/java/com/serverless/RequestHandlerAPIGatewayProxyRequestEvent.java
rename to lib/plugins/aws/invoke-local/runtime-wrappers/java/src/test/java/com/serverless/RequestHandlerAPIGatewayProxyRequestEvent.java
diff --git a/lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/test/java/com/serverless/RequestHandlerAPIGatewayV2HTTPEvent.java b/lib/plugins/aws/invoke-local/runtime-wrappers/java/src/test/java/com/serverless/RequestHandlerAPIGatewayV2HTTPEvent.java
similarity index 100%
rename from lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/test/java/com/serverless/RequestHandlerAPIGatewayV2HTTPEvent.java
rename to lib/plugins/aws/invoke-local/runtime-wrappers/java/src/test/java/com/serverless/RequestHandlerAPIGatewayV2HTTPEvent.java
diff --git a/lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/test/java/com/serverless/RequestHandlerAPIGatewayV2WebSocketEvent.java b/lib/plugins/aws/invoke-local/runtime-wrappers/java/src/test/java/com/serverless/RequestHandlerAPIGatewayV2WebSocketEvent.java
similarity index 100%
rename from lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/test/java/com/serverless/RequestHandlerAPIGatewayV2WebSocketEvent.java
rename to lib/plugins/aws/invoke-local/runtime-wrappers/java/src/test/java/com/serverless/RequestHandlerAPIGatewayV2WebSocketEvent.java
diff --git a/lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/test/java/com/serverless/RequestHandlerApplicationLoadBalancerRequestEvent.java b/lib/plugins/aws/invoke-local/runtime-wrappers/java/src/test/java/com/serverless/RequestHandlerApplicationLoadBalancerRequestEvent.java
similarity index 100%
rename from lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/test/java/com/serverless/RequestHandlerApplicationLoadBalancerRequestEvent.java
rename to lib/plugins/aws/invoke-local/runtime-wrappers/java/src/test/java/com/serverless/RequestHandlerApplicationLoadBalancerRequestEvent.java
diff --git a/lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/test/java/com/serverless/RequestHandlerCloudFrontEvent.java b/lib/plugins/aws/invoke-local/runtime-wrappers/java/src/test/java/com/serverless/RequestHandlerCloudFrontEvent.java
similarity index 100%
rename from lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/test/java/com/serverless/RequestHandlerCloudFrontEvent.java
rename to lib/plugins/aws/invoke-local/runtime-wrappers/java/src/test/java/com/serverless/RequestHandlerCloudFrontEvent.java
diff --git a/lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/test/java/com/serverless/RequestHandlerCloudWatchLogsEvent.java b/lib/plugins/aws/invoke-local/runtime-wrappers/java/src/test/java/com/serverless/RequestHandlerCloudWatchLogsEvent.java
similarity index 100%
rename from lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/test/java/com/serverless/RequestHandlerCloudWatchLogsEvent.java
rename to lib/plugins/aws/invoke-local/runtime-wrappers/java/src/test/java/com/serverless/RequestHandlerCloudWatchLogsEvent.java
diff --git a/lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/test/java/com/serverless/RequestHandlerCodeCommitEvent.java b/lib/plugins/aws/invoke-local/runtime-wrappers/java/src/test/java/com/serverless/RequestHandlerCodeCommitEvent.java
similarity index 100%
rename from lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/test/java/com/serverless/RequestHandlerCodeCommitEvent.java
rename to lib/plugins/aws/invoke-local/runtime-wrappers/java/src/test/java/com/serverless/RequestHandlerCodeCommitEvent.java
diff --git a/lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/test/java/com/serverless/RequestHandlerCognitoEvent.java b/lib/plugins/aws/invoke-local/runtime-wrappers/java/src/test/java/com/serverless/RequestHandlerCognitoEvent.java
similarity index 100%
rename from lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/test/java/com/serverless/RequestHandlerCognitoEvent.java
rename to lib/plugins/aws/invoke-local/runtime-wrappers/java/src/test/java/com/serverless/RequestHandlerCognitoEvent.java
diff --git a/lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/test/java/com/serverless/RequestHandlerConfigEvent.java b/lib/plugins/aws/invoke-local/runtime-wrappers/java/src/test/java/com/serverless/RequestHandlerConfigEvent.java
similarity index 100%
rename from lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/test/java/com/serverless/RequestHandlerConfigEvent.java
rename to lib/plugins/aws/invoke-local/runtime-wrappers/java/src/test/java/com/serverless/RequestHandlerConfigEvent.java
diff --git a/lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/test/java/com/serverless/RequestHandlerDynamodbEvent.java b/lib/plugins/aws/invoke-local/runtime-wrappers/java/src/test/java/com/serverless/RequestHandlerDynamodbEvent.java
similarity index 100%
rename from lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/test/java/com/serverless/RequestHandlerDynamodbEvent.java
rename to lib/plugins/aws/invoke-local/runtime-wrappers/java/src/test/java/com/serverless/RequestHandlerDynamodbEvent.java
diff --git a/lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/test/java/com/serverless/RequestHandlerIoTButtonEvent.java b/lib/plugins/aws/invoke-local/runtime-wrappers/java/src/test/java/com/serverless/RequestHandlerIoTButtonEvent.java
similarity index 100%
rename from lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/test/java/com/serverless/RequestHandlerIoTButtonEvent.java
rename to lib/plugins/aws/invoke-local/runtime-wrappers/java/src/test/java/com/serverless/RequestHandlerIoTButtonEvent.java
diff --git a/lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/test/java/com/serverless/RequestHandlerKinesisEvent.java b/lib/plugins/aws/invoke-local/runtime-wrappers/java/src/test/java/com/serverless/RequestHandlerKinesisEvent.java
similarity index 100%
rename from lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/test/java/com/serverless/RequestHandlerKinesisEvent.java
rename to lib/plugins/aws/invoke-local/runtime-wrappers/java/src/test/java/com/serverless/RequestHandlerKinesisEvent.java
diff --git a/lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/test/java/com/serverless/RequestHandlerKinesisFirehoseEvent.java b/lib/plugins/aws/invoke-local/runtime-wrappers/java/src/test/java/com/serverless/RequestHandlerKinesisFirehoseEvent.java
similarity index 100%
rename from lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/test/java/com/serverless/RequestHandlerKinesisFirehoseEvent.java
rename to lib/plugins/aws/invoke-local/runtime-wrappers/java/src/test/java/com/serverless/RequestHandlerKinesisFirehoseEvent.java
diff --git a/lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/test/java/com/serverless/RequestHandlerLexEvent.java b/lib/plugins/aws/invoke-local/runtime-wrappers/java/src/test/java/com/serverless/RequestHandlerLexEvent.java
similarity index 100%
rename from lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/test/java/com/serverless/RequestHandlerLexEvent.java
rename to lib/plugins/aws/invoke-local/runtime-wrappers/java/src/test/java/com/serverless/RequestHandlerLexEvent.java
diff --git a/lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/test/java/com/serverless/RequestHandlerS3Event.java b/lib/plugins/aws/invoke-local/runtime-wrappers/java/src/test/java/com/serverless/RequestHandlerS3Event.java
similarity index 100%
rename from lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/test/java/com/serverless/RequestHandlerS3Event.java
rename to lib/plugins/aws/invoke-local/runtime-wrappers/java/src/test/java/com/serverless/RequestHandlerS3Event.java
diff --git a/lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/test/java/com/serverless/RequestHandlerSNSEvent.java b/lib/plugins/aws/invoke-local/runtime-wrappers/java/src/test/java/com/serverless/RequestHandlerSNSEvent.java
similarity index 100%
rename from lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/test/java/com/serverless/RequestHandlerSNSEvent.java
rename to lib/plugins/aws/invoke-local/runtime-wrappers/java/src/test/java/com/serverless/RequestHandlerSNSEvent.java
diff --git a/lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/test/java/com/serverless/RequestHandlerSQSEvent.java b/lib/plugins/aws/invoke-local/runtime-wrappers/java/src/test/java/com/serverless/RequestHandlerSQSEvent.java
similarity index 100%
rename from lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/test/java/com/serverless/RequestHandlerSQSEvent.java
rename to lib/plugins/aws/invoke-local/runtime-wrappers/java/src/test/java/com/serverless/RequestHandlerSQSEvent.java
diff --git a/lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/test/java/com/serverless/RequestHandlerScheduledEvent.java b/lib/plugins/aws/invoke-local/runtime-wrappers/java/src/test/java/com/serverless/RequestHandlerScheduledEvent.java
similarity index 100%
rename from lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/test/java/com/serverless/RequestHandlerScheduledEvent.java
rename to lib/plugins/aws/invoke-local/runtime-wrappers/java/src/test/java/com/serverless/RequestHandlerScheduledEvent.java
diff --git a/lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/test/java/com/serverless/RequestStreamHandler.java b/lib/plugins/aws/invoke-local/runtime-wrappers/java/src/test/java/com/serverless/RequestStreamHandler.java
similarity index 100%
rename from lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/test/java/com/serverless/RequestStreamHandler.java
rename to lib/plugins/aws/invoke-local/runtime-wrappers/java/src/test/java/com/serverless/RequestStreamHandler.java
diff --git a/lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/test/resources/api-gateway-proxy-request-event.json b/lib/plugins/aws/invoke-local/runtime-wrappers/java/src/test/resources/api-gateway-proxy-request-event.json
similarity index 100%
rename from lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/test/resources/api-gateway-proxy-request-event.json
rename to lib/plugins/aws/invoke-local/runtime-wrappers/java/src/test/resources/api-gateway-proxy-request-event.json
diff --git a/lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/test/resources/api-gateway-v2-http-event.json b/lib/plugins/aws/invoke-local/runtime-wrappers/java/src/test/resources/api-gateway-v2-http-event.json
similarity index 100%
rename from lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/test/resources/api-gateway-v2-http-event.json
rename to lib/plugins/aws/invoke-local/runtime-wrappers/java/src/test/resources/api-gateway-v2-http-event.json
diff --git a/lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/test/resources/api-gateway-v2-websocket-event.json b/lib/plugins/aws/invoke-local/runtime-wrappers/java/src/test/resources/api-gateway-v2-websocket-event.json
similarity index 100%
rename from lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/test/resources/api-gateway-v2-websocket-event.json
rename to lib/plugins/aws/invoke-local/runtime-wrappers/java/src/test/resources/api-gateway-v2-websocket-event.json
diff --git a/lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/test/resources/application-load-balancer-request-event.json b/lib/plugins/aws/invoke-local/runtime-wrappers/java/src/test/resources/application-load-balancer-request-event.json
similarity index 100%
rename from lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/test/resources/application-load-balancer-request-event.json
rename to lib/plugins/aws/invoke-local/runtime-wrappers/java/src/test/resources/application-load-balancer-request-event.json
diff --git a/lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/test/resources/cloud-front-event.json b/lib/plugins/aws/invoke-local/runtime-wrappers/java/src/test/resources/cloud-front-event.json
similarity index 100%
rename from lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/test/resources/cloud-front-event.json
rename to lib/plugins/aws/invoke-local/runtime-wrappers/java/src/test/resources/cloud-front-event.json
diff --git a/lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/test/resources/cloud-watch-logs-event-decoded.json b/lib/plugins/aws/invoke-local/runtime-wrappers/java/src/test/resources/cloud-watch-logs-event-decoded.json
similarity index 100%
rename from lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/test/resources/cloud-watch-logs-event-decoded.json
rename to lib/plugins/aws/invoke-local/runtime-wrappers/java/src/test/resources/cloud-watch-logs-event-decoded.json
diff --git a/lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/test/resources/cloud-watch-logs-event.json b/lib/plugins/aws/invoke-local/runtime-wrappers/java/src/test/resources/cloud-watch-logs-event.json
similarity index 100%
rename from lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/test/resources/cloud-watch-logs-event.json
rename to lib/plugins/aws/invoke-local/runtime-wrappers/java/src/test/resources/cloud-watch-logs-event.json
diff --git a/lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/test/resources/code-commit-event.json b/lib/plugins/aws/invoke-local/runtime-wrappers/java/src/test/resources/code-commit-event.json
similarity index 100%
rename from lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/test/resources/code-commit-event.json
rename to lib/plugins/aws/invoke-local/runtime-wrappers/java/src/test/resources/code-commit-event.json
diff --git a/lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/test/resources/cognito-event.json b/lib/plugins/aws/invoke-local/runtime-wrappers/java/src/test/resources/cognito-event.json
similarity index 100%
rename from lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/test/resources/cognito-event.json
rename to lib/plugins/aws/invoke-local/runtime-wrappers/java/src/test/resources/cognito-event.json
diff --git a/lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/test/resources/config-event.json b/lib/plugins/aws/invoke-local/runtime-wrappers/java/src/test/resources/config-event.json
similarity index 100%
rename from lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/test/resources/config-event.json
rename to lib/plugins/aws/invoke-local/runtime-wrappers/java/src/test/resources/config-event.json
diff --git a/lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/test/resources/dynamo-event.json b/lib/plugins/aws/invoke-local/runtime-wrappers/java/src/test/resources/dynamo-event.json
similarity index 100%
rename from lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/test/resources/dynamo-event.json
rename to lib/plugins/aws/invoke-local/runtime-wrappers/java/src/test/resources/dynamo-event.json
diff --git a/lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/test/resources/iot-button-event.json b/lib/plugins/aws/invoke-local/runtime-wrappers/java/src/test/resources/iot-button-event.json
similarity index 100%
rename from lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/test/resources/iot-button-event.json
rename to lib/plugins/aws/invoke-local/runtime-wrappers/java/src/test/resources/iot-button-event.json
diff --git a/lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/test/resources/kinesis-event.json b/lib/plugins/aws/invoke-local/runtime-wrappers/java/src/test/resources/kinesis-event.json
similarity index 100%
rename from lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/test/resources/kinesis-event.json
rename to lib/plugins/aws/invoke-local/runtime-wrappers/java/src/test/resources/kinesis-event.json
diff --git a/lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/test/resources/kinesis-firehose-event.json b/lib/plugins/aws/invoke-local/runtime-wrappers/java/src/test/resources/kinesis-firehose-event.json
similarity index 100%
rename from lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/test/resources/kinesis-firehose-event.json
rename to lib/plugins/aws/invoke-local/runtime-wrappers/java/src/test/resources/kinesis-firehose-event.json
diff --git a/lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/test/resources/lex-event.json b/lib/plugins/aws/invoke-local/runtime-wrappers/java/src/test/resources/lex-event.json
similarity index 100%
rename from lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/test/resources/lex-event.json
rename to lib/plugins/aws/invoke-local/runtime-wrappers/java/src/test/resources/lex-event.json
diff --git a/lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/test/resources/s3-event.json b/lib/plugins/aws/invoke-local/runtime-wrappers/java/src/test/resources/s3-event.json
similarity index 100%
rename from lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/test/resources/s3-event.json
rename to lib/plugins/aws/invoke-local/runtime-wrappers/java/src/test/resources/s3-event.json
diff --git a/lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/test/resources/scheduled-event.json b/lib/plugins/aws/invoke-local/runtime-wrappers/java/src/test/resources/scheduled-event.json
similarity index 100%
rename from lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/test/resources/scheduled-event.json
rename to lib/plugins/aws/invoke-local/runtime-wrappers/java/src/test/resources/scheduled-event.json
diff --git a/lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/test/resources/sns-event.json b/lib/plugins/aws/invoke-local/runtime-wrappers/java/src/test/resources/sns-event.json
similarity index 100%
rename from lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/test/resources/sns-event.json
rename to lib/plugins/aws/invoke-local/runtime-wrappers/java/src/test/resources/sns-event.json
diff --git a/lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/test/resources/sqs-event.json b/lib/plugins/aws/invoke-local/runtime-wrappers/java/src/test/resources/sqs-event.json
similarity index 100%
rename from lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/test/resources/sqs-event.json
rename to lib/plugins/aws/invoke-local/runtime-wrappers/java/src/test/resources/sqs-event.json
diff --git a/lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/test/resources/test.json b/lib/plugins/aws/invoke-local/runtime-wrappers/java/src/test/resources/test.json
similarity index 100%
rename from lib/plugins/aws/invokeLocal/runtimeWrappers/java/src/test/resources/test.json
rename to lib/plugins/aws/invoke-local/runtime-wrappers/java/src/test/resources/test.json
diff --git a/lib/plugins/aws/invoke.js b/lib/plugins/aws/invoke.js
index 91b14a8b643..43c86b2a5ff 100644
--- a/lib/plugins/aws/invoke.js
+++ b/lib/plugins/aws/invoke.js
@@ -1,11 +1,11 @@
 'use strict';
 
-const chalk = require('chalk');
 const path = require('path');
 const validate = require('./lib/validate');
 const stdin = require('get-stdin');
-const formatLambdaLogEvent = require('./utils/formatLambdaLogEvent');
+const formatLambdaLogEvent = require('./utils/format-lambda-log-event');
 const ServerlessError = require('../../serverless-error');
+const { writeText, style } = require('@serverless/utils/log');
 
 class AwsInvoke {
   constructor(serverless, options) {
@@ -101,30 +101,26 @@ class AwsInvoke {
   }
 
   log(invocationReply) {
-    const color = !invocationReply.FunctionError ? (x) => x : chalk.red;
-
     if (invocationReply.Payload) {
       const response = JSON.parse(invocationReply.Payload);
 
-      this.consoleLog(color(JSON.stringify(response, null, 4)));
+      writeText(JSON.stringify(response, null, 4));
     }
 
     if (invocationReply.LogResult) {
-      this.consoleLog(
-        chalk.gray('--------------------------------------------------------------------')
+      writeText(
+        style.aside('--------------------------------------------------------------------')
       );
       const logResult = Buffer.from(invocationReply.LogResult, 'base64').toString();
-      logResult.split('\n').forEach((line) => this.consoleLog(formatLambdaLogEvent(line)));
+      logResult.split('\n').forEach((line) => {
+        writeText(formatLambdaLogEvent(line));
+      });
     }
 
     if (invocationReply.FunctionError) {
-      throw new Error('Invoked function failed');
+      throw new ServerlessError('Invoked function failed', 'AWS_LAMBDA_INVOCATION_FAILED');
     }
   }
-
-  consoleLog(msg) {
-    process.stdout.write(`${msg}\n`);
-  }
 }
 
 module.exports = AwsInvoke;
diff --git a/lib/plugins/aws/invokeLocal/.gitignore b/lib/plugins/aws/invokeLocal/.gitignore
deleted file mode 100644
index 4a2ef9ce0f7..00000000000
--- a/lib/plugins/aws/invokeLocal/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-*.pyc
-runtimeWrappers/java/target
-runtimeWrappers/java/.project
-runtimeWrappers/java/.settings
-runtimeWrappers/java/.classpath
diff --git a/lib/plugins/aws/invokeLocal/fixture/asyncHandlerWithError.js b/lib/plugins/aws/invokeLocal/fixture/asyncHandlerWithError.js
deleted file mode 100644
index 854b89bdffb..00000000000
--- a/lib/plugins/aws/invokeLocal/fixture/asyncHandlerWithError.js
+++ /dev/null
@@ -1,7 +0,0 @@
-'use strict';
-
-module.exports.withError = () => new Error('failed');
-
-module.exports.withMessage = () => new Error('failed');
-
-module.exports.returnsError = () => new Error('failed');
diff --git a/lib/plugins/aws/invokeLocal/fixture/asyncHandlerWithSuccess.js b/lib/plugins/aws/invokeLocal/fixture/asyncHandlerWithSuccess.js
deleted file mode 100644
index 97ad5f24af6..00000000000
--- a/lib/plugins/aws/invokeLocal/fixture/asyncHandlerWithSuccess.js
+++ /dev/null
@@ -1,50 +0,0 @@
-'use strict';
-
-module.exports.withError = () => new Error('failed');
-
-module.exports.withMessage = () => 'Succeed';
-
-module.exports.withErrorByDone = (event, context) => {
-  context.done(new Error('failed'));
-
-  // this should not actually trigger a success
-  return 'this should not trigger';
-};
-
-module.exports.withMessageByDone = (event, context) => {
-  context.done(null, 'Succeed');
-  return 'this should not trigger';
-};
-
-module.exports.withMessageByCallback = (event, context, callback) => {
-  callback(null, 'Succeed');
-
-  return;
-};
-
-module.exports.withMessageAndDelayByCallback = (event, context, callback) => {
-  setTimeout(() => callback(null, 'Succeed'), 1);
-};
-
-module.exports.withMessageByLambdaProxy = () => ({
-  statusCode: 200,
-  headers: {
-    'Content-Type': 'application/json',
-  },
-  body: JSON.stringify({
-    result: true,
-    message: 'Whatever',
-  }),
-});
-
-module.exports.withRemainingTime = (event, context) => {
-  const start = context.getRemainingTimeInMillis();
-
-  const stopAt = new Date().getTime() + 1;
-  while (new Date().getTime() < stopAt);
-
-  return {
-    start,
-    stop: context.getRemainingTimeInMillis(),
-  };
-};
diff --git a/lib/plugins/aws/invokeLocal/fixture/handler.rb b/lib/plugins/aws/invokeLocal/fixture/handler.rb
deleted file mode 100644
index 5bb48c10966..00000000000
--- a/lib/plugins/aws/invokeLocal/fixture/handler.rb
+++ /dev/null
@@ -1,19 +0,0 @@
-def withRemainingTime(event:, context:)
-  start = context.get_remaining_time_in_millis()
-  sleep(0.001)
-  stop = context.get_remaining_time_in_millis()
-
-  {"start" => start, "stop" => stop}
-end
-
-def withDeadlineMs(event:, context:)
-  {"deadlineMs" => context.deadline_ms}
-end
-
-module MyModule
-  class MyClass
-    def self.my_class_method(event:, context:)
-      {"foo" => "bar"}
-    end
-  end
-end
diff --git a/lib/plugins/aws/invokeLocal/fixture/handlerWithError.js b/lib/plugins/aws/invokeLocal/fixture/handlerWithError.js
deleted file mode 100644
index c20d1810705..00000000000
--- a/lib/plugins/aws/invokeLocal/fixture/handlerWithError.js
+++ /dev/null
@@ -1,9 +0,0 @@
-'use strict';
-
-module.exports.withError = (event, context, callback) => {
-  callback(new Error('failed'));
-};
-
-module.exports.withMessage = (event, context, callback) => {
-  callback('failed');
-};
diff --git a/lib/plugins/aws/invokeLocal/fixture/handlerWithInitializationError.js b/lib/plugins/aws/invokeLocal/fixture/handlerWithInitializationError.js
deleted file mode 100644
index aa92137d266..00000000000
--- a/lib/plugins/aws/invokeLocal/fixture/handlerWithInitializationError.js
+++ /dev/null
@@ -1,3 +0,0 @@
-'use strict';
-
-throw new Error('Initialization failed');
diff --git a/lib/plugins/aws/invokeLocal/fixture/handlerWithLoadingError.js b/lib/plugins/aws/invokeLocal/fixture/handlerWithLoadingError.js
deleted file mode 100644
index a945eb0fdf1..00000000000
--- a/lib/plugins/aws/invokeLocal/fixture/handlerWithLoadingError.js
+++ /dev/null
@@ -1,2 +0,0 @@
-'use strict';
-throw new Error('loading exception');
diff --git a/lib/plugins/aws/invokeLocal/fixture/handlerWithSuccess.js b/lib/plugins/aws/invokeLocal/fixture/handlerWithSuccess.js
deleted file mode 100644
index 6fbc7750f56..00000000000
--- a/lib/plugins/aws/invokeLocal/fixture/handlerWithSuccess.js
+++ /dev/null
@@ -1,36 +0,0 @@
-'use strict';
-
-module.exports.withErrorByDone = (event, context) => {
-  context.done(new Error('failed'));
-};
-
-module.exports.withMessageByReturn = () => 'Succeed';
-
-module.exports.withMessageByDone = (event, context) => {
-  context.done(null, 'Succeed');
-};
-
-module.exports.withMessageByLambdaProxy = (event, context) => {
-  context.done(null, {
-    statusCode: 200,
-    headers: {
-      'Content-Type': 'application/json',
-    },
-    body: JSON.stringify({
-      result: true,
-      message: 'Whatever',
-    }),
-  });
-};
-
-module.exports.withRemainingTime = (event, context) => {
-  const start = context.getRemainingTimeInMillis();
-
-  const stopAt = new Date().getTime() + 1;
-  while (new Date().getTime() < stopAt);
-
-  context.done(null, {
-    start,
-    stop: context.getRemainingTimeInMillis(),
-  });
-};
diff --git a/lib/plugins/aws/lib/check-if-bucket-exists.js b/lib/plugins/aws/lib/check-if-bucket-exists.js
new file mode 100644
index 00000000000..269b1541247
--- /dev/null
+++ b/lib/plugins/aws/lib/check-if-bucket-exists.js
@@ -0,0 +1,18 @@
+'use strict';
+
+module.exports = {
+  async checkIfBucketExists(bucketName) {
+    try {
+      await this.provider.request('S3', 'headBucket', {
+        Bucket: bucketName,
+      });
+      return true;
+    } catch (err) {
+      if (err.code === 'AWS_S3_HEAD_BUCKET_NOT_FOUND') {
+        return false;
+      }
+
+      throw err;
+    }
+  },
+};
diff --git a/lib/plugins/aws/lib/checkIfEcrRepositoryExists.js b/lib/plugins/aws/lib/check-if-ecr-repository-exists.js
similarity index 76%
rename from lib/plugins/aws/lib/checkIfEcrRepositoryExists.js
rename to lib/plugins/aws/lib/check-if-ecr-repository-exists.js
index 3b7f18944b3..0253a87984e 100644
--- a/lib/plugins/aws/lib/checkIfEcrRepositoryExists.js
+++ b/lib/plugins/aws/lib/check-if-ecr-repository-exists.js
@@ -1,5 +1,7 @@
 'use strict';
 
+const { log } = require('@serverless/utils/log');
+
 module.exports = {
   async checkIfEcrRepositoryExists() {
     const registryId = await this.provider.getAccountId();
@@ -16,10 +18,8 @@ module.exports = {
       }
       if (err.providerError && err.providerError.code === 'AccessDeniedException') {
         if (this.serverless.service.provider.ecr && this.serverless.service.provider.ecr.images) {
-          this.serverless.cli.log(
-            'WARNING: Could not access ECR repository due to denied access, but there are images defined in `provider.ecr`. ECR repository removal will be skipped.',
-            'Serverless',
-            { color: 'orange' }
+          log.warning(
+            'Could not access ECR repository due to denied access, but there are images defined in "provider.ecr". ECR repository removal will be skipped.'
           );
         }
         // Check if user has images defined and issue warning that we could not
diff --git a/lib/plugins/aws/lib/get-create-change-set-params.js b/lib/plugins/aws/lib/get-create-change-set-params.js
new file mode 100644
index 00000000000..4d78461dad7
--- /dev/null
+++ b/lib/plugins/aws/lib/get-create-change-set-params.js
@@ -0,0 +1,80 @@
+'use strict';
+
+module.exports = {
+  getCreateChangeSetParams({ changeSetType, templateUrl, templateBody }) {
+    let stackTags = { STAGE: this.provider.getStage() };
+    const stackName = this.provider.naming.getStackName();
+    const changeSetName = this.provider.naming.getStackChangeSetName();
+
+    // Merge additional stack tags
+    if (this.serverless.service.provider.stackTags) {
+      const customKeys = Object.keys(this.serverless.service.provider.stackTags);
+      const collisions = Object.keys(stackTags).filter((defaultKey) =>
+        customKeys.some((key) => defaultKey.toLowerCase() === key.toLowerCase())
+      );
+
+      // Delete collisions upfront
+      for (const key of collisions) {
+        delete stackTags[key];
+      }
+
+      stackTags = Object.assign(stackTags, this.serverless.service.provider.stackTags);
+    }
+
+    const createChangeSetParams = {
+      StackName: stackName,
+      ChangeSetName: changeSetName,
+      ChangeSetType: changeSetType,
+      Capabilities: ['CAPABILITY_IAM', 'CAPABILITY_NAMED_IAM'],
+      Parameters: [],
+      Tags: Object.keys(stackTags).map((key) => ({ Key: key, Value: stackTags[key] })),
+    };
+
+    if (templateUrl) {
+      createChangeSetParams.TemplateURL = templateUrl;
+    }
+
+    if (templateBody) {
+      createChangeSetParams.TemplateBody = JSON.stringify(templateBody);
+    }
+
+    if (
+      (templateUrl &&
+        this.serverless.service.provider.compiledCloudFormationTemplate &&
+        this.serverless.service.provider.compiledCloudFormationTemplate.Transform) ||
+      (templateBody && templateBody.Transform)
+    ) {
+      createChangeSetParams.Capabilities.push('CAPABILITY_AUTO_EXPAND');
+    }
+
+    const customDeploymentRole = this.provider.getCustomDeploymentRole();
+    if (customDeploymentRole) {
+      createChangeSetParams.RoleARN = customDeploymentRole;
+    }
+
+    if (this.serverless.service.provider.notificationArns) {
+      createChangeSetParams.NotificationARNs = this.serverless.service.provider.notificationArns;
+    }
+
+    if (this.serverless.service.provider.stackParameters) {
+      createChangeSetParams.Parameters = this.serverless.service.provider.stackParameters;
+    }
+
+    // Policy must have at least one statement, otherwise no updates would be possible at all
+    if (
+      this.serverless.service.provider.stackPolicy &&
+      Object.keys(this.serverless.service.provider.stackPolicy).length
+    ) {
+      createChangeSetParams.StackPolicyBody = JSON.stringify({
+        Statement: this.serverless.service.provider.stackPolicy,
+      });
+    }
+
+    if (this.serverless.service.provider.rollbackConfiguration) {
+      createChangeSetParams.RollbackConfiguration =
+        this.serverless.service.provider.rollbackConfiguration;
+    }
+
+    return createChangeSetParams;
+  },
+};
diff --git a/lib/plugins/aws/lib/get-execute-change-set-params.js b/lib/plugins/aws/lib/get-execute-change-set-params.js
new file mode 100644
index 00000000000..37cb21ebd32
--- /dev/null
+++ b/lib/plugins/aws/lib/get-execute-change-set-params.js
@@ -0,0 +1,19 @@
+'use strict';
+
+module.exports = {
+  getExecuteChangeSetParams() {
+    const stackName = this.provider.naming.getStackName();
+    const changeSetName = this.provider.naming.getStackChangeSetName();
+
+    const executeChangeSetParams = {
+      StackName: stackName,
+      ChangeSetName: changeSetName,
+    };
+
+    if (this.serverless.service.provider.disableRollback) {
+      executeChangeSetParams.DisableRollback = this.serverless.service.provider.disableRollback;
+    }
+
+    return executeChangeSetParams;
+  },
+};
diff --git a/lib/plugins/aws/lib/getServiceState.js b/lib/plugins/aws/lib/get-service-state.js
similarity index 100%
rename from lib/plugins/aws/lib/getServiceState.js
rename to lib/plugins/aws/lib/get-service-state.js
diff --git a/lib/plugins/aws/lib/monitorStack.js b/lib/plugins/aws/lib/monitor-stack.js
similarity index 51%
rename from lib/plugins/aws/lib/monitorStack.js
rename to lib/plugins/aws/lib/monitor-stack.js
index 7794d393063..336e7fd946c 100644
--- a/lib/plugins/aws/lib/monitorStack.js
+++ b/lib/plugins/aws/lib/monitor-stack.js
@@ -1,21 +1,40 @@
 'use strict';
 
 const BbPromise = require('bluebird');
-const chalk = require('chalk');
 const wait = require('timers-ext/promise/sleep');
 const ServerlessError = require('../../../serverless-error');
+const { log, style, progress } = require('@serverless/utils/log');
+const getMonitoringFrequency = require('../utils/get-monitoring-frequency');
 
+const mainProgress = progress.get('main');
 const validStatuses = new Set(['CREATE_COMPLETE', 'UPDATE_COMPLETE', 'DELETE_COMPLETE']);
 
+const normalizerPattern = /(?<!^)([A-Z])/g;
+const resourceTypePattern = /^(?<domain>[^:]+)::(?<service>[^:]+)(?:::(?<method>.+))?$/;
+const resourceTypeToErrorCodePostfix = (resourceType) => {
+  const { domain, service, method } = resourceType.match(resourceTypePattern).groups;
+  if (domain !== 'AWS') return `_${domain.replace(normalizerPattern, '_$1').toUpperCase()}`;
+  return `_${service.replace(normalizerPattern, '_$1')}_${method.replace(
+    normalizerPattern,
+    '_$1'
+  )}`.toUpperCase();
+};
+
 module.exports = {
   async checkStackProgress(
     action,
     cfData,
     stackUrl,
     options,
-    { loggedEventIds = new Set(), stackStatus = null, stackLatestError = null, firstEventId = null }
+    {
+      loggedEventIds = new Set(),
+      stackStatus = null,
+      stackLatestError = null,
+      firstEventId = null,
+      completedResources = new Set(),
+    }
   ) {
-    return wait(options.frequency || process.env.SLS_AWS_MONITORING_FREQUENCY || 5000)
+    return wait(getMonitoringFrequency(options.frequency))
       .then(() =>
         this.provider
           .request('CloudFormation', 'describeStackEvents', { StackName: cfData.StackId })
@@ -40,7 +59,7 @@ module.exports = {
               // Loop through stack events
               stackEvents.forEach((event) => {
                 if (loggedEventIds.has(event.EventId)) return;
-                let eventStatus = event.ResourceStatus || null;
+                const eventStatus = event.ResourceStatus || null;
                 // Keep track of stack status
                 if (
                   event.ResourceType === 'AWS::CloudFormation::Stack' &&
@@ -58,21 +77,31 @@ module.exports = {
                   stackLatestError = event;
                 }
                 // Log stack events
-                if (this.options.verbose) {
-                  if (eventStatus && eventStatus.endsWith('FAILED')) {
-                    eventStatus = chalk.red(eventStatus);
-                  } else if (eventStatus && eventStatus.endsWith('PROGRESS')) {
-                    eventStatus = chalk.yellow(eventStatus);
-                  } else if (eventStatus && eventStatus.endsWith('COMPLETE')) {
-                    eventStatus = chalk.green(eventStatus);
-                  }
-                  let eventLog = `CloudFormation - ${eventStatus} - `;
-                  eventLog += `${event.ResourceType} - `;
-                  eventLog += `${event.LogicalResourceId}`;
-                  this.serverless.cli.consoleLog(eventLog);
-                } else {
-                  this.serverless.cli.printDot();
+                log.info(
+                  style.aside(
+                    `  ${eventStatus} - ${event.ResourceType} - ${event.LogicalResourceId}`
+                  )
+                );
+
+                if (
+                  event.ResourceType !== 'AWS::CloudFormation::Stack' &&
+                  eventStatus &&
+                  eventStatus.endsWith('COMPLETE')
+                ) {
+                  completedResources.add(event.LogicalResourceId);
+                }
+
+                if (action !== 'delete' && cfData.Changes) {
+                  const progressMessagePrefix = (() => {
+                    if (action === 'create') return 'Creating';
+                    if (action === 'update') return 'Updating';
+                    throw new Error(`Unrecgonized action: ${action}`);
+                  })();
+                  mainProgress.notice(
+                    `${progressMessagePrefix} CloudFormation stack (${completedResources.size}/${cfData.Changes.length})`
+                  );
                 }
+
                 // Prepare for next monitoring action
                 loggedEventIds.add(event.EventId);
               });
@@ -84,25 +113,50 @@ module.exports = {
                     (stackStatus.endsWith('ROLLBACK_COMPLETE') ||
                       ['DELETE_FAILED', 'DELETE_COMPLETE'].includes(stackStatus))))
               ) {
-                // empty console.log for a prettier output
-                if (!this.options.verbose) this.serverless.cli.consoleLog('');
-                this.serverless.cli.log('Operation failed!');
-                this.serverless.cli.log(`View the full error output: ${stackUrl}`);
+                const decoratedErrorMessage = `${stackLatestError.ResourceStatus}: ${
+                  stackLatestError.LogicalResourceId
+                } ${style.aside(`(${stackLatestError.ResourceType})`)}\n${
+                  stackLatestError.ResourceStatusReason
+                }\n\n${style.aside(`View the full error: ${style.link(stackUrl)}`)}`;
+
                 let errorMessage = 'An error occurred: ';
                 errorMessage += `${stackLatestError.LogicalResourceId} - `;
-                errorMessage += `${stackLatestError.ResourceStatusReason}.`;
-                throw new ServerlessError(errorMessage);
+                errorMessage += `${
+                  stackLatestError.ResourceStatusReason || stackLatestError.ResourceStatus
+                }.`;
+                const errorCode = (() => {
+                  if (stackLatestError.ResourceStatusReason) {
+                    if (
+                      stackLatestError.ResourceStatusReason.startsWith(
+                        'Properties validation failed'
+                      )
+                    ) {
+                      return `AWS_CLOUD_FORMATION_${action.toUpperCase()}_STACK_INTERNAL_VALIDATION_ERROR`;
+                    }
+                    if (
+                      stackLatestError.ResourceStatusReason.includes('is not authorized to perform')
+                    ) {
+                      return `AWS_CLOUD_FORMATION_${action.toUpperCase()}_STACK_INTERNAL_INSUFFICIENT_PERMISSIONS`;
+                    }
+                  }
+                  return (
+                    `AWS_CLOUD_FORMATION_${action.toUpperCase()}_STACK_INTERNAL` +
+                    `${resourceTypeToErrorCodePostfix(stackLatestError.ResourceType)}_${
+                      stackLatestError.ResourceStatus
+                    }`
+                  );
+                })();
+                throw new ServerlessError(errorMessage, errorCode, {
+                  decoratedMessage: decoratedErrorMessage,
+                });
               }
             },
             (e) => {
               if (action === 'delete' && e.message.includes('does not exist')) {
-                // empty console.log for a prettier output
-                if (!this.options.verbose) this.serverless.cli.consoleLog('');
-                this.serverless.cli.log(`Stack ${action} finished...`);
                 stackStatus = 'DELETE_COMPLETE';
                 return;
               }
-              throw new ServerlessError(e.message);
+              throw e;
             }
           )
       )
@@ -113,6 +167,7 @@ module.exports = {
           stackStatus,
           stackLatestError,
           firstEventId,
+          completedResources,
         });
       });
   },
@@ -128,13 +183,6 @@ module.exports = {
 
     // Monitor stack creation/update/removal
 
-    this.serverless.cli.log(`Checking Stack ${action} progress...`);
-
-    return this.checkStackProgress(action, cfData, stackUrl, options, {}).then((stackStatus) => {
-      // empty console.log for a prettier output
-      if (!this.options.verbose) this.serverless.cli.consoleLog('');
-      this.serverless.cli.log(`Stack ${action} finished...`);
-      return stackStatus;
-    });
+    return this.checkStackProgress(action, cfData, stackUrl, options, {});
   },
 };
diff --git a/lib/plugins/aws/lib/naming.js b/lib/plugins/aws/lib/naming.js
index 7893a57e17f..d6fdd19c666 100644
--- a/lib/plugins/aws/lib/naming.js
+++ b/lib/plugins/aws/lib/naming.js
@@ -58,6 +58,10 @@ module.exports = {
     return `${this.provider.serverless.service.service}-${this.provider.getStage()}`;
   },
 
+  getStackChangeSetName() {
+    return `${this.getStackName()}-change-set`;
+  },
+
   getServiceArtifactName() {
     return `${this.provider.serverless.service.service}.zip`;
   },
@@ -88,7 +92,8 @@ module.exports = {
 
   // Role
   getRolePath() {
-    return '/';
+    const customRolePath = _.get(this.provider, 'serverless.service.provider.iam.role.path');
+    return customRolePath || '/';
   },
   getRoleName() {
     const customRoleName = _.get(this.provider, 'serverless.service.provider.iam.role.name');
@@ -138,7 +143,7 @@ module.exports = {
   extractAuthorizerNameFromArn(functionArn) {
     const splitArn = functionArn.split(':');
     // TODO the following two lines assumes default function naming?  Is there a better way?
-    // TODO (see ~/lib/classes/Service.js:~155)
+    // TODO (see ~/lib/classes/service.js:~155)
     const splitName = splitArn[splitArn.length - 1].split('-');
     return splitName[splitName.length - 1];
   },
@@ -439,6 +444,22 @@ module.exports = {
     return `${normalizedFunctionName}EventSourceMappingKafka${normalizedTopicName}`;
   },
 
+  // ActiveMQ
+  getActiveMQEventLogicalId(functionName, queueName) {
+    const normalizedFunctionName = this.getNormalizedFunctionName(functionName);
+    // QueueName is trimmed to 150 chars to avoid going over 255 character limit
+    const normalizedQueueName = this.normalizeNameToAlphaNumericOnly(queueName).slice(0, 150);
+    return `${normalizedFunctionName}EventSourceMappingActiveMQ${normalizedQueueName}`;
+  },
+
+  // RabbitMQ
+  getRabbitMQEventLogicalId(functionName, queueName) {
+    const normalizedFunctionName = this.getNormalizedFunctionName(functionName);
+    // QueueName is trimmed to 150 chars to avoid going over 255 character limit
+    const normalizedQueueName = this.normalizeNameToAlphaNumericOnly(queueName).slice(0, 150);
+    return `${normalizedFunctionName}EventSourceMappingRabbitMQ${normalizedQueueName}`;
+  },
+
   // ALB
   getAlbTargetGroupLogicalId(functionName, albId, multiValueHeaders) {
     return `${this.getNormalizedFunctionName(functionName)}Alb${
@@ -518,7 +539,7 @@ module.exports = {
       functionName
     )}LambdaPermissionCognitoUserPool${this.normalizeNameToAlphaNumericOnly(
       poolId
-    )}TriggerSource${triggerSource}`;
+    )}TriggerSource${this.normalizeNameToAlphaNumericOnly(triggerSource)}`;
   },
   getLambdaAlbPermissionLogicalId(functionName) {
     return `${this.getNormalizedFunctionName(functionName)}LambdaPermissionAlb`;
@@ -651,7 +672,10 @@ module.exports = {
     ) {
       return `${String(this.provider.serverless.service.provider.httpApi.name)}`;
     }
-    return `${this.provider.getStage()}-${this.provider.serverless.service.service}`;
+
+    return _.get(this.provider.serverless.service.provider.httpApi, 'shouldStartNameWithService')
+      ? `${this.provider.serverless.service.service}-${this.provider.getStage()}`
+      : `${this.provider.getStage()}-${this.provider.serverless.service.service}`;
   },
   getHttpApiLogicalId() {
     return 'HttpApi';
diff --git a/lib/plugins/aws/lib/normalizeFiles.js b/lib/plugins/aws/lib/normalize-files.js
similarity index 75%
rename from lib/plugins/aws/lib/normalizeFiles.js
rename to lib/plugins/aws/lib/normalize-files.js
index 0672ebb7b52..06973fc1ffe 100644
--- a/lib/plugins/aws/lib/normalizeFiles.js
+++ b/lib/plugins/aws/lib/normalize-files.js
@@ -1,6 +1,6 @@
 'use strict';
 
-const deepSortObjectByKey = require('../../../utils/deepSortObjectByKey');
+const deepSortObjectByKey = require('../../../utils/deep-sort-object-by-key');
 const _ = require('lodash');
 
 module.exports = {
@@ -18,15 +18,19 @@ module.exports = {
           WebsocketsDeployment: normalizedTemplate.Resources[key],
         })[key];
       }
-      if (key === 'WebsocketsDeploymentStage') {
+      if (key === 'WebsocketsDeploymentStage' && _.get(value.Properties, 'DeploymentId')) {
         const newVal = value;
         newVal.Properties.DeploymentId.Ref = 'WebsocketsDeployment';
       }
-      if (value.Type && value.Type === 'AWS::Lambda::Function') {
+      if (value.Type && value.Type === 'AWS::Lambda::Function' && _.get(value.Properties, 'Code')) {
         const newVal = value;
         newVal.Properties.Code.S3Key = '';
       }
-      if (value.Type && value.Type === 'AWS::Lambda::LayerVersion') {
+      if (
+        value.Type &&
+        value.Type === 'AWS::Lambda::LayerVersion' &&
+        _.get(value.Properties, 'Content')
+      ) {
         const newVal = value;
         newVal.Properties.Content.S3Key = '';
       }
diff --git a/lib/plugins/aws/lib/setBucketName.js b/lib/plugins/aws/lib/set-bucket-name.js
similarity index 100%
rename from lib/plugins/aws/lib/setBucketName.js
rename to lib/plugins/aws/lib/set-bucket-name.js
diff --git a/lib/plugins/aws/lib/update-stack.js b/lib/plugins/aws/lib/update-stack.js
new file mode 100644
index 00000000000..68a5ecce60e
--- /dev/null
+++ b/lib/plugins/aws/lib/update-stack.js
@@ -0,0 +1,110 @@
+'use strict';
+
+const BbPromise = require('bluebird');
+const getS3EndpointForRegion = require('../utils/get-s3-endpoint-for-region');
+const { log, progress } = require('@serverless/utils/log');
+const isChangeSetWithoutChanges = require('../utils/is-change-set-without-changes');
+
+module.exports = {
+  async createFallback() {
+    this.createLater = false;
+    progress.get('main').notice('Creating CloudFormation stack', { isMainEvent: true });
+
+    const stackName = this.provider.naming.getStackName();
+    const changeSetName = this.provider.naming.getStackChangeSetName();
+
+    const compiledTemplateFileName = this.provider.naming.getCompiledTemplateS3Suffix();
+    const s3Endpoint = getS3EndpointForRegion(this.provider.getRegion());
+    const templateUrl = `https://${s3Endpoint}/${this.bucketName}/${this.serverless.service.package.artifactDirectoryName}/${compiledTemplateFileName}`;
+
+    const createChangeSetParams = this.getCreateChangeSetParams({
+      changeSetType: 'CREATE',
+      templateUrl,
+    });
+
+    const executeChangeSetParams = this.getExecuteChangeSetParams();
+
+    // Create new change set
+    this.provider.didCreateService = true;
+    log.info('Creating new change set');
+    await this.provider.request('CloudFormation', 'createChangeSet', createChangeSetParams);
+
+    // Wait for changeset to be created
+    log.info('Waiting for new change set to be created');
+    const changeSetDescription = await this.waitForChangeSetCreation(changeSetName, stackName);
+
+    // Check if stack has changes
+    if (isChangeSetWithoutChanges(changeSetDescription)) {
+      // Cleanup changeset when it does not include any changes
+      log.info('Created change set does not include any changes, removing it');
+      await this.provider.request('CloudFormation', 'deleteChangeSet', {
+        StackName: stackName,
+        ChangeSetName: changeSetName,
+      });
+      this.serverless.service.provider.deploymentWithEmptyChangeSet = true;
+      return false;
+    }
+
+    log.info('Executing created change set');
+    await this.provider.request('CloudFormation', 'executeChangeSet', executeChangeSetParams);
+    return await this.monitorStack('create', changeSetDescription);
+  },
+
+  async update() {
+    const compiledTemplateFileName = this.provider.naming.getCompiledTemplateS3Suffix();
+    const s3Endpoint = getS3EndpointForRegion(this.provider.getRegion());
+    const templateUrl = `https://${s3Endpoint}/${this.bucketName}/${this.serverless.service.package.artifactDirectoryName}/${compiledTemplateFileName}`;
+
+    const stackName = this.provider.naming.getStackName();
+    const changeSetName = this.provider.naming.getStackChangeSetName();
+
+    const createChangeSetParams = this.getCreateChangeSetParams({
+      changeSetType: 'UPDATE',
+      templateUrl,
+    });
+
+    const executeChangeSetParams = this.getExecuteChangeSetParams();
+
+    // Ensure that previous change set has been removed
+    await this.provider.request('CloudFormation', 'deleteChangeSet', {
+      StackName: stackName,
+      ChangeSetName: changeSetName,
+    });
+
+    // Create new change set
+    log.info('Creating new change set');
+    await this.provider.request('CloudFormation', 'createChangeSet', createChangeSetParams);
+
+    // Wait for changeset to be created
+    log.info('Waiting for new change set to be created');
+    const changeSetDescription = await this.waitForChangeSetCreation(changeSetName, stackName);
+
+    // Check if stack has changes
+    if (isChangeSetWithoutChanges(changeSetDescription)) {
+      // Cleanup changeset when it does not include any changes
+      log.info('Created change set does not include any changes, removing it');
+      await this.provider.request('CloudFormation', 'deleteChangeSet', {
+        StackName: stackName,
+        ChangeSetName: changeSetName,
+      });
+      this.serverless.service.provider.deploymentWithEmptyChangeSet = true;
+      return false;
+    }
+
+    log.info('Executing created change set');
+    await this.provider.request('CloudFormation', 'executeChangeSet', executeChangeSetParams);
+
+    await this.monitorStack('update', changeSetDescription);
+
+    return true;
+  },
+
+  async updateStack() {
+    return BbPromise.bind(this).then(() => {
+      if (this.createLater) {
+        return BbPromise.bind(this).then(this.createFallback);
+      }
+      return BbPromise.bind(this).then(this.update);
+    });
+  },
+};
diff --git a/lib/plugins/aws/lib/updateStack.js b/lib/plugins/aws/lib/updateStack.js
deleted file mode 100644
index 054bde3be4e..00000000000
--- a/lib/plugins/aws/lib/updateStack.js
+++ /dev/null
@@ -1,155 +0,0 @@
-'use strict';
-
-const BbPromise = require('bluebird');
-const getS3EndpointForRegion = require('../utils/getS3EndpointForRegion');
-
-const NO_UPDATE_MESSAGE = 'No updates are to be performed.';
-
-module.exports = {
-  async createFallback() {
-    this.createLater = false;
-    this.serverless.cli.log('Creating Stack...');
-
-    const stackName = this.provider.naming.getStackName();
-    let stackTags = { STAGE: this.provider.getStage() };
-    const compiledTemplateFileName = this.provider.naming.getCompiledTemplateS3Suffix();
-    const s3Endpoint = getS3EndpointForRegion(this.provider.getRegion());
-    const templateUrl = `https://${s3Endpoint}/${this.bucketName}/${this.serverless.service.package.artifactDirectoryName}/${compiledTemplateFileName}`;
-
-    // Merge additional stack tags
-    if (this.serverless.service.provider.stackTags) {
-      const customKeys = Object.keys(this.serverless.service.provider.stackTags);
-      const collisions = Object.keys(stackTags).filter((defaultKey) =>
-        customKeys.some((key) => defaultKey.toLowerCase() === key.toLowerCase())
-      );
-
-      // Delete collisions upfront
-      for (const key of collisions) {
-        delete stackTags[key];
-      }
-
-      stackTags = Object.assign(stackTags, this.serverless.service.provider.stackTags);
-    }
-
-    const params = {
-      StackName: stackName,
-      OnFailure: 'DELETE',
-      Capabilities: ['CAPABILITY_IAM', 'CAPABILITY_NAMED_IAM'],
-      Parameters: [],
-      TemplateURL: templateUrl,
-      Tags: Object.keys(stackTags).map((key) => ({ Key: key, Value: stackTags[key] })),
-    };
-
-    if (
-      this.serverless.service.provider.compiledCloudFormationTemplate &&
-      this.serverless.service.provider.compiledCloudFormationTemplate.Transform
-    ) {
-      params.Capabilities.push('CAPABILITY_AUTO_EXPAND');
-    }
-
-    const customDeploymentRole = this.provider.getCustomDeploymentRole();
-    if (customDeploymentRole) {
-      params.RoleARN = customDeploymentRole;
-    }
-
-    if (this.serverless.service.provider.notificationArns) {
-      params.NotificationARNs = this.serverless.service.provider.notificationArns;
-    }
-
-    if (this.serverless.service.provider.stackParameters) {
-      params.Parameters = this.serverless.service.provider.stackParameters;
-    }
-
-    return this.provider
-      .request('CloudFormation', 'createStack', params)
-      .then((cfData) => this.monitorStack('create', cfData));
-  },
-
-  async update() {
-    const compiledTemplateFileName = this.provider.naming.getCompiledTemplateS3Suffix();
-    const s3Endpoint = getS3EndpointForRegion(this.provider.getRegion());
-    const templateUrl = `https://${s3Endpoint}/${this.bucketName}/${this.serverless.service.package.artifactDirectoryName}/${compiledTemplateFileName}`;
-
-    this.serverless.cli.log('Updating Stack...');
-    const stackName = this.provider.naming.getStackName();
-    let stackTags = { STAGE: this.provider.getStage() };
-
-    // Merge additional stack tags
-    if (this.serverless.service.provider.stackTags) {
-      const customKeys = Object.keys(this.serverless.service.provider.stackTags);
-      const collisions = Object.keys(stackTags).filter((defaultKey) =>
-        customKeys.some((key) => defaultKey.toLowerCase() === key.toLowerCase())
-      );
-
-      // Delete collisions upfront
-      for (const key of collisions) {
-        delete stackTags[key];
-      }
-
-      stackTags = Object.assign(stackTags, this.serverless.service.provider.stackTags);
-    }
-
-    const params = {
-      StackName: stackName,
-      Capabilities: ['CAPABILITY_IAM', 'CAPABILITY_NAMED_IAM'],
-      Parameters: [],
-      TemplateURL: templateUrl,
-      Tags: Object.keys(stackTags).map((key) => ({ Key: key, Value: stackTags[key] })),
-    };
-
-    if (
-      this.serverless.service.provider.compiledCloudFormationTemplate &&
-      this.serverless.service.provider.compiledCloudFormationTemplate.Transform
-    ) {
-      params.Capabilities.push('CAPABILITY_AUTO_EXPAND');
-    }
-
-    const customDeploymentRole = this.provider.getCustomDeploymentRole();
-    if (customDeploymentRole) {
-      params.RoleARN = customDeploymentRole;
-    }
-
-    if (this.serverless.service.provider.notificationArns) {
-      params.NotificationARNs = this.serverless.service.provider.notificationArns;
-    }
-
-    if (this.serverless.service.provider.stackParameters) {
-      params.Parameters = this.serverless.service.provider.stackParameters;
-    }
-
-    // Policy must have at least one statement, otherwise no updates would be possible at all
-    if (
-      this.serverless.service.provider.stackPolicy &&
-      Object.keys(this.serverless.service.provider.stackPolicy).length
-    ) {
-      params.StackPolicyBody = JSON.stringify({
-        Statement: this.serverless.service.provider.stackPolicy,
-      });
-    }
-
-    if (this.serverless.service.provider.rollbackConfiguration) {
-      params.RollbackConfiguration = this.serverless.service.provider.rollbackConfiguration;
-    }
-
-    let cfData;
-    try {
-      cfData = await this.provider.request('CloudFormation', 'updateStack', params);
-    } catch (e) {
-      if (e.message.includes(NO_UPDATE_MESSAGE)) {
-        return;
-      }
-      throw e;
-    }
-
-    await this.monitorStack('update', cfData);
-  },
-
-  async updateStack() {
-    return BbPromise.bind(this).then(() => {
-      if (this.createLater) {
-        return BbPromise.bind(this).then(this.createFallback);
-      }
-      return BbPromise.bind(this).then(this.update);
-    });
-  },
-};
diff --git a/lib/plugins/aws/lib/validate.js b/lib/plugins/aws/lib/validate.js
index 53f0b8d1c39..68dca8f3d19 100644
--- a/lib/plugins/aws/lib/validate.js
+++ b/lib/plugins/aws/lib/validate.js
@@ -5,7 +5,10 @@ const ServerlessError = require('../../../serverless-error');
 module.exports = {
   validate() {
     if (!this.serverless.serviceDir) {
-      throw new ServerlessError('This command can only be run inside a service directory');
+      throw new ServerlessError(
+        'This command can only be run inside a service directory',
+        'MISSING_SERVICE_DIRECTORY'
+      );
     }
 
     this.options.stage = this.provider.getStage();
diff --git a/lib/plugins/aws/lib/wait-for-change-set-creation.js b/lib/plugins/aws/lib/wait-for-change-set-creation.js
new file mode 100644
index 00000000000..499fe40c2ca
--- /dev/null
+++ b/lib/plugins/aws/lib/wait-for-change-set-creation.js
@@ -0,0 +1,46 @@
+'use strict';
+
+const wait = require('timers-ext/promise/sleep');
+const ServerlessError = require('../../../serverless-error');
+const isChangeSetWithoutChanges = require('../utils/is-change-set-without-changes');
+const { log } = require('@serverless/utils/log');
+const getMonitoringFrequency = require('../utils/get-monitoring-frequency');
+
+module.exports = {
+  async waitForChangeSetCreation(changeSetName, stackName) {
+    const params = {
+      ChangeSetName: changeSetName,
+      StackName: stackName,
+    };
+
+    const callWithRetry = async () => {
+      const changeSetDescription = await this.provider.request(
+        'CloudFormation',
+        'describeChangeSet',
+        params
+      );
+      if (
+        changeSetDescription.Status === 'CREATE_COMPLETE' ||
+        isChangeSetWithoutChanges(changeSetDescription)
+      ) {
+        return changeSetDescription;
+      }
+
+      if (
+        changeSetDescription.Status === 'CREATE_PENDING' ||
+        changeSetDescription.Status === 'CREATE_IN_PROGRESS'
+      ) {
+        log.info('Change Set did not reach desired state, retrying');
+        await wait(getMonitoringFrequency());
+        return await callWithRetry();
+      }
+
+      throw new ServerlessError(
+        `Could not create Change Set "${changeSetDescription.ChangeSetName}" due to: ${changeSetDescription.StatusReason}`,
+        'AWS_CLOUD_FORMATION_CHANGE_SET_CREATION_FAILED'
+      );
+    };
+
+    return await callWithRetry();
+  },
+};
diff --git a/lib/plugins/aws/logs.js b/lib/plugins/aws/logs.js
index 6820d264be1..bd56aacf56e 100644
--- a/lib/plugins/aws/logs.js
+++ b/lib/plugins/aws/logs.js
@@ -4,8 +4,9 @@ const _ = require('lodash');
 const dayjs = require('dayjs');
 const utc = require('dayjs/plugin/utc');
 const wait = require('timers-ext/promise/sleep');
+const { writeText } = require('@serverless/utils/log');
 const validate = require('./lib/validate');
-const formatLambdaLogEvent = require('./utils/formatLambdaLogEvent');
+const formatLambdaLogEvent = require('./utils/format-lambda-log-event');
 const ServerlessError = require('../../serverless-error');
 
 dayjs.extend(utc);
@@ -47,7 +48,7 @@ class AwsLogs {
 
     const reply = await this.provider.request('CloudWatchLogs', 'describeLogStreams', params);
     if (!reply || reply.logStreams.length === 0) {
-      throw new ServerlessError('No existing streams for the function');
+      throw new ServerlessError('No existing streams for the function', 'NO_EXISTING_LOG_STREAMS');
     }
 
     return reply.logStreams.map((logStream) => logStream.logStreamName);
@@ -94,7 +95,10 @@ class AwsLogs {
     const results = await this.provider.request('CloudWatchLogs', 'filterLogEvents', params);
     if (results.events) {
       results.events.forEach((e) => {
-        process.stdout.write(formatLambdaLogEvent(e.message));
+        if (e.message.includes('SERVERLESS_ENTERPRISE') || e.message.startsWith('END')) {
+          return;
+        }
+        writeText(formatLambdaLogEvent(e.message));
       });
     }
 
diff --git a/lib/plugins/aws/metrics.js b/lib/plugins/aws/metrics.js
index cd68973ca3d..aaeed29e88e 100644
--- a/lib/plugins/aws/metrics.js
+++ b/lib/plugins/aws/metrics.js
@@ -1,10 +1,10 @@
 'use strict';
 
 const BbPromise = require('bluebird');
-const chalk = require('chalk');
 const _ = require('lodash');
 const dayjs = require('dayjs');
 const validate = require('./lib/validate');
+const { writeText, style } = require('@serverless/utils/log');
 
 const LocalizedFormat = require('dayjs/plugin/localizedFormat');
 
@@ -99,17 +99,17 @@ class AwsMetrics {
   }
 
   showMetrics(metrics) {
-    let message = '';
+    const modernMessageTokens = [];
 
     if (this.options.function) {
-      message += `${chalk.yellow.underline(this.options.function)}\n`;
+      modernMessageTokens.push(this.options.function);
     } else {
-      message += `${chalk.yellow.underline('Service wide metrics')}\n`;
+      modernMessageTokens.push('Service wide metrics');
     }
 
     const formattedStartTime = dayjs(this.options.startTime).format('LLL');
     const formattedEndTime = dayjs(this.options.endTime).format('LLL');
-    message += `${formattedStartTime} - ${formattedEndTime}\n\n`;
+    modernMessageTokens.push(`${formattedStartTime} - ${formattedEndTime}\n`);
 
     if (metrics && metrics.length > 0) {
       const getDatapointsByLabel = (Label) =>
@@ -124,16 +124,17 @@ class AwsMetrics {
       const errorsCount = _.sumBy(getDatapointsByLabel('Errors'), 'Sum');
       const durationAverage = _.meanBy(getDatapointsByLabel('Duration'), 'Average') || 0;
 
-      // display the data
-      message += `${chalk.yellow('Invocations:', invocationsCount, '\n')}`;
-      message += `${chalk.yellow('Throttles:', throttlesCount, '\n')}`;
-      message += `${chalk.yellow('Errors:', errorsCount, '\n')}`;
-      message += `${chalk.yellow('Duration (avg.):', `${Number(durationAverage.toFixed(2))}ms`)}`;
+      modernMessageTokens.push(
+        `${style.aside('invocations')}: ${invocationsCount}`,
+        `${style.aside('throttles')}: ${throttlesCount}`,
+        `${style.aside('errors')}: ${errorsCount}`,
+        `${style.aside('duration (avg.)')}: ${Number(durationAverage.toFixed(2))}ms`
+      );
     } else {
-      message += `${chalk.yellow('There are no metrics to show for these options')}`;
+      modernMessageTokens.push('There are no metrics to show for these options');
     }
 
-    this.serverless.cli.consoleLog(message);
+    writeText(modernMessageTokens);
   }
 }
 
diff --git a/lib/plugins/aws/package/compile/events/activemq.js b/lib/plugins/aws/package/compile/events/activemq.js
new file mode 100644
index 00000000000..d23f415673d
--- /dev/null
+++ b/lib/plugins/aws/package/compile/events/activemq.js
@@ -0,0 +1,152 @@
+'use strict';
+
+class AwsCompileActiveMQEvents {
+  constructor(serverless) {
+    this.serverless = serverless;
+    this.provider = this.serverless.getProvider('aws');
+
+    this.hooks = {
+      'package:compileEvents': this.compileActiveMQEvents.bind(this),
+    };
+
+    this.serverless.configSchemaHandler.defineFunctionEvent('aws', 'activemq', {
+      type: 'object',
+      properties: {
+        arn: {
+          anyOf: [
+            {
+              type: 'string',
+              pattern: 'arn:[a-z-]+:mq:[a-z0-9-]+:\\d+:broker:[A-Za-z0-9/_+=.@-]+:b-[a-z0-9-]+',
+            },
+            { $ref: '#/definitions/awsCfImport' },
+            { $ref: '#/definitions/awsCfRef' },
+          ],
+        },
+        basicAuthArn: {
+          anyOf: [
+            { $ref: '#/definitions/awsSecretsManagerArnString' },
+            { $ref: '#/definitions/awsCfImport' },
+            { $ref: '#/definitions/awsCfRef' },
+          ],
+        },
+        batchSize: {
+          type: 'number',
+          minimum: 1,
+          maximum: 10000,
+        },
+        maximumBatchingWindow: {
+          type: 'number',
+          minimum: 0,
+          maximum: 300,
+        },
+        enabled: {
+          type: 'boolean',
+        },
+        queue: {
+          type: 'string',
+        },
+      },
+      additionalProperties: false,
+      required: ['basicAuthArn', 'arn', 'queue'],
+    });
+  }
+
+  compileActiveMQEvents() {
+    this.serverless.service.getAllFunctions().forEach((functionName) => {
+      const functionObj = this.serverless.service.getFunction(functionName);
+      const cfTemplate = this.serverless.service.provider.compiledCloudFormationTemplate;
+
+      // It is required to add the following statement in order to be able to connect to ActiveMQ cluster
+      const ec2Statement = {
+        Effect: 'Allow',
+        Action: [
+          'ec2:CreateNetworkInterface',
+          'ec2:DescribeNetworkInterfaces',
+          'ec2:DescribeVpcs',
+          'ec2:DeleteNetworkInterface',
+          'ec2:DescribeSubnets',
+          'ec2:DescribeSecurityGroups',
+        ],
+        Resource: '*',
+      };
+
+      // The omission of kms:Decrypt is intentional, since we won't know
+      // which resources should be valid to decrypt.  It's also probably
+      // not best practice to allow '*' for this.
+      const secretsManagerStatement = {
+        Effect: 'Allow',
+        Action: ['secretsmanager:GetSecretValue'],
+        Resource: [],
+      };
+
+      const brokerStatement = {
+        Effect: 'Allow',
+        Action: ['mq:DescribeBroker'],
+        Resource: [],
+      };
+
+      let hasMQEvent = false;
+
+      functionObj.events.forEach((event) => {
+        if (!event.activemq) return;
+
+        hasMQEvent = true;
+        const { basicAuthArn, arn, batchSize, maximumBatchingWindow, enabled, queue } =
+          event.activemq;
+
+        const mqEventLogicalId = this.provider.naming.getActiveMQEventLogicalId(
+          functionName,
+          queue
+        );
+        const lambdaLogicalId = this.provider.naming.getLambdaLogicalId(functionName);
+        const dependsOn = this.provider.resolveFunctionIamRoleResourceName(functionObj) || [];
+
+        const mqResource = {
+          Type: 'AWS::Lambda::EventSourceMapping',
+          DependsOn: dependsOn,
+          Properties: {
+            FunctionName: {
+              'Fn::GetAtt': [lambdaLogicalId, 'Arn'],
+            },
+            EventSourceArn: arn,
+            Queues: [queue],
+            SourceAccessConfigurations: [
+              {
+                Type: 'BASIC_AUTH',
+                URI: basicAuthArn,
+              },
+            ],
+          },
+        };
+
+        if (batchSize) {
+          mqResource.Properties.BatchSize = batchSize;
+        }
+
+        if (maximumBatchingWindow) {
+          mqResource.Properties.MaximumBatchingWindowInSeconds = maximumBatchingWindow;
+        }
+
+        if (enabled != null) {
+          mqResource.Properties.Enabled = enabled;
+        }
+
+        brokerStatement.Resource.push(arn);
+        secretsManagerStatement.Resource.push(basicAuthArn);
+        cfTemplate.Resources[mqEventLogicalId] = mqResource;
+      });
+
+      // https://docs.aws.amazon.com/lambda/latest/dg/with-mq.html#events-mq-permissions
+      if (cfTemplate.Resources.IamRoleLambdaExecution && hasMQEvent) {
+        const statement =
+          cfTemplate.Resources.IamRoleLambdaExecution.Properties.Policies[0].PolicyDocument
+            .Statement;
+        statement.push(secretsManagerStatement);
+        statement.push(brokerStatement);
+        statement.push(ec2Statement);
+      }
+    });
+  }
+}
+
+module.exports = AwsCompileActiveMQEvents;
diff --git a/lib/plugins/aws/package/compile/events/alb/index.js b/lib/plugins/aws/package/compile/events/alb/index.js
index 74a496b9250..e9a395c78b6 100644
--- a/lib/plugins/aws/package/compile/events/alb/index.js
+++ b/lib/plugins/aws/package/compile/events/alb/index.js
@@ -3,8 +3,8 @@
 const BbPromise = require('bluebird');
 
 const validate = require('./lib/validate');
-const compileTargetGroups = require('./lib/targetGroups');
-const compileListenerRules = require('./lib/listenerRules');
+const compileTargetGroups = require('./lib/target-groups');
+const compileListenerRules = require('./lib/listener-rules');
 const compilePermissions = require('./lib/permissions');
 
 function defineArray(schema) {
diff --git a/lib/plugins/aws/package/compile/events/alb/lib/listenerRules.js b/lib/plugins/aws/package/compile/events/alb/lib/listener-rules.js
similarity index 100%
rename from lib/plugins/aws/package/compile/events/alb/lib/listenerRules.js
rename to lib/plugins/aws/package/compile/events/alb/lib/listener-rules.js
diff --git a/lib/plugins/aws/package/compile/events/alb/lib/permissions.js b/lib/plugins/aws/package/compile/events/alb/lib/permissions.js
index 3c705e7d17f..9d98d0402d3 100644
--- a/lib/plugins/aws/package/compile/events/alb/lib/permissions.js
+++ b/lib/plugins/aws/package/compile/events/alb/lib/permissions.js
@@ -1,19 +1,17 @@
 'use strict';
 
 const _ = require('lodash');
-const resolveLambdaTarget = require('../../../../../utils/resolveLambdaTarget');
+const resolveLambdaTarget = require('../../../../../utils/resolve-lambda-target');
 
 module.exports = {
   compilePermissions() {
     this.validated.events.forEach((event) => {
       const { functionName, albId, multiValueHeaders } = event;
 
-      const albPermissionLogicalId = this.provider.naming.getLambdaAlbPermissionLogicalId(
-        functionName
-      );
-      const registerTargetPermissionLogicalId = this.provider.naming.getLambdaRegisterTargetPermissionLogicalId(
-        functionName
-      );
+      const albPermissionLogicalId =
+        this.provider.naming.getLambdaAlbPermissionLogicalId(functionName);
+      const registerTargetPermissionLogicalId =
+        this.provider.naming.getLambdaRegisterTargetPermissionLogicalId(functionName);
       const targetGroupLogicalId = this.provider.naming.getAlbTargetGroupLogicalId(
         functionName,
         albId,
diff --git a/lib/plugins/aws/package/compile/events/alb/lib/targetGroups.js b/lib/plugins/aws/package/compile/events/alb/lib/target-groups.js
similarity index 95%
rename from lib/plugins/aws/package/compile/events/alb/lib/targetGroups.js
rename to lib/plugins/aws/package/compile/events/alb/lib/target-groups.js
index 1b1e099e06b..b5d295e088f 100644
--- a/lib/plugins/aws/package/compile/events/alb/lib/targetGroups.js
+++ b/lib/plugins/aws/package/compile/events/alb/lib/target-groups.js
@@ -1,6 +1,6 @@
 'use strict';
 
-const resolveLambdaTarget = require('../../../../../utils/resolveLambdaTarget');
+const resolveLambdaTarget = require('../../../../../utils/resolve-lambda-target');
 
 const healthCheckDefaults = {
   HealthCheckEnabled: false,
@@ -28,9 +28,8 @@ module.exports = {
         albId,
         multiValueHeaders
       );
-      const registerTargetPermissionLogicalId = this.provider.naming.getLambdaRegisterTargetPermissionLogicalId(
-        functionName
-      );
+      const registerTargetPermissionLogicalId =
+        this.provider.naming.getLambdaRegisterTargetPermissionLogicalId(functionName);
 
       const healthCheckProperties = { HealthCheckEnabled: healthCheckDefaults.HealthCheckEnabled };
       if (healthCheck) {
diff --git a/lib/plugins/aws/package/compile/events/alb/lib/validate.js b/lib/plugins/aws/package/compile/events/alb/lib/validate.js
index de4aec4de63..81d01b21067 100644
--- a/lib/plugins/aws/package/compile/events/alb/lib/validate.js
+++ b/lib/plugins/aws/package/compile/events/alb/lib/validate.js
@@ -115,7 +115,10 @@ module.exports = {
     }
     const matches = listenerArn.match(this.ALB_LISTENER_REGEXP);
     if (!matches) {
-      throw new ServerlessError(`Invalid ALB listenerArn in function "${functionName}".`);
+      throw new ServerlessError(
+        `Invalid ALB listenerArn in function "${functionName}".`,
+        'ALB_INVALID_LISTENER_ARN'
+      );
     }
     return { albId: matches[1], listenerId: matches[2] };
   },
@@ -138,7 +141,7 @@ module.exports = {
         '  Events in the same function cannot use the same priority even if they have a different listenerArn.\n',
         '  This is a Serverless limitation that will be fixed in the next major release.',
       ].join('');
-      throw new ServerlessError(errorMessage);
+      throw new ServerlessError(errorMessage, 'ALB_PRIORITY_ALREADY_IN_USE');
     }
 
     comparator = (e1, e2) => samePriority(e1, e2) && sameListener(e1, e2) && !sameFunction(e1, e2);
@@ -148,7 +151,7 @@ module.exports = {
         `ALB event in function "${duplicates[0].functionName}"`,
         ` cannot use priority "${duplicates[0].priority}" because it is already in use.`,
       ].join('');
-      throw new ServerlessError(errorMessage);
+      throw new ServerlessError(errorMessage, 'ALB_PRIORITY_ALREADY_IN_USE');
     }
   },
 
@@ -159,7 +162,8 @@ module.exports = {
     for (const auth of eventAuthorizers) {
       if (!authorizers[auth]) {
         throw new ServerlessError(
-          `No match for "${auth}" in function "${functionName}" found in registered ALB authorizers`
+          `No match for "${auth}" in function "${functionName}" found in registered ALB authorizers`,
+          'ALB_MISSING_AUTHORIZER'
         );
       }
     }
diff --git a/lib/plugins/aws/package/compile/events/alexaSkill.js b/lib/plugins/aws/package/compile/events/alexa-skill.js
similarity index 80%
rename from lib/plugins/aws/package/compile/events/alexaSkill.js
rename to lib/plugins/aws/package/compile/events/alexa-skill.js
index 49f689bfc57..5637a34c854 100644
--- a/lib/plugins/aws/package/compile/events/alexaSkill.js
+++ b/lib/plugins/aws/package/compile/events/alexa-skill.js
@@ -46,17 +46,15 @@ class AwsCompileAlexaSkillEvents {
       let alexaSkillNumberInFunction = 0;
 
       functionObj.events.forEach((event) => {
-        if (event === 'alexaSkill' || event.alexaSkill) {
+        if (event.alexaSkill) {
           let enabled = true;
           let appId;
-          if (event !== 'alexaSkill') {
-            if (typeof event.alexaSkill === 'string') {
-              appId = event.alexaSkill;
-            } else {
-              appId = event.alexaSkill.appId;
-              // Parameter `enabled` is optional, hence the explicit non-equal check for false.
-              enabled = event.alexaSkill.enabled !== false;
-            }
+          if (typeof event.alexaSkill === 'string') {
+            appId = event.alexaSkill;
+          } else {
+            appId = event.alexaSkill.appId;
+            // Parameter `enabled` is optional, hence the explicit non-equal check for false.
+            enabled = event.alexaSkill.enabled !== false;
           }
           alexaSkillNumberInFunction++;
 
@@ -77,10 +75,11 @@ class AwsCompileAlexaSkillEvents {
             permissionTemplate.Properties.EventSourceToken = appId.replace(/\\n|\\r/g, '');
           }
 
-          const lambdaPermissionLogicalId = this.provider.naming.getLambdaAlexaSkillPermissionLogicalId(
-            functionName,
-            alexaSkillNumberInFunction
-          );
+          const lambdaPermissionLogicalId =
+            this.provider.naming.getLambdaAlexaSkillPermissionLogicalId(
+              functionName,
+              alexaSkillNumberInFunction
+            );
 
           const permissionCloudForamtionResource = {
             [lambdaPermissionLogicalId]: permissionTemplate,
diff --git a/lib/plugins/aws/package/compile/events/alexaSmartHome.js b/lib/plugins/aws/package/compile/events/alexa-smart-home.js
similarity index 92%
rename from lib/plugins/aws/package/compile/events/alexaSmartHome.js
rename to lib/plugins/aws/package/compile/events/alexa-smart-home.js
index 910bbf4e485..c1d02993bf4 100644
--- a/lib/plugins/aws/package/compile/events/alexaSmartHome.js
+++ b/lib/plugins/aws/package/compile/events/alexa-smart-home.js
@@ -63,10 +63,11 @@ class AwsCompileAlexaSmartHomeEvents {
               },
             };
 
-            const lambdaPermissionLogicalId = this.provider.naming.getLambdaAlexaSmartHomePermissionLogicalId(
-              functionName,
-              alexaSmartHomeNumberInFunction
-            );
+            const lambdaPermissionLogicalId =
+              this.provider.naming.getLambdaAlexaSmartHomePermissionLogicalId(
+                functionName,
+                alexaSmartHomeNumberInFunction
+              );
 
             const permissionCloudFormationResource = {
               [lambdaPermissionLogicalId]: permissionTemplate,
diff --git a/lib/plugins/aws/package/compile/events/apiGateway/index.js b/lib/plugins/aws/package/compile/events/api-gateway/index.js
similarity index 70%
rename from lib/plugins/aws/package/compile/events/apiGateway/index.js
rename to lib/plugins/aws/package/compile/events/api-gateway/index.js
index 76606a2bf4c..ef7f73c2050 100644
--- a/lib/plugins/aws/package/compile/events/apiGateway/index.js
+++ b/lib/plugins/aws/package/compile/events/api-gateway/index.js
@@ -3,14 +3,14 @@
 /* eslint-disable global-require */
 
 const BbPromise = require('bluebird');
-const _ = require('lodash');
+const memoize = require('memoizee');
 
 const validate = require('./lib/validate');
-const compileRestApi = require('./lib/restApi');
-const compileRequestValidators = require('./lib/requestValidator');
-const compileApiKeys = require('./lib/apiKeys');
-const compileUsagePlan = require('./lib/usagePlan');
-const compileUsagePlanKeys = require('./lib/usagePlanKeys');
+const compileRestApi = require('./lib/rest-api');
+const compileRequestValidators = require('./lib/request-validator');
+const compileApiKeys = require('./lib/api-keys');
+const compileUsagePlan = require('./lib/usage-plan');
+const compileUsagePlanKeys = require('./lib/usage-plan-keys');
 const compileResources = require('./lib/resources');
 const compileCors = require('./lib/cors');
 const compileMethods = require('./lib/method/index');
@@ -41,7 +41,7 @@ const requestParametersSchema = {
         type: 'object',
         properties: {
           required: { type: 'boolean' },
-          mappedValue: { type: 'string' },
+          mappedValue: { $ref: '#/definitions/awsCfInstruction' },
         },
         additionalProperties: false,
       },
@@ -65,7 +65,9 @@ const authorizerSchema = {
         resultTtlInSeconds: { type: 'integer', minimum: 0, maximum: 3600 },
         scopes: { type: 'array', items: { type: 'string' } },
         type: {
-          anyOf: ['token', 'cognito_user_pools', 'request', 'aws_iam'].map(caseInsensitive),
+          anyOf: ['token', 'cognito_user_pools', 'request', 'aws_iam', 'custom'].map(
+            caseInsensitive
+          ),
         },
       },
       required: [],
@@ -91,7 +93,6 @@ const corsSchema = {
           items: { type: 'string' },
         },
       },
-      oneOf: [{ required: ['origin'] }, { required: ['origins'] }],
       additionalProperties: false,
     },
   ],
@@ -112,10 +113,6 @@ const requestSchema = {
       additionalProperties: false,
     },
     passThrough: { enum: ['NEVER', 'WHEN_NO_MATCH', 'WHEN_NO_TEMPLATES'] },
-    schema: {
-      type: 'object',
-      additionalProperties: { anyOf: [{ type: 'object' }, { type: 'string' }] },
-    },
     schemas: {
       type: 'object',
       additionalProperties: { anyOf: [{ type: 'object' }, { type: 'string' }] },
@@ -124,7 +121,7 @@ const requestSchema = {
       type: 'object',
       additionalProperties: { type: 'string' },
     },
-    uri: { type: 'string' },
+    uri: { $ref: '#/definitions/awsCfInstruction' },
   },
   additionalProperties: false,
 };
@@ -183,7 +180,7 @@ class AwsCompileApigEvents {
           properties: {
             async: { type: 'boolean' },
             authorizer: authorizerSchema,
-            connectionId: { type: 'string' },
+            connectionId: { $ref: '#/definitions/awsCfInstruction' },
             connectionType: { anyOf: ['vpc-link', 'VPC_LINK'].map(caseInsensitive) },
             cors: corsSchema,
             integration: {
@@ -236,63 +233,9 @@ class AwsCompileApigEvents {
       getMethodResponses
     );
 
-    this.hooks = {
-      'initialize': () => {
-        if (
-          this.serverless.service.provider.name === 'aws' &&
-          (this.serverless.service.provider.apiKeys ||
-            this.serverless.service.provider.resourcePolicy ||
-            this.serverless.service.provider.usagePlan)
-        ) {
-          this.serverless._logDeprecation(
-            'AWS_API_GATEWAY_SPECIFIC_KEYS',
-            'Starting with next major version, API Gateway-specific configuration keys ' +
-              '"apiKeys", "resourcePolicy" and "usagePlan" will be relocated from "provider" ' +
-              'to "provider.apiGateway"'
-          );
-        }
+    this.createRequestValidator = memoize(this.createRequestValidator.bind(this));
 
-        if (
-          this.serverless.service.provider.name === 'aws' &&
-          Object.values(this.serverless.service.functions).some(({ events }) =>
-            events.some(({ http }) => _.get(http, 'request.schema'))
-          )
-        ) {
-          this.serverless._logDeprecation(
-            'AWS_API_GATEWAY_SCHEMAS',
-            'Starting with next major version, "http.request.schema" property will be replaced by "http.request.schemas".'
-          );
-        }
-
-        if (
-          this.serverless.service.provider.name === 'aws' &&
-          this.serverless.service.provider.apiGateway &&
-          this.serverless.service.provider.apiGateway.restApiId &&
-          this.serverless.service.provider.tracing &&
-          this.serverless.service.provider.tracing.apiGateway != null
-        ) {
-          this.serverless._logDeprecation(
-            'AWS_API_GATEWAY_NON_APPLICABLE_SETTINGS',
-            'When external API Gateway resource is imported via ' +
-              '`provider.apiGateway.restApiId`, property ' +
-              '"provider.tracing.apiGateway" will be ignored.'
-          );
-        }
-        if (
-          this.serverless.service.provider.name === 'aws' &&
-          this.serverless.service.provider.apiGateway &&
-          this.serverless.service.provider.apiGateway.restApiId &&
-          this.serverless.service.provider.logs &&
-          this.serverless.service.provider.logs.restApi != null
-        ) {
-          this.serverless._logDeprecation(
-            'AWS_API_GATEWAY_NON_APPLICABLE_SETTINGS',
-            'When external API Gateway resource is imported via ' +
-              '`provider.apiGateway.restApiId`, property ' +
-              '"provider.logs.restApi" will be ignored.'
-          );
-        }
-      },
+    this.hooks = {
       'package:compileEvents': async () => {
         this.validated = this.validate();
 
@@ -317,10 +260,10 @@ class AwsCompileApigEvents {
 
       // TODO should be removed once AWS fixes the CloudFormation problems using a separate Stage
       'after:deploy:deploy': async () => {
-        const getServiceState = require('../../../../lib/getServiceState').getServiceState;
+        const getServiceState = require('../../../../lib/get-service-state').getServiceState;
 
         const state = getServiceState.call(this);
-        const updateStage = require('./lib/hack/updateStage').updateStage;
+        const updateStage = require('./lib/hack/update-stage').updateStage;
 
         this.state = state;
         return updateStage.call(this);
@@ -329,8 +272,8 @@ class AwsCompileApigEvents {
       // TODO should be removed once AWS fixes the removal via CloudFormation
       'before:remove:remove': async () => {
         const globalValidate = require('../../../../lib/validate').validate;
-        const disassociateUsagePlan = require('./lib/hack/disassociateUsagePlan')
-          .disassociateUsagePlan;
+        const disassociateUsagePlan =
+          require('./lib/hack/disassociate-usage-plan').disassociateUsagePlan;
 
         return BbPromise.bind(this).then(globalValidate).then(disassociateUsagePlan);
       },
diff --git a/lib/plugins/aws/package/compile/events/apiGateway/lib/apiKeys.js b/lib/plugins/aws/package/compile/events/api-gateway/lib/api-keys.js
similarity index 86%
rename from lib/plugins/aws/package/compile/events/apiGateway/lib/apiKeys.js
rename to lib/plugins/aws/package/compile/events/api-gateway/lib/api-keys.js
index b8709f9f060..600e2807cba 100644
--- a/lib/plugins/aws/package/compile/events/apiGateway/lib/apiKeys.js
+++ b/lib/plugins/aws/package/compile/events/api-gateway/lib/api-keys.js
@@ -7,10 +7,12 @@ function createApiKeyResource(that, apiKey) {
   const value = _.isObject(apiKey) && apiKey.value ? apiKey.value : undefined;
   const description = _.isObject(apiKey) ? apiKey.description : undefined;
   const customerId = _.isObject(apiKey) ? apiKey.customerId : undefined;
+  const enabled = _.isObject(apiKey) && apiKey.enabled != null ? apiKey.enabled : true;
+
   const resourceTemplate = {
     Type: 'AWS::ApiGateway::ApiKey',
     Properties: {
-      Enabled: true,
+      Enabled: enabled,
       Name: name,
       Value: value,
       Description: description,
@@ -30,18 +32,14 @@ function createApiKeyResource(that, apiKey) {
 
 module.exports = {
   compileApiKeys() {
-    const apiKeys =
-      _.get(this.serverless.service.provider.apiGateway, 'apiKeys') ||
-      this.serverless.service.provider.apiKeys;
+    const apiKeys = _.get(this.serverless.service.provider.apiGateway, 'apiKeys');
     if (apiKeys) {
       const resources = this.serverless.service.provider.compiledCloudFormationTemplate.Resources;
       let keyNumber = 0;
       apiKeys.forEach((apiKeyDefinition) => {
         // if multiple API key types are used
         const name = Object.keys(apiKeyDefinition)[0];
-        const usagePlan =
-          _.get(this.serverless.service.provider.apiGateway, 'usagePlan') ||
-          this.serverless.service.provider.usagePlan;
+        const usagePlan = _.get(this.serverless.service.provider.apiGateway, 'usagePlan');
         if (
           _.isObject(apiKeyDefinition) &&
           Array.isArray(usagePlan) &&
diff --git a/lib/plugins/aws/package/compile/events/apiGateway/lib/authorizers.js b/lib/plugins/aws/package/compile/events/api-gateway/lib/authorizers.js
similarity index 96%
rename from lib/plugins/aws/package/compile/events/apiGateway/lib/authorizers.js
rename to lib/plugins/aws/package/compile/events/api-gateway/lib/authorizers.js
index c0406332886..8977dc3413d 100644
--- a/lib/plugins/aws/package/compile/events/apiGateway/lib/authorizers.js
+++ b/lib/plugins/aws/package/compile/events/api-gateway/lib/authorizers.js
@@ -1,7 +1,7 @@
 'use strict';
 
 const _ = require('lodash');
-const awsArnRegExs = require('../../../../../utils/arnRegularExpressions');
+const awsArnRegExs = require('../../../../../utils/arn-regular-expressions');
 
 module.exports = {
   compileAuthorizers() {
diff --git a/lib/plugins/aws/package/compile/events/apiGateway/lib/cors.js b/lib/plugins/aws/package/compile/events/api-gateway/lib/cors.js
similarity index 100%
rename from lib/plugins/aws/package/compile/events/apiGateway/lib/cors.js
rename to lib/plugins/aws/package/compile/events/api-gateway/lib/cors.js
diff --git a/lib/plugins/aws/package/compile/events/apiGateway/lib/deployment.js b/lib/plugins/aws/package/compile/events/api-gateway/lib/deployment.js
similarity index 100%
rename from lib/plugins/aws/package/compile/events/apiGateway/lib/deployment.js
rename to lib/plugins/aws/package/compile/events/api-gateway/lib/deployment.js
diff --git a/lib/plugins/aws/package/compile/events/apiGateway/lib/hack/README.md b/lib/plugins/aws/package/compile/events/api-gateway/lib/hack/README.md
similarity index 100%
rename from lib/plugins/aws/package/compile/events/apiGateway/lib/hack/README.md
rename to lib/plugins/aws/package/compile/events/api-gateway/lib/hack/README.md
diff --git a/lib/plugins/aws/package/compile/events/apiGateway/lib/hack/disassociateUsagePlan.js b/lib/plugins/aws/package/compile/events/api-gateway/lib/hack/disassociate-usage-plan.js
similarity index 87%
rename from lib/plugins/aws/package/compile/events/apiGateway/lib/hack/disassociateUsagePlan.js
rename to lib/plugins/aws/package/compile/events/api-gateway/lib/hack/disassociate-usage-plan.js
index a6bdf65ace7..08e73331087 100644
--- a/lib/plugins/aws/package/compile/events/apiGateway/lib/hack/disassociateUsagePlan.js
+++ b/lib/plugins/aws/package/compile/events/api-gateway/lib/hack/disassociate-usage-plan.js
@@ -2,15 +2,14 @@
 
 const BbPromise = require('bluebird');
 const _ = require('lodash');
+const { log } = require('@serverless/utils/log');
 
 module.exports = {
   async disassociateUsagePlan() {
-    const apiKeys =
-      _.get(this.serverless.service.provider.apiGateway, 'apiKeys') ||
-      this.serverless.service.provider.apiKeys;
+    const apiKeys = _.get(this.serverless.service.provider.apiGateway, 'apiKeys');
 
     if (apiKeys && apiKeys.length) {
-      this.serverless.cli.log('Removing usage plan association...');
+      log.info('Removing usage plan association');
       const stackName = `${this.provider.naming.getStackName()}`;
       return BbPromise.all([
         this.provider.request('CloudFormation', 'describeStackResource', {
diff --git a/lib/plugins/aws/package/compile/events/apiGateway/lib/hack/updateStage.js b/lib/plugins/aws/package/compile/events/api-gateway/lib/hack/update-stage.js
similarity index 98%
rename from lib/plugins/aws/package/compile/events/apiGateway/lib/hack/updateStage.js
rename to lib/plugins/aws/package/compile/events/api-gateway/lib/hack/update-stage.js
index ba06d897124..17956e737bd 100644
--- a/lib/plugins/aws/package/compile/events/apiGateway/lib/hack/updateStage.js
+++ b/lib/plugins/aws/package/compile/events/api-gateway/lib/hack/update-stage.js
@@ -81,7 +81,7 @@ module.exports = {
               "that there's a way to support your setup).",
             ].join('');
 
-            throw new ServerlessError(errorMessage);
+            throw new ServerlessError(errorMessage, 'API_GATEWAY_REST_API_ID_NOT_RESOLVED');
           }
           return resolveStage
             .call(this)
@@ -150,7 +150,7 @@ async function resolveRestApiId() {
     }
     const apiName = apiGatewayResource
       ? apiGatewayResource.Properties.Name
-      : provider.apiName || `${this.options.stage}-${this.state.service.service}`;
+      : this.provider.naming.getApiGatewayName();
     const resolveFromAws = (position) =>
       this.provider
         .request('APIGateway', 'getRestApis', { position, limit: 500 })
diff --git a/lib/plugins/aws/package/compile/events/apiGateway/lib/method/authorization.js b/lib/plugins/aws/package/compile/events/api-gateway/lib/method/authorization.js
similarity index 96%
rename from lib/plugins/aws/package/compile/events/apiGateway/lib/method/authorization.js
rename to lib/plugins/aws/package/compile/events/api-gateway/lib/method/authorization.js
index f6d102bcc05..debe4360997 100644
--- a/lib/plugins/aws/package/compile/events/apiGateway/lib/method/authorization.js
+++ b/lib/plugins/aws/package/compile/events/api-gateway/lib/method/authorization.js
@@ -1,7 +1,7 @@
 'use strict';
 
 const _ = require('lodash');
-const awsArnRegExs = require('../../../../../../utils/arnRegularExpressions');
+const awsArnRegExs = require('../../../../../../utils/arn-regular-expressions');
 
 module.exports = {
   getMethodAuthorization(http) {
diff --git a/lib/plugins/aws/package/compile/events/apiGateway/lib/method/index.js b/lib/plugins/aws/package/compile/events/api-gateway/lib/method/index.js
similarity index 95%
rename from lib/plugins/aws/package/compile/events/apiGateway/lib/method/index.js
rename to lib/plugins/aws/package/compile/events/api-gateway/lib/method/index.js
index ffa5f89dcd2..bec9aa77294 100644
--- a/lib/plugins/aws/package/compile/events/apiGateway/lib/method/index.js
+++ b/lib/plugins/aws/package/compile/events/api-gateway/lib/method/index.js
@@ -20,6 +20,9 @@ module.exports = {
         });
       }
 
+      const apiGatewayPermission = this.provider.naming.getLambdaApiGatewayPermissionLogicalId(
+        event.functionName
+      );
       const template = {
         Type: 'AWS::ApiGateway::Method',
         Properties: {
@@ -29,6 +32,7 @@ module.exports = {
           RestApiId: this.provider.getApiGatewayRestApiId(),
           OperationName: event.http.operationId,
         },
+        DependsOn: [apiGatewayPermission],
       };
 
       if (event.http.private) {
diff --git a/lib/plugins/aws/package/compile/events/apiGateway/lib/method/integration.js b/lib/plugins/aws/package/compile/events/api-gateway/lib/method/integration.js
similarity index 100%
rename from lib/plugins/aws/package/compile/events/apiGateway/lib/method/integration.js
rename to lib/plugins/aws/package/compile/events/api-gateway/lib/method/integration.js
diff --git a/lib/plugins/aws/package/compile/events/apiGateway/lib/method/responses.js b/lib/plugins/aws/package/compile/events/api-gateway/lib/method/responses.js
similarity index 100%
rename from lib/plugins/aws/package/compile/events/apiGateway/lib/method/responses.js
rename to lib/plugins/aws/package/compile/events/api-gateway/lib/method/responses.js
diff --git a/lib/plugins/aws/package/compile/events/apiGateway/lib/permissions.js b/lib/plugins/aws/package/compile/events/api-gateway/lib/permissions.js
similarity index 88%
rename from lib/plugins/aws/package/compile/events/apiGateway/lib/permissions.js
rename to lib/plugins/aws/package/compile/events/api-gateway/lib/permissions.js
index 5fa0ed05cbf..25ae063be15 100644
--- a/lib/plugins/aws/package/compile/events/apiGateway/lib/permissions.js
+++ b/lib/plugins/aws/package/compile/events/api-gateway/lib/permissions.js
@@ -1,15 +1,14 @@
 'use strict';
 
-const awsArnRegExs = require('../../../../../utils/arnRegularExpressions');
+const awsArnRegExs = require('../../../../../utils/arn-regular-expressions');
 
 module.exports = {
   compilePermissions() {
     const cfResources = this.serverless.service.provider.compiledCloudFormationTemplate.Resources;
     this.permissionMapping.forEach(
       ({ lambdaLogicalId, lambdaAliasName, lambdaAliasLogicalId, event }) => {
-        const lambdaPermissionLogicalId = this.provider.naming.getLambdaApiGatewayPermissionLogicalId(
-          event.functionName
-        );
+        const lambdaPermissionLogicalId =
+          this.provider.naming.getLambdaApiGatewayPermissionLogicalId(event.functionName);
 
         const functionArnGetter = { 'Fn::GetAtt': [lambdaLogicalId, 'Arn'] };
         Object.assign(cfResources, {
@@ -44,9 +43,8 @@ module.exports = {
 
         if (event.http.authorizer && event.http.authorizer.arn) {
           const authorizer = event.http.authorizer;
-          const authorizerPermissionLogicalId = this.provider.naming.getLambdaApiGatewayPermissionLogicalId(
-            authorizer.name
-          );
+          const authorizerPermissionLogicalId =
+            this.provider.naming.getLambdaApiGatewayPermissionLogicalId(authorizer.name);
 
           if (
             (authorizer.type || '').toUpperCase() === 'COGNITO_USER_POOLS' ||
diff --git a/lib/plugins/aws/package/compile/events/apiGateway/lib/requestValidator.js b/lib/plugins/aws/package/compile/events/api-gateway/lib/request-validator.js
similarity index 65%
rename from lib/plugins/aws/package/compile/events/apiGateway/lib/requestValidator.js
rename to lib/plugins/aws/package/compile/events/api-gateway/lib/request-validator.js
index 690c539410a..69d4a536502 100644
--- a/lib/plugins/aws/package/compile/events/apiGateway/lib/requestValidator.js
+++ b/lib/plugins/aws/package/compile/events/api-gateway/lib/request-validator.js
@@ -12,14 +12,28 @@ module.exports = {
         resourceName,
         event.http.method
       );
-
+      const template =
+        this.serverless.service.provider.compiledCloudFormationTemplate.Resources[methodLogicalId];
       let validatorLogicalId;
-      let validatorName;
+
+      if (
+        event.http.request &&
+        event.http.request.parameters &&
+        // check if any parameters are marked as required
+        Object.values(event.http.request.parameters || {}).some((x) => {
+          if (!_.isObject(x)) return x;
+          return x.required != null ? x.required : true;
+        })
+      ) {
+        if (!validatorLogicalId) {
+          const requestValidator = this.createRequestValidator();
+          validatorLogicalId = requestValidator.validatorLogicalId;
+        }
+
+        template.Properties.RequestValidatorId = { Ref: validatorLogicalId };
+      }
 
       if (event.http.request && event.http.request.schemas) {
-        const template = this.serverless.service.provider.compiledCloudFormationTemplate.Resources[
-          methodLogicalId
-        ];
         for (const [contentType, schemaConfig] of _.entries(event.http.request.schemas)) {
           let modelLogicalId;
 
@@ -29,15 +43,12 @@ module.exports = {
           if (!validatorLogicalId) {
             const requestValidator = this.createRequestValidator();
             validatorLogicalId = requestValidator.validatorLogicalId;
-            validatorName = requestValidator.validatorName;
           }
 
           if (referencedDefinitionFromProvider) {
             modelLogicalId = this.createProviderModel(
               schemaConfig,
-              apiGatewayConfig.request.schemas[schemaConfig],
-              validatorLogicalId,
-              validatorName
+              apiGatewayConfig.request.schemas[schemaConfig]
             );
           } else {
             // In this situation, we have two options - schema is defined as string that does not reference model from provider or as an object
@@ -87,44 +98,11 @@ module.exports = {
           template.Properties.RequestModels = template.Properties.RequestModels || {};
           template.Properties.RequestModels[contentType] = { Ref: modelLogicalId };
         }
-      } else if (event.http.request && event.http.request.schema) {
-        // Old functionality
-        const template = this.serverless.service.provider.compiledCloudFormationTemplate.Resources[
-          methodLogicalId
-        ];
-        for (const [contentType, schema] of _.entries(event.http.request.schema)) {
-          const modelLogicalId = this.provider.naming.getEndpointModelLogicalId(
-            resourceName,
-            event.http.method,
-            contentType
-          );
-
-          if (!validatorLogicalId) {
-            const requestValidator = this.createRequestValidator();
-            validatorLogicalId = requestValidator.validatorLogicalId;
-            validatorName = requestValidator.validatorName;
-          }
-
-          template.Properties.RequestValidatorId = { Ref: validatorLogicalId };
-          template.Properties.RequestModels = template.Properties.RequestModels || {};
-          template.Properties.RequestModels[contentType] = { Ref: modelLogicalId };
-
-          Object.assign(this.serverless.service.provider.compiledCloudFormationTemplate.Resources, {
-            [modelLogicalId]: {
-              Type: 'AWS::ApiGateway::Model',
-              Properties: {
-                RestApiId: this.provider.getApiGatewayRestApiId(),
-                ContentType: contentType,
-                Schema: schema,
-              },
-            },
-          });
-        }
       }
     });
   },
 
-  createProviderModel(schemaId, schemaConfig, validatorLogicalId, validatorName) {
+  createProviderModel(schemaId, schemaConfig) {
     let modelName;
     let description;
     let definition;
@@ -140,7 +118,6 @@ module.exports = {
 
     if (schemaConfig.name) {
       modelName = schemaConfig.name;
-      validatorName = `${modelName}Validator`;
     }
 
     if (schemaConfig.description) {
@@ -162,9 +139,6 @@ module.exports = {
       this.serverless.service.provider.compiledCloudFormationTemplate.Resources[
         modelLogicalId
       ].Properties.Name = modelName;
-      this.serverless.service.provider.compiledCloudFormationTemplate.Resources[
-        validatorLogicalId
-      ].Properties.Name = validatorName;
     }
 
     if (description) {
@@ -177,18 +151,19 @@ module.exports = {
 
   createRequestValidator() {
     const validatorLogicalId = this.provider.naming.getValidatorLogicalId();
-    const validatorName = 'Validate request body and querystring parameters';
-    this.serverless.service.provider.compiledCloudFormationTemplate.Resources[
-      validatorLogicalId
-    ] = {
-      Type: 'AWS::ApiGateway::RequestValidator',
-      Properties: {
-        RestApiId: this.provider.getApiGatewayRestApiId(),
-        ValidateRequestBody: true,
-        ValidateRequestParameters: true,
-        Name: validatorName,
-      },
-    };
+    const validatorName = `${
+      this.serverless.service.service
+    }-${this.provider.getStage()} | Validate request body and querystring parameters`;
+    this.serverless.service.provider.compiledCloudFormationTemplate.Resources[validatorLogicalId] =
+      {
+        Type: 'AWS::ApiGateway::RequestValidator',
+        Properties: {
+          RestApiId: this.provider.getApiGatewayRestApiId(),
+          ValidateRequestBody: true,
+          ValidateRequestParameters: true,
+          Name: validatorName,
+        },
+      };
     return {
       validatorLogicalId,
       validatorName,
diff --git a/lib/plugins/aws/package/compile/events/apiGateway/lib/resources.js b/lib/plugins/aws/package/compile/events/api-gateway/lib/resources.js
similarity index 100%
rename from lib/plugins/aws/package/compile/events/apiGateway/lib/resources.js
rename to lib/plugins/aws/package/compile/events/api-gateway/lib/resources.js
diff --git a/lib/plugins/aws/package/compile/events/apiGateway/lib/restApi.js b/lib/plugins/aws/package/compile/events/api-gateway/lib/rest-api.js
similarity index 85%
rename from lib/plugins/aws/package/compile/events/apiGateway/lib/restApi.js
rename to lib/plugins/aws/package/compile/events/api-gateway/lib/rest-api.js
index 0247669b747..3ab8143a88b 100644
--- a/lib/plugins/aws/package/compile/events/apiGateway/lib/restApi.js
+++ b/lib/plugins/aws/package/compile/events/api-gateway/lib/rest-api.js
@@ -28,7 +28,10 @@ module.exports = {
         vpcEndpointIds = this.serverless.service.provider.vpcEndpointIds;
 
         if (endpointType !== 'PRIVATE') {
-          throw new ServerlessError('VPC endpoint IDs are only available for private APIs');
+          throw new ServerlessError(
+            'VPC endpoint IDs are only available for private APIs',
+            'API_GATEWAY_INVALID_VPC_ENDPOINT_IDS_CONFIG'
+          );
         }
       }
     }
@@ -41,20 +44,22 @@ module.exports = {
       EndpointConfiguration.VpcEndpointIds = vpcEndpointIds;
     }
 
+    const DisableExecuteApiEndpoint =
+      apiGateway.disableDefaultEndpoint == null ? undefined : apiGateway.disableDefaultEndpoint;
+
     _.merge(this.serverless.service.provider.compiledCloudFormationTemplate.Resources, {
       [this.apiGatewayRestApiLogicalId]: {
         Type: 'AWS::ApiGateway::RestApi',
         Properties: {
           Name: this.provider.naming.getApiGatewayName(),
           BinaryMediaTypes,
+          DisableExecuteApiEndpoint,
           EndpointConfiguration,
         },
       },
     });
 
-    const resourcePolicy =
-      _.get(this.serverless.service.provider.apiGateway, 'resourcePolicy') ||
-      this.serverless.service.provider.resourcePolicy;
+    const resourcePolicy = _.get(this.serverless.service.provider.apiGateway, 'resourcePolicy');
     if (resourcePolicy && Object.keys(resourcePolicy).length) {
       const policy = {
         Version: '2012-10-17',
@@ -90,7 +95,7 @@ module.exports = {
       );
     }
 
-    if (apiGateway.minimumCompressionSize) {
+    if (apiGateway.minimumCompressionSize != null) {
       const minimumCompressionSize = apiGateway.minimumCompressionSize;
 
       _.merge(
diff --git a/lib/plugins/aws/package/compile/events/apiGateway/lib/stage.js b/lib/plugins/aws/package/compile/events/api-gateway/lib/stage.js
similarity index 97%
rename from lib/plugins/aws/package/compile/events/apiGateway/lib/stage.js
rename to lib/plugins/aws/package/compile/events/api-gateway/lib/stage.js
index f9f90ad1e2e..6ce660efc52 100644
--- a/lib/plugins/aws/package/compile/events/apiGateway/lib/stage.js
+++ b/lib/plugins/aws/package/compile/events/api-gateway/lib/stage.js
@@ -5,7 +5,7 @@
 // NOTE: --> Keep this file in sync with ./hack/updateStage.js
 
 const _ = require('lodash');
-const ensureApiGatewayCloudWatchRole = require('../../lib/ensureApiGatewayCloudWatchRole');
+const ensureApiGatewayCloudWatchRole = require('../../lib/ensure-api-gateway-cloud-watch-role');
 
 module.exports = {
   async compileStage() {
@@ -59,7 +59,7 @@ module.exports = {
       // --------------------------------------------------------------------------------
 
       // create log-specific resources
-      if (logs) {
+      if (logs && (logs.accessLogging == null || logs.accessLogging)) {
         // --- currently commented out since this is done via the SDK in updateStage.js ---
         // _.merge(stageResource.Properties, {
         //   AccessLogSetting: {
diff --git a/lib/plugins/aws/package/compile/events/apiGateway/lib/usagePlanKeys.js b/lib/plugins/aws/package/compile/events/api-gateway/lib/usage-plan-keys.js
similarity index 90%
rename from lib/plugins/aws/package/compile/events/apiGateway/lib/usagePlanKeys.js
rename to lib/plugins/aws/package/compile/events/api-gateway/lib/usage-plan-keys.js
index d88c6ebd97a..8d1d047352d 100644
--- a/lib/plugins/aws/package/compile/events/apiGateway/lib/usagePlanKeys.js
+++ b/lib/plugins/aws/package/compile/events/api-gateway/lib/usage-plan-keys.js
@@ -24,9 +24,7 @@ function createUsagePlanKeyResource(that, usagePlanLogicalId, keyNumber, keyName
 
 module.exports = {
   compileUsagePlanKeys() {
-    const apiKeys =
-      _.get(this.serverless.service.provider.apiGateway, 'apiKeys') ||
-      this.serverless.service.provider.apiKeys;
+    const apiKeys = _.get(this.serverless.service.provider.apiGateway, 'apiKeys');
     if (apiKeys) {
       const resources = this.serverless.service.provider.compiledCloudFormationTemplate.Resources;
       let keyNumber = 0;
@@ -42,7 +40,10 @@ module.exports = {
           !usagePlansIncludeName &&
           _.isObject(value)
         ) {
-          throw new ServerlessError(`API key "${name}" has no usage plan defined`);
+          throw new ServerlessError(
+            `API key "${name}" has no usage plan defined`,
+            'API_GATEWAY_KEY_WITHOUT_USAGE_PLAN'
+          );
         }
         if (_.isObject(apiKeyDefinition) && usagePlansIncludeName) {
           keyNumber = 0;
diff --git a/lib/plugins/aws/package/compile/events/apiGateway/lib/usagePlan.js b/lib/plugins/aws/package/compile/events/api-gateway/lib/usage-plan.js
similarity index 89%
rename from lib/plugins/aws/package/compile/events/apiGateway/lib/usagePlan.js
rename to lib/plugins/aws/package/compile/events/api-gateway/lib/usage-plan.js
index 4a412f77e4c..a0eabc41044 100644
--- a/lib/plugins/aws/package/compile/events/apiGateway/lib/usagePlan.js
+++ b/lib/plugins/aws/package/compile/events/api-gateway/lib/usage-plan.js
@@ -20,9 +20,7 @@ function createUsagePlanResource(that, name) {
     },
   };
   const template = _.cloneDeep(resourceTemplate);
-  const usagePlan =
-    _.get(that.serverless.service.provider.apiGateway, 'usagePlan') ||
-    that.serverless.service.provider.usagePlan;
+  const usagePlan = _.get(that.serverless.service.provider.apiGateway, 'usagePlan');
   // this is done for backward compatibility
   if (name === 'default') {
     // create old legacy resources
@@ -97,12 +95,8 @@ function createUsagePlanResource(that, name) {
 
 module.exports = {
   compileUsagePlan() {
-    const apiKeys =
-      _.get(this.serverless.service.provider.apiGateway, 'apiKeys') ||
-      this.serverless.service.provider.apiKeys;
-    const usagePlan =
-      _.get(this.serverless.service.provider.apiGateway, 'usagePlan') ||
-      this.serverless.service.provider.usagePlan;
+    const apiKeys = _.get(this.serverless.service.provider.apiGateway, 'apiKeys');
+    const usagePlan = _.get(this.serverless.service.provider.apiGateway, 'usagePlan');
     if (usagePlan || apiKeys) {
       const resources = this.serverless.service.provider.compiledCloudFormationTemplate.Resources;
       this.apiGatewayUsagePlanNames = [];
diff --git a/lib/plugins/aws/package/compile/events/apiGateway/lib/validate.js b/lib/plugins/aws/package/compile/events/api-gateway/lib/validate.js
similarity index 81%
rename from lib/plugins/aws/package/compile/events/apiGateway/lib/validate.js
rename to lib/plugins/aws/package/compile/events/api-gateway/lib/validate.js
index 1e68f4c474a..a5ed5c3b92b 100644
--- a/lib/plugins/aws/package/compile/events/apiGateway/lib/validate.js
+++ b/lib/plugins/aws/package/compile/events/api-gateway/lib/validate.js
@@ -1,9 +1,10 @@
 'use strict';
 
 const _ = require('lodash');
-const awsArnRegExs = require('../../../../../utils/arnRegularExpressions');
-const resolveLambdaTarget = require('../../../../../utils/resolveLambdaTarget');
+const awsArnRegExs = require('../../../../../utils/arn-regular-expressions');
+const resolveLambdaTarget = require('../../../../../utils/resolve-lambda-target');
 const ServerlessError = require('../../../../../../../serverless-error');
+const { log } = require('@serverless/utils/log');
 
 const NOT_FOUND = -1;
 const DEFAULT_STATUS_CODES = {
@@ -40,6 +41,38 @@ module.exports = {
   validate() {
     const events = [];
     const corsPreflight = {};
+    const apiGateway = this.serverless.service.provider.apiGateway;
+
+    if (apiGateway && apiGateway.restApiId && !apiGateway.restApiRootResourceId) {
+      throw new ServerlessError(
+        'Missing required "provider.apiGateway.restApiRootResourceId" property (needed if "provider.apiGateway.restApiId" is provided)',
+        'API_GATEWAY_MISSING_REST_API_ROOT_RESOURCE_ID'
+      );
+    }
+
+    if (
+      this.serverless.service.provider.apiGateway &&
+      this.serverless.service.provider.apiGateway.restApiId &&
+      this.serverless.service.provider.tracing &&
+      this.serverless.service.provider.tracing.apiGateway != null
+    ) {
+      throw new ServerlessError(
+        'When external API Gateway resource is imported via "provider.apiGateway.restApiId", property "provider.tracing.apiGateway" is ineffective.',
+        'API_GATEWAY_EXTERNAL_API_TRACING'
+      );
+    }
+
+    if (
+      this.serverless.service.provider.apiGateway &&
+      this.serverless.service.provider.apiGateway.restApiId &&
+      this.serverless.service.provider.logs &&
+      this.serverless.service.provider.logs.restApi != null
+    ) {
+      throw new ServerlessError(
+        'When external API Gateway resource is imported via "provider.apiGateway.restApiId", property "provider.logs.restApi" is ineffective.',
+        'API_GATEWAY_EXTERNAL_API_LOGS'
+      );
+    }
 
     Object.entries(this.serverless.service.functions).forEach(([functionName, functionObject]) => {
       (functionObject.events || []).forEach((event) => {
@@ -61,7 +94,7 @@ module.exports = {
             cors.headers = _.union(http.cors.headers, cors.headers);
             cors.methods = _.union(http.cors.methods, cors.methods);
             cors.origins = _.union(http.cors.origins, cors.origins);
-            cors.origin = http.cors.origin || '*';
+            cors.origin = http.cors.origin;
             cors.allowCredentials = cors.allowCredentials || http.cors.allowCredentials;
 
             // when merging, last one defined wins
@@ -83,7 +116,7 @@ module.exports = {
               const errorMessage = [
                 `You need to set the request uri when using the ${http.integration} integration.`,
               ];
-              throw new ServerlessError(errorMessage);
+              throw new ServerlessError(errorMessage, 'API_GATEWAY_MISSING_REQUEST_URI');
             }
 
             http.connectionType = this.getConnectionType(http);
@@ -92,7 +125,7 @@ module.exports = {
               const errorMessage = [
                 `You need to set connectionId when using ${http.connectionType} connectionType.`,
               ];
-              throw new ServerlessError(errorMessage);
+              throw new ServerlessError(errorMessage, 'API_GATEWAY_MISSING_CONNECTION_ID');
             }
           }
 
@@ -116,14 +149,14 @@ module.exports = {
 
               if (_.difference(keys, allowedKeys).length) {
                 const requestWarningMessage = [
-                  `Warning! You're using the ${http.integration} in combination with a request`,
+                  `You're using the ${http.integration} in combination with a request`,
                   ` configuration in your function "${functionName}". Only the `,
                   allowedKeys.map((value) => `request.${value}`).join(', '),
                   ` configs are available in conjunction with ${http.integration}.`,
                   ' Serverless will remove this configuration automatically',
                   ' before deployment.',
                 ].join('');
-                this.serverless.cli.log(requestWarningMessage);
+                log.warning(requestWarningMessage);
                 for (const key of keys) {
                   if (!allowedKeys.includes(key)) {
                     delete http.request[key];
@@ -138,12 +171,13 @@ module.exports = {
               }
             }
             if (http.response) {
-              const warningMessage = [
-                `Warning! You're using the ${http.integration} in combination with response`,
-                ` configuration in your function "${functionName}".`,
-                ' Serverless will remove this configuration automatically before deployment.',
-              ].join('');
-              this.serverless.cli.log(warningMessage);
+              log.warning(
+                [
+                  `You're using the ${http.integration} in combination with response`,
+                  ` configuration in your function "${functionName}".`,
+                  ' Serverless will remove this configuration automatically before deployment.',
+                ].join('')
+              );
 
               delete http.response;
             }
@@ -158,7 +192,8 @@ module.exports = {
                 `Invalid stage name ${stage}:`,
                 'it should contains only [-_a-zA-Z0-9] for AWS provider if http event are present',
                 'according to API Gateway limitation.',
-              ].join(' ')
+              ].join(' '),
+              'API_GATEWAY_INVALID_STAGE_NAME'
             );
           }
 
@@ -235,7 +270,8 @@ module.exports = {
           _.isObject(authorizer.arn)
         ) {
           throw new ServerlessError(
-            'Please provide an authorizer name for authorizers of type COGNITO_USER_POOLS'
+            'Please provide an authorizer name for authorizers of type COGNITO_USER_POOLS',
+            'API_GATEWAY_MISSING_AUTHORIZER_NAME'
           );
         } else {
           name = this.provider.naming.extractAuthorizerNameFromArn(arn);
@@ -243,7 +279,10 @@ module.exports = {
       } else if (authorizer.name) {
         authorizerFunctionName = name = authorizer.name;
       } else {
-        throw new ServerlessError('Please provide either an authorizer name or ARN');
+        throw new ServerlessError(
+          'Please provide either an authorizer name or ARN',
+          'API_GATEWAY_MISSING_AUTHORIZER_NAME_OR_ARN'
+        );
       }
 
       if (!type) {
@@ -274,7 +313,10 @@ module.exports = {
       managedExternally = false;
     }
 
-    if (typeof identitySource === 'undefined') {
+    if (
+      !identitySource &&
+      !(type && type.toUpperCase() === 'REQUEST' && resultTtlInSeconds === 0)
+    ) {
       identitySource = 'method.request.header.Authorization';
     }
 
@@ -289,7 +331,7 @@ module.exports = {
       const errorMessage = [
         'Cognito claims can only be filtered when using the lambda integration type',
       ];
-      throw new ServerlessError(errorMessage);
+      throw new ServerlessError(errorMessage, 'API_GATEWAY_INVALID_COGNITO_CLAIMS');
     }
 
     return {
@@ -317,8 +359,7 @@ module.exports = {
       'X-Amz-User-Agent',
     ];
 
-    let cors = {
-      origins: ['*'],
+    const cors = {
       origin: '*',
       methods: ['OPTIONS'],
       headers,
@@ -326,7 +367,10 @@ module.exports = {
     };
 
     if (typeof http.cors === 'object') {
-      cors = http.cors;
+      if (http.cors.origins) {
+        delete cors.origin;
+      }
+      Object.assign(cors, http.cors);
       cors.methods = cors.methods || [];
       cors.allowCredentials = Boolean(cors.allowCredentials);
 
diff --git a/lib/plugins/aws/package/compile/events/cloudFront.js b/lib/plugins/aws/package/compile/events/cloud-front.js
similarity index 79%
rename from lib/plugins/aws/package/compile/events/cloudFront.js
rename to lib/plugins/aws/package/compile/events/cloud-front.js
index ce5c44cab3d..ee6a734e4ee 100644
--- a/lib/plugins/aws/package/compile/events/cloudFront.js
+++ b/lib/plugins/aws/package/compile/events/cloud-front.js
@@ -2,8 +2,8 @@
 
 const _ = require('lodash');
 const url = require('url');
-const chalk = require('chalk');
 const ServerlessError = require('../../../../../serverless-error');
+const { log, style } = require('@serverless/utils/log');
 
 const originLimits = { maxTimeout: 30, maxMemorySize: 10240 };
 const viewerLimits = { maxTimeout: 5, maxMemorySize: 128 };
@@ -25,18 +25,18 @@ class AwsCompileCloudFrontEvents {
     const originObjectSchema = {
       type: 'object',
       properties: {
-        ConnectionAttempts: { type: 'integer', miminum: 1, maximum: 3 },
-        ConnectionTimeout: { type: 'integer', miminum: 1, maximum: 10 },
+        ConnectionAttempts: { type: 'integer', minimum: 1, maximum: 3 },
+        ConnectionTimeout: { type: 'integer', minimum: 1, maximum: 10 },
         CustomOriginConfig: {
           type: 'object',
           properties: {
-            HTTPPort: { type: 'integer', miminum: 0, maximum: 65535 },
-            HTTPSPort: { type: 'integer', miminum: 0, maximum: 65535 },
-            OriginKeepaliveTimeout: { type: 'integer', miminum: 1, maximum: 60 },
+            HTTPPort: { type: 'integer', minimum: 0, maximum: 65535 },
+            HTTPSPort: { type: 'integer', minimum: 0, maximum: 65535 },
+            OriginKeepaliveTimeout: { type: 'integer', minimum: 1, maximum: 60 },
             OriginProtocolPolicy: {
               enum: ['http-only', 'match-viewer', 'https-only'],
             },
-            OriginReadTimeout: { type: 'integer', miminum: 1, maximum: 60 },
+            OriginReadTimeout: { type: 'integer', minimum: 1, maximum: 60 },
             OriginSSLProtocols: {
               type: 'array',
               items: { enum: ['SSLv3', 'TLSv1', 'TLSv1.1', 'TLSv1.2'] },
@@ -123,37 +123,6 @@ class AwsCompileCloudFrontEvents {
             },
           ],
         },
-        ForwardedValues: {
-          type: 'object',
-          properties: {
-            Cookies: {
-              anyOf: [
-                {
-                  type: 'object',
-                  properties: {
-                    Forward: { enum: ['all', 'none'] },
-                  },
-                  additionalProperties: false,
-                  required: ['Forward'],
-                },
-                {
-                  type: 'object',
-                  properties: {
-                    Forward: { const: 'whitelist' },
-                    WhitelistedNames: { type: 'array', items: { type: 'string' } },
-                  },
-                  additionalProperties: false,
-                  required: ['Forward', 'WhitelistedNames'],
-                },
-              ],
-            },
-            Headers: { type: 'array', items: { type: 'string' } },
-            QueryString: { type: 'boolean' },
-            QueryStringCacheKeys: { type: 'array', items: { type: 'string' } },
-          },
-          additionalProperties: false,
-          required: ['QueryString'],
-        },
         CachePolicyId: { type: 'string' },
         Compress: { type: 'boolean' },
         FieldLevelEncryptionId: { type: 'string' },
@@ -163,6 +132,12 @@ class AwsCompileCloudFrontEvents {
         ViewerProtocolPolicy: {
           enum: ['allow-all', 'redirect-to-https', 'https-only'],
         },
+        TrustedKeyGroups: {
+          type: 'array',
+          items: {
+            anyOf: [{ type: 'string' }, { $ref: '#/definitions/awsCfRef' }],
+          },
+        },
       },
       additionalProperties: false,
     };
@@ -198,32 +173,6 @@ class AwsCompileCloudFrontEvents {
     });
 
     this.hooks = {
-      'initialize': () => {
-        if (
-          this.serverless.service.provider.name === 'aws' &&
-          Object.values(this.serverless.service.functions).some(({ events }) =>
-            events.some(({ cloudFront: eventObject }) => {
-              const behaviorConfig = eventObject && eventObject.behavior;
-              if (!behaviorConfig) return false;
-              return (
-                behaviorConfig.ForwardedValues ||
-                behaviorConfig.MinTTL !== undefined ||
-                behaviorConfig.MaxTTL !== undefined ||
-                behaviorConfig.DefaultTTL !== undefined
-              );
-            })
-          )
-        ) {
-          this.serverless._logDeprecation(
-            'CLOUDFRONT_CACHE_BEHAVIOR_FORWARDED_VALUES_AND_TTL',
-            'Cloudfront has deprecated the use of the ForwardedValues, MinTTL, MaxTTL' +
-              'and DefaultTTL field to configure cache behavior.' +
-              'Please use "provider.cloudfront.cachePolicies" to define Cache Policies' +
-              'and reference it here with "cachePolicy.name" property.' +
-              'You can also reference existing policies with "cachePolicy.id".'
-          );
-        }
-      },
       'package:initialize': this.validate.bind(this),
       'before:package:compileFunctions': this.prepareFunctions.bind(this),
       'package:compileEvents': () => {
@@ -249,7 +198,7 @@ class AwsCompileCloudFrontEvents {
           "Don't forget to manually remove your Lambda@Edge functions ",
           'once the CloudFront distribution removal is successfully propagated!',
         ].join('');
-        this.serverless.cli.log(message, 'Serverless', { color: 'orange' });
+        log.warning(message);
       }
     }
   }
@@ -262,13 +211,15 @@ class AwsCompileCloudFrontEvents {
         const { eventType = 'default' } = cloudFront;
         const { maxMemorySize, maxTimeout } = this.lambdaEdgeLimits[eventType];
         if (functionObj.memorySize && functionObj.memorySize > maxMemorySize) {
-          throw new Error(
-            `"${functionName}" memorySize is greater than ${maxMemorySize} which is not supported by Lambda@Edge functions of type "${eventType}"`
+          throw new ServerlessError(
+            `"${functionName}" memorySize is greater than ${maxMemorySize} which is not supported by Lambda@Edge functions of type "${eventType}"`,
+            'LAMBDA_EDGE_UNSUPPORTED_MEMORY_SIZE'
           );
         }
         if (functionObj.timeout && functionObj.timeout > maxTimeout) {
-          throw new Error(
-            `"${functionName}" timeout is greater than ${maxTimeout} which is not supported by Lambda@Edge functions of type "${eventType}"`
+          throw new ServerlessError(
+            `"${functionName}" timeout is greater than ${maxTimeout} which is not supported by Lambda@Edge functions of type "${eventType}"`,
+            'LAMBDA_EDGE_UNSUPPORTED_TIMEOUT_VALUE'
           );
         }
       });
@@ -317,9 +268,11 @@ class AwsCompileCloudFrontEvents {
   }
 
   compileCloudFrontEvents() {
-    this.cloudFrontDistributionLogicalId = this.provider.naming.getCloudFrontDistributionLogicalId();
+    this.cloudFrontDistributionLogicalId =
+      this.provider.naming.getCloudFrontDistributionLogicalId();
 
-    this.cloudFrontDistributionDomainNameLogicalId = this.provider.naming.getCloudFrontDistributionDomainNameLogicalId();
+    this.cloudFrontDistributionDomainNameLogicalId =
+      this.provider.naming.getCloudFrontDistributionDomainNameLogicalId();
 
     const lambdaAtEdgeFunctions = [];
 
@@ -416,7 +369,8 @@ class AwsCompileCloudFrontEvents {
             if (event.cloudFront.isDefaultOrigin) {
               if (defaultOrigin && defaultOrigin !== origin) {
                 throw new ServerlessError(
-                  'Found more than one cloudfront event with "isDefaultOrigin" defined'
+                  'Found more than one cloudfront event with "isDefaultOrigin" defined',
+                  'CLOUDFRONT_MULTIPLE_DEFAULT_ORIGIN_EVENTS'
                 );
               }
               defaultOrigin = origin;
@@ -427,28 +381,17 @@ class AwsCompileCloudFrontEvents {
             };
             let shouldAssignCachePolicy = true;
             if (event.cloudFront.behavior) {
-              if (
-                event.cloudFront.behavior.ForwardedValues ||
-                event.cloudFront.behavior.MinTTL !== undefined ||
-                event.cloudFront.behavior.MaxTTL !== undefined ||
-                event.cloudFront.behavior.DefaultTTL !== undefined
-              ) {
-                behavior.ForwardedValues = { QueryString: false };
-                shouldAssignCachePolicy = false;
-              }
               Object.assign(behavior, event.cloudFront.behavior);
             }
 
+            if (event.cloudFront.behavior && event.cloudFront.behavior.CachePolicyId) {
+              Object.assign(behavior, {
+                CachePolicyId: event.cloudFront.behavior.CachePolicyId,
+              });
+              shouldAssignCachePolicy = false;
+            }
+
             if (event.cloudFront.cachePolicy) {
-              if (!shouldAssignCachePolicy) {
-                throw new ServerlessError(
-                  'Both cachePolicy and deprecated fields ForwardedValues, MinTTL, MaxTTL' +
-                    'and DefaultTTL found in function ${functionObj.name} configuration.' +
-                    'Specifying a cachePolicy override those deprecated parameters.' +
-                    'Please remove one of the cache behavior definition.',
-                  'CACHE_POLICY_ID_AND_DEPRECATED_FIELDS_USED'
-                );
-              }
               const { id, name } = event.cloudFront.cachePolicy;
               if (name) {
                 if (!this.cachePolicies.has(name)) {
@@ -464,8 +407,11 @@ class AwsCompileCloudFrontEvents {
                   Ref: this.provider.naming.getCloudFrontCachePolicyLogicalId(name),
                 },
               });
-              // Backward compatibilty - Assinging default cache policy only if none of the ForwardedValues, MinTTL, MaxTTL and DefaultTTL deprecated fields are defined.
-            } else if (shouldAssignCachePolicy) {
+              shouldAssignCachePolicy = false;
+            }
+
+            // Assigning default cache policy only if cache policy reference is not defined.
+            if (shouldAssignCachePolicy) {
               // Assigning default Managed-CachingOptimized Cache Policy.
               // See details at https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/using-managed-cache-policies.html#managed-cache-policies-list
               Object.assign(behavior, {
@@ -514,9 +460,8 @@ class AwsCompileCloudFrontEvents {
     });
 
     unusedUserDefinedCachePolicies.forEach((unusedUserDefinedCachePolicy) => {
-      this.serverless.cli.log(
-        `WARNING: provider.cloudFront.cachePolicies.${unusedUserDefinedCachePolicy} ` +
-          'not used by any cloudFront event configuration'
+      log.warning(
+        `Setting "provider.cloudFront.cachePolicies.${unusedUserDefinedCachePolicy}" is not used by any cloudFront event configuration.`
       );
     });
 
@@ -534,13 +479,17 @@ class AwsCompileCloudFrontEvents {
     if (lambdaAtEdgeFunctions.length) {
       if (this.provider.getRegion() !== 'us-east-1') {
         throw new ServerlessError(
-          'CloudFront associated functions have to be deployed to the us-east-1 region.'
+          'CloudFront associated functions have to be deployed to the us-east-1 region.',
+          'CLOUDFRONT_INVALID_REGION'
         );
       }
 
       // Check if all behaviors got unique pathPatterns
       if (behaviors.length !== _.uniqBy(behaviors, 'PathPattern').length) {
-        throw new ServerlessError('Found more than one behavior with the same PathPattern');
+        throw new ServerlessError(
+          'Found more than one behavior with the same PathPattern',
+          'CLOUDFRONT_MULTIPLE_BEHAVIORS_FOR_SINGLE_PATH_PATTERN'
+        );
       }
 
       // Check if all event types in every behavior is unique
@@ -553,7 +502,8 @@ class AwsCompileCloudFrontEvents {
         })
       ) {
         throw new ServerlessError(
-          'The event type of a function association must be unique in the cache behavior'
+          'The event type of a function association must be unique in the cache behavior',
+          'CLOUDFRONT_EVENT_TYPE_NON_UNIQUE_CACHE_BEHAVIOR'
         );
       }
 
@@ -563,7 +513,8 @@ class AwsCompileCloudFrontEvents {
         if (!origin) {
           if (origins.length > 1) {
             throw new ServerlessError(
-              'Found more than one origin but none of the cloudfront event has "isDefaultOrigin" defined'
+              'Found more than one origin but none of the cloudfront event has "isDefaultOrigin" defined',
+              'CLOUDFRONT_MULTIPLE_DEFAULT_ORIGIN_EVENTS'
             );
           }
           origin = origins[0];
@@ -575,9 +526,10 @@ class AwsCompileCloudFrontEvents {
 
       const lambdaInvokePermissions = lambdaAtEdgeFunctions.reduce(
         (permissions, lambdaAtEdgeFunction) => {
-          const invokePermissionName = this.provider.naming.getLambdaAtEdgeInvokePermissionLogicalId(
-            lambdaAtEdgeFunction.functionName
-          );
+          const invokePermissionName =
+            this.provider.naming.getLambdaAtEdgeInvokePermissionLogicalId(
+              lambdaAtEdgeFunction.functionName
+            );
           const invokePermission = {
             Type: 'AWS::Lambda::Permission',
             Properties: {
@@ -612,18 +564,16 @@ class AwsCompileCloudFrontEvents {
       Object.assign(Resources, lambdaInvokePermissions);
 
       if (!Resources.IamRoleLambdaExecution) {
-        this.serverless.cli.log(
-          chalk.magenta('Remember to add required lambda@edge permissions to your execution role.')
-        );
-        this.serverless.cli.log(
-          chalk.magenta(
+        log.notice(
+          `Remember to add required lambda@edge permissions to your execution role. Documentation: ${style.link(
             'https://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/lambda-edge-permissions.html'
-          )
+          )}`
         );
       } else {
-        const lambdaAssumeStatement = Resources.IamRoleLambdaExecution.Properties.AssumeRolePolicyDocument.Statement.find(
-          (statement) => statement.Principal.Service.includes('lambda.amazonaws.com')
-        );
+        const lambdaAssumeStatement =
+          Resources.IamRoleLambdaExecution.Properties.AssumeRolePolicyDocument.Statement.find(
+            (statement) => statement.Principal.Service.includes('lambda.amazonaws.com')
+          );
         if (lambdaAssumeStatement) {
           lambdaAssumeStatement.Principal.Service.push('edgelambda.amazonaws.com');
         }
diff --git a/lib/plugins/aws/package/compile/events/cloudWatchEvent.js b/lib/plugins/aws/package/compile/events/cloud-watch-event.js
similarity index 95%
rename from lib/plugins/aws/package/compile/events/cloudWatchEvent.js
rename to lib/plugins/aws/package/compile/events/cloud-watch-event.js
index eb37ebf200d..f55bc82e942 100644
--- a/lib/plugins/aws/package/compile/events/cloudWatchEvent.js
+++ b/lib/plugins/aws/package/compile/events/cloud-watch-event.js
@@ -70,7 +70,8 @@ class AwsCompileCloudWatchEventEvents {
                   'You can only set one of input, inputPath, or inputTransformer ',
                   'properties at the same time for cloudwatch events. ',
                   'Please check the AWS docs for more info',
-                ].join('')
+                ].join(''),
+                'CLOUDWATCH_MULTIPLE_INPUT_PROPERTIES'
               );
             }
 
@@ -90,10 +91,11 @@ class AwsCompileCloudWatchEventEvents {
               functionName,
               cloudWatchEventNumberInFunction
             );
-            const lambdaPermissionLogicalId = this.provider.naming.getLambdaCloudWatchEventPermissionLogicalId(
-              functionName,
-              cloudWatchEventNumberInFunction
-            );
+            const lambdaPermissionLogicalId =
+              this.provider.naming.getLambdaCloudWatchEventPermissionLogicalId(
+                functionName,
+                cloudWatchEventNumberInFunction
+              );
             const cloudWatchId = this.provider.naming.getCloudWatchEventId(functionName);
 
             const cloudWatchEventRuleTemplate = `
diff --git a/lib/plugins/aws/package/compile/events/cloudWatchLog.js b/lib/plugins/aws/package/compile/events/cloud-watch-log.js
similarity index 83%
rename from lib/plugins/aws/package/compile/events/cloudWatchLog.js
rename to lib/plugins/aws/package/compile/events/cloud-watch-log.js
index 657fd84427a..c0a185347be 100644
--- a/lib/plugins/aws/package/compile/events/cloudWatchLog.js
+++ b/lib/plugins/aws/package/compile/events/cloud-watch-log.js
@@ -29,7 +29,8 @@ class AwsCompileCloudWatchLogEvents {
   }
 
   compileCloudWatchLogEvents() {
-    const logGroupNames = [];
+    const cloudWatchLogEventNumberMap = {};
+    const CLOUDWATCHLOG_LOG_GROUP_EVENT_PER_FUNCTION_LIMIT = 2;
 
     this.serverless.service.getAllFunctions().forEach((functionName) => {
       const functionObj = this.serverless.service.getFunction(functionName);
@@ -54,14 +55,22 @@ class AwsCompileCloudWatchLogEvents {
               FilterPattern = '';
             }
 
-            if (logGroupNames.includes(LogGroupName)) {
+            cloudWatchLogEventNumberMap[LogGroupName] =
+              cloudWatchLogEventNumberMap[LogGroupName] || 0;
+            cloudWatchLogEventNumberMap[LogGroupName]++;
+            if (
+              cloudWatchLogEventNumberMap[LogGroupName] >
+              CLOUDWATCHLOG_LOG_GROUP_EVENT_PER_FUNCTION_LIMIT
+            ) {
               const errorMessage = [
-                `"${LogGroupName}" logGroup for cloudwatchLog event is duplicated.`,
-                ' This property can only be set once per CloudFormation stack.',
+                `Only ${CLOUDWATCHLOG_LOG_GROUP_EVENT_PER_FUNCTION_LIMIT} subscription filters can be configured per log group.`,
+                ` You're attempting to configure more subscription filters than allowed for "${LogGroupName}".`,
               ].join('');
-              throw new ServerlessError(errorMessage);
+              throw new ServerlessError(
+                errorMessage,
+                'CLOUDWATCHLOG_LOG_GROUP_EVENT_PER_FUNCTION_LIMIT_EXCEEDED'
+              );
             }
-            logGroupNames.push(LogGroupName);
             logGroupNamesThisFunction.push(LogGroupName);
 
             const lambdaLogicalId = this.provider.naming.getLambdaLogicalId(functionName);
@@ -69,9 +78,8 @@ class AwsCompileCloudWatchLogEvents {
               functionName,
               cloudWatchLogNumberInFunction
             );
-            const lambdaPermissionLogicalId = this.provider.naming.getLambdaCloudWatchLogPermissionLogicalId(
-              functionName
-            );
+            const lambdaPermissionLogicalId =
+              this.provider.naming.getLambdaCloudWatchLogPermissionLogicalId(functionName);
 
             // unescape quotes once when the first quote is detected escaped
             const idxFirstSlash = FilterPattern.indexOf('\\');
diff --git a/lib/plugins/aws/package/compile/events/cognitoUserPool.js b/lib/plugins/aws/package/compile/events/cognito-user-pool.js
similarity index 92%
rename from lib/plugins/aws/package/compile/events/cognitoUserPool.js
rename to lib/plugins/aws/package/compile/events/cognito-user-pool.js
index 8dedf86390d..736de405478 100644
--- a/lib/plugins/aws/package/compile/events/cognitoUserPool.js
+++ b/lib/plugins/aws/package/compile/events/cognito-user-pool.js
@@ -2,7 +2,7 @@
 
 const _ = require('lodash');
 const BbPromise = require('bluebird');
-const { addCustomResourceToService } = require('../../../customResources');
+const { addCustomResourceToService } = require('../../../custom-resources');
 const ServerlessError = require('../../../../../serverless-error');
 
 const validTriggerSources = [
@@ -39,6 +39,7 @@ class AwsCompileCognitoUserPoolEvents {
         pool: { type: 'string', maxLength: 128, pattern: '^[\\w\\s+=,.@-]+$' },
         trigger: { enum: validTriggerSources },
         existing: { type: 'boolean' },
+        forceDeploy: { type: 'boolean' },
       },
       required: ['pool', 'trigger'],
       additionalProperties: false,
@@ -97,11 +98,12 @@ class AwsCompileCognitoUserPoolEvents {
                   },
                 },
               };
-              const lambdaPermissionLogicalId = this.provider.naming.getLambdaCognitoUserPoolPermissionLogicalId(
-                cognitoUserPoolTriggerFunction.functionName,
-                cognitoUserPoolTriggerFunction.poolName,
-                cognitoUserPoolTriggerFunction.triggerSource
-              );
+              const lambdaPermissionLogicalId =
+                this.provider.naming.getLambdaCognitoUserPoolPermissionLogicalId(
+                  cognitoUserPoolTriggerFunction.functionName,
+                  cognitoUserPoolTriggerFunction.poolName,
+                  cognitoUserPoolTriggerFunction.triggerSource
+                );
               const permissionCFResource = {
                 [lambdaPermissionLogicalId]: permissionTemplate,
               };
@@ -140,7 +142,7 @@ class AwsCompileCognitoUserPoolEvents {
         functionObj.events.forEach((event) => {
           if (event.cognitoUserPool && event.cognitoUserPool.existing) {
             numEventsForFunc++;
-            const { pool, trigger } = event.cognitoUserPool;
+            const { pool, trigger, forceDeploy } = event.cognitoUserPool;
             usesExistingCognitoUserPool = funcUsesExistingCognitoUserPool = true;
 
             if (!currentPoolName) {
@@ -151,14 +153,14 @@ class AwsCompileCognitoUserPoolEvents {
                 'Only one Cognito User Pool can be configured per function.',
                 ` In "${FunctionName}" you're attempting to configure "${currentPoolName}" and "${pool}" at the same time.`,
               ].join('');
-              throw new ServerlessError(errorMessage);
+              throw new ServerlessError(errorMessage, 'COGNITO_MULTIPLE_USER_POOLS_PER_FUNCTION');
             }
 
             const eventFunctionLogicalId = this.provider.naming.getLambdaLogicalId(functionName);
-            const customResourceFunctionLogicalId = this.provider.naming.getCustomResourceCognitoUserPoolHandlerFunctionLogicalId();
-            const customPoolResourceLogicalId = this.provider.naming.getCustomResourceCognitoUserPoolResourceLogicalId(
-              functionName
-            );
+            const customResourceFunctionLogicalId =
+              this.provider.naming.getCustomResourceCognitoUserPoolHandlerFunctionLogicalId();
+            const customPoolResourceLogicalId =
+              this.provider.naming.getCustomResourceCognitoUserPoolResourceLogicalId(functionName);
 
             // store how often the custom Cognito User Pool resource is used
             if (poolResources[pool]) {
@@ -170,6 +172,7 @@ class AwsCompileCognitoUserPoolEvents {
             }
 
             let customCognitoUserPoolResource;
+            const forceDeployProperty = forceDeploy ? Date.now() : undefined;
             if (numEventsForFunc === 1) {
               customCognitoUserPoolResource = {
                 [customPoolResourceLogicalId]: {
@@ -187,6 +190,7 @@ class AwsCompileCognitoUserPoolEvents {
                         Trigger: trigger,
                       },
                     ],
+                    ForceDeploy: forceDeployProperty,
                   },
                 },
               };
diff --git a/lib/plugins/aws/package/compile/events/eventBridge/index.js b/lib/plugins/aws/package/compile/events/event-bridge/index.js
similarity index 71%
rename from lib/plugins/aws/package/compile/events/eventBridge/index.js
rename to lib/plugins/aws/package/compile/events/event-bridge/index.js
index 7c0e90b384f..f08dee7d8f0 100644
--- a/lib/plugins/aws/package/compile/events/eventBridge/index.js
+++ b/lib/plugins/aws/package/compile/events/event-bridge/index.js
@@ -1,7 +1,7 @@
 'use strict';
 
 const _ = require('lodash');
-const { addCustomResourceToService } = require('../../../../customResources');
+const { addCustomResourceToService } = require('../../../../custom-resources');
 const ServerlessError = require('../../../../../../serverless-error');
 const { makeAndHashRuleName, makeEventBusTargetId, makeRuleName } = require('./utils');
 
@@ -13,16 +13,38 @@ class AwsCompileEventBridgeEvents {
 
     this.hooks = {
       'initialize': () => {
-        if (!_.get(this.serverless.service.provider, 'eventBridge.useCloudFormation')) {
-          const hasFunctionsWithEventBridgeTrigger = Object.values(
-            this.serverless.service.functions
-          ).some(({ events }) => events.some(({ eventBridge }) => eventBridge));
-          if (hasFunctionsWithEventBridgeTrigger) {
+        const useCloudFormation = _.get(
+          this.serverless.service.provider,
+          'eventBridge.useCloudFormation'
+        );
+        const hasFunctionsWithEventBridgeTrigger = Object.values(
+          this.serverless.service.functions
+        ).some(({ events }) => events.some(({ eventBridge }) => eventBridge));
+
+        if (hasFunctionsWithEventBridgeTrigger) {
+          if (useCloudFormation === false) {
             this.serverless._logDeprecation(
-              'AWS_EVENT_BRIDGE_CUSTOM_RESOURCE',
-              'AWS EventBridge resources are not being created using native CloudFormation, this is now possible and the use of custom resources is deprecated. Set `eventBridge.useCloudFormation: true` as a provider property to use this now.'
+              'AWS_EVENT_BRIDGE_CUSTOM_RESOURCE_LEGACY_OPT_IN',
+              'Support for provisioning AWS EventBridge resources without native CloudFormation' +
+                ' resources is deprecated and will no longer be maintained. If you want to' +
+                ' upgrade to native CloudFormation, remove "eventBridge.useCloudFormation"' +
+                ' setting from your configuration.'
+            );
+          } else if (useCloudFormation === true) {
+            this.serverless._logDeprecation(
+              'AWS_EVENT_BRIDGE_CUSTOM_RESOURCE_LEGACY_OPT_IN',
+              'Provisioning AWS EventBridge resources with native CloudFormation is now' +
+                ' enabled by default. Please remove "eventBridge.useCloudFormation" from your' +
+                ' configuration as this setting will not be recognized in the next major release.'
             );
           }
+        } else if (useCloudFormation != null) {
+          this.serverless._logDeprecation(
+            'AWS_EVENT_BRIDGE_CUSTOM_RESOURCE_LEGACY_OPT_IN',
+            'Your service does not configure any "eventBridge" events. Please remove' +
+              ' "eventBridge.useCloudFormation" from your configuration as this setting' +
+              ' will not be recognized in the next major release.'
+          );
         }
       },
       'package:compileEvents': this.compileEventBridgeEvents.bind(this),
@@ -56,7 +78,8 @@ class AwsCompileEventBridgeEvents {
             },
           ],
         },
-        schedule: { pattern: '^(?:cron|rate)\\(.+\\)$' },
+        schedule: { pattern: '^(?:cron|rate)\\(.+\\)$', type: 'string' },
+        enabled: { type: 'boolean' },
         pattern: {
           type: 'object',
           properties: {
@@ -86,6 +109,22 @@ class AwsCompileEventBridgeEvents {
           required: ['inputTemplate'],
           additionalProperties: false,
         },
+        retryPolicy: {
+          type: 'object',
+          properties: {
+            maximumEventAge: {
+              type: 'integer',
+              minimum: 60,
+              maximum: 86400,
+            },
+            maximumRetryAttempts: {
+              type: 'integer',
+              minimum: 0,
+              maximum: 185,
+            },
+          },
+        },
+        deadLetterQueueArn: { $ref: '#/definitions/awsArn' },
       },
       anyOf: [{ required: ['pattern'] }, { required: ['schedule'] }],
     });
@@ -97,7 +136,7 @@ class AwsCompileEventBridgeEvents {
     const { compiledCloudFormationTemplate } = provider;
     const iamRoleStatements = [];
     const { eventBridge: options } = provider;
-    const shouldUseCloudFormation = options ? options.useCloudFormation : false;
+    const shouldUseCloudFormation = options ? options.useCloudFormation : true;
     let hasEventBusesIamRoleStatement = false;
     let anyFuncUsesEventBridge = false;
 
@@ -116,17 +155,26 @@ class AwsCompileEventBridgeEvents {
             const Input = event.eventBridge.input;
             const InputPath = event.eventBridge.inputPath;
             let InputTransformer = event.eventBridge.inputTransformer;
+            let RetryPolicy = event.eventBridge.retryPolicy;
+            let DeadLetterConfig;
+
             const RuleName = makeAndHashRuleName({
               functionName: FunctionName,
               index: idx,
             });
 
+            let State = 'ENABLED';
+            if (event.eventBridge.enabled === false) {
+              State = 'DISABLED';
+            }
+
             if ([Input, InputPath, InputTransformer].filter(Boolean).length > 1) {
               throw new ServerlessError(
                 [
                   'You can only set one of input, inputPath, or inputTransformer ',
                   'properties for eventBridge events.',
-                ].join('')
+                ].join(''),
+                'EVENTBRIDGE_MULTIPLE_INPUT_PROPERTIES'
               );
             }
 
@@ -137,6 +185,32 @@ class AwsCompileEventBridgeEvents {
               );
             }
 
+            if (RetryPolicy) {
+              if (!shouldUseCloudFormation) {
+                throw new ServerlessError(
+                  'Configuring RetryPolicy is not supported for EventBridge integration backed by Custom Resources. Please use "provider.eventBridge.useCloudFormation" setting to use native CloudFormation support for EventBridge.',
+                  'ERROR_INVALID_RETRY_POLICY_TO_EVENT_BUS_CUSTOM_RESOURCE'
+                );
+              }
+
+              RetryPolicy = {
+                MaximumEventAgeInSeconds: RetryPolicy.maximumEventAge,
+                MaximumRetryAttempts: RetryPolicy.maximumRetryAttempts,
+              };
+            }
+
+            if (event.eventBridge.deadLetterQueueArn) {
+              if (!shouldUseCloudFormation) {
+                throw new ServerlessError(
+                  'Configuring DeadLetterConfig is not supported for EventBridge integration backed by Custom Resources. Please use "provider.eventBridge.useCloudFormation" setting to use native CloudFormation support for EventBridge.',
+                  'ERROR_INVALID_DEAD_LETTER_CONFIG_TO_EVENT_BUS_CUSTOM_RESOURCE'
+                );
+              }
+              DeadLetterConfig = {
+                Arn: event.eventBridge.deadLetterQueueArn,
+              };
+            }
+
             const eventBusName = EventBus;
             // Custom resources will be deprecated in next major release
             if (!shouldUseCloudFormation) {
@@ -146,6 +220,7 @@ class AwsCompileEventBridgeEvents {
                 compiledCloudFormationTemplate,
                 functionName,
                 RuleName,
+                State,
                 Input,
                 InputPath,
                 InputTransformer,
@@ -166,6 +241,7 @@ class AwsCompileEventBridgeEvents {
                 compiledCloudFormationTemplate,
                 functionName,
                 RuleName,
+                State,
                 Input,
                 InputPath,
                 InputTransformer,
@@ -175,6 +251,8 @@ class AwsCompileEventBridgeEvents {
                 idx,
                 hasEventBusesIamRoleStatement,
                 iamRoleStatements,
+                RetryPolicy,
+                DeadLetterConfig,
               });
             }
           }
@@ -195,6 +273,7 @@ class AwsCompileEventBridgeEvents {
     compiledCloudFormationTemplate,
     functionName,
     RuleName,
+    State,
     Input,
     InputPath,
     InputTransformer,
@@ -206,7 +285,7 @@ class AwsCompileEventBridgeEvents {
   }) {
     if (_.isObject(eventBusName)) {
       throw new ServerlessError(
-        'Referencing event bus with CloudFormation intrinsic functions is not supported for EventBrigde integration backed by Custom Resources. Please use `provider.eventBridge.useCloudFormation` setting to use native CloudFormation support for EventBridge.',
+        'Referencing event bus with CloudFormation intrinsic functions is not supported for EventBridge integration backed by Custom Resources. Please use `provider.eventBridge.useCloudFormation` setting to use native CloudFormation support for EventBridge.',
         'ERROR_INVALID_REFERENCE_TO_EVENT_BUS_CUSTOM_RESOURCE'
       );
     }
@@ -218,11 +297,10 @@ class AwsCompileEventBridgeEvents {
     }
 
     const eventFunctionLogicalId = this.provider.naming.getLambdaLogicalId(functionName);
-    const customResourceFunctionLogicalId = this.provider.naming.getCustomResourceEventBridgeHandlerFunctionLogicalId();
-    const customEventBridgeResourceLogicalId = this.provider.naming.getCustomResourceEventBridgeResourceLogicalId(
-      functionName,
-      idx
-    );
+    const customResourceFunctionLogicalId =
+      this.provider.naming.getCustomResourceEventBridgeHandlerFunctionLogicalId();
+    const customEventBridgeResourceLogicalId =
+      this.provider.naming.getCustomResourceEventBridgeResourceLogicalId(functionName, idx);
 
     const customEventBridge = {
       Type: 'Custom::EventBridge',
@@ -235,6 +313,7 @@ class AwsCompileEventBridgeEvents {
         FunctionName,
         EventBridgeConfig: {
           RuleName,
+          State,
           EventBus,
           Schedule,
           Pattern,
@@ -245,9 +324,8 @@ class AwsCompileEventBridgeEvents {
       },
     };
 
-    compiledCloudFormationTemplate.Resources[
-      customEventBridgeResourceLogicalId
-    ] = customEventBridge;
+    compiledCloudFormationTemplate.Resources[customEventBridgeResourceLogicalId] =
+      customEventBridge;
 
     if (!hasEventBusesIamRoleStatement && eventBusName && eventBusName !== 'default') {
       iamRoleStatements.push({
@@ -281,12 +359,15 @@ class AwsCompileEventBridgeEvents {
     compiledCloudFormationTemplate,
     functionName,
     RuleName,
+    State,
     Input,
     InputPath,
     InputTransformer,
     Pattern,
     Schedule,
     FunctionName,
+    RetryPolicy,
+    DeadLetterConfig,
     idx,
   }) {
     let eventBusResource;
@@ -326,11 +407,13 @@ class AwsCompileEventBridgeEvents {
       Id: makeEventBusTargetId(RuleName),
     };
 
-    const target = this.addInputConfigToTarget({
+    const target = this.configureTarget({
       target: targetBase,
       Input,
       InputPath,
       InputTransformer,
+      RetryPolicy,
+      DeadLetterConfig,
     });
 
     // Create a rule
@@ -339,18 +422,17 @@ class AwsCompileEventBridgeEvents {
       Properties: {
         // default event bus is used when EventBusName is not set
         EventBusName: eventBusName === 'default' ? undefined : eventBusName,
-        EventPattern: JSON.stringify(Pattern),
+        EventPattern: Pattern,
         Name: RuleName,
         ScheduleExpression: Schedule,
-        State: 'ENABLED',
+        State,
         Targets: [target],
       },
     };
     // If this stack is creating the event bus the rule must depend on it to ensure stack can be removed
     if (shouldCreateEventBus) {
-      eventRuleResource.DependsOn = this.provider.naming.getEventBridgeEventBusLogicalId(
-        eventBusName
-      );
+      eventRuleResource.DependsOn =
+        this.provider.naming.getEventBridgeEventBusLogicalId(eventBusName);
     }
 
     const ruleNameLogicalIdStub = makeRuleName({
@@ -440,7 +522,19 @@ class AwsCompileEventBridgeEvents {
     return null;
   }
 
-  addInputConfigToTarget({ target, Input, InputPath, InputTransformer }) {
+  configureTarget({ target, Input, InputPath, InputTransformer, RetryPolicy, DeadLetterConfig }) {
+    if (RetryPolicy) {
+      target = Object.assign(target, {
+        RetryPolicy,
+      });
+    }
+
+    if (DeadLetterConfig) {
+      target = Object.assign(target, {
+        DeadLetterConfig,
+      });
+    }
+
     if (Input) {
       target = Object.assign(target, {
         Input: JSON.stringify(Input),
@@ -459,6 +553,7 @@ class AwsCompileEventBridgeEvents {
       });
       return target;
     }
+
     return target;
   }
 }
diff --git a/lib/plugins/aws/package/compile/events/eventBridge/utils.js b/lib/plugins/aws/package/compile/events/event-bridge/utils.js
similarity index 100%
rename from lib/plugins/aws/package/compile/events/eventBridge/utils.js
rename to lib/plugins/aws/package/compile/events/event-bridge/utils.js
diff --git a/lib/plugins/aws/package/compile/events/httpApi.js b/lib/plugins/aws/package/compile/events/http-api.js
similarity index 89%
rename from lib/plugins/aws/package/compile/events/httpApi.js
rename to lib/plugins/aws/package/compile/events/http-api.js
index bc704795172..f6e631e2a43 100644
--- a/lib/plugins/aws/package/compile/events/httpApi.js
+++ b/lib/plugins/aws/package/compile/events/http-api.js
@@ -4,11 +4,11 @@ const _ = require('lodash');
 const d = require('d');
 const memoizee = require('memoizee');
 const memoizeeMethods = require('memoizee/methods');
+const { log } = require('@serverless/utils/log');
 const ServerlessError = require('../../../../../serverless-error');
-const { logWarning } = require('../../../../../classes/Error');
-const resolveLambdaTarget = require('../../../utils/resolveLambdaTarget');
+const resolveLambdaTarget = require('../../../utils/resolve-lambda-target');
 
-const allowedMethods = new Set(['GET', 'POST', 'PUT', 'PATCH', 'OPTIONS', 'HEAD', 'DELETE']);
+const allowedMethods = new Set(['ANY', 'GET', 'POST', 'PUT', 'PATCH', 'OPTIONS', 'HEAD', 'DELETE']);
 const methodPattern = new RegExp(`^(?:\\*|${Array.from(allowedMethods).join('|')})$`, 'i');
 const methodPathPattern = new RegExp(
   `^(?:\\*|(${Array.from(allowedMethods).join('|')}) (\\/\\S*))$`,
@@ -45,18 +45,11 @@ class HttpApiEvents {
       'initialize': () => {
         if (
           this.serverless.service.provider.name === 'aws' &&
-          this.serverless.service.provider.tags &&
-          !_.get(this.serverless.service.provider.httpApi, 'useProviderTags') &&
-          Object.values(this.serverless.service.functions).some(({ events }) =>
-            events.some(({ httpApi }) => httpApi)
-          )
+          _.get(this.serverless.service.provider.httpApi, 'useProviderTags')
         ) {
           this.serverless._logDeprecation(
-            'AWS_HTTP_API_USE_PROVIDER_TAGS',
-            'Starting with next major version, the provider tags ' +
-              'will be applied to Http Api Gateway by default. \n' +
-              'Set "provider.httpApi.useProviderTags" to "true" ' +
-              'to adapt to the new behavior now.'
+            'AWS_HTTP_API_USE_PROVIDER_TAGS_PROPERTY',
+            'Property "provider.httpApi.useProviderTags" is no longer effective as provider tags are applied to Http Api Gateway by default. You can safely remove this property from your configuration.'
           );
         }
       },
@@ -116,11 +109,7 @@ class HttpApiEvents {
       DisableExecuteApiEndpoint:
         this.config.disableDefaultEndpoint == null ? undefined : this.config.disableDefaultEndpoint,
     };
-    if (
-      this.serverless.service.provider.tags &&
-      this.serverless.service.provider.httpApi &&
-      this.serverless.service.provider.httpApi.useProviderTags
-    ) {
+    if (this.serverless.service.provider.tags) {
       const tags = Object.assign({}, this.serverless.service.provider.tags);
       properties.Tags = tags;
     }
@@ -166,6 +155,10 @@ class HttpApiEvents {
       },
     };
 
+    if (this.serverless.service.provider.tags) {
+      properties.Tags = Object.assign({}, this.serverless.service.provider.tags);
+    }
+
     const resource = (this.cfTemplate.Resources[this.provider.naming.getHttpApiStageLogicalId()] = {
       Type: 'AWS::ApiGatewayV2::Stage',
       Properties: properties,
@@ -258,9 +251,8 @@ class HttpApiEvents {
   }
 
   compileAuthorizerLambdaPermission({ functionName, functionArn, name, functionObject }) {
-    const authorizerPermissionLogicalId = this.provider.naming.getLambdaAuthorizerHttpApiPermissionLogicalId(
-      name
-    );
+    const authorizerPermissionLogicalId =
+      this.provider.naming.getLambdaAuthorizerHttpApiPermissionLogicalId(name);
     const permissionResource = {
       Type: 'AWS::Lambda::Permission',
       Properties: {
@@ -287,9 +279,7 @@ class HttpApiEvents {
     };
 
     if (functionObject && functionObject.targetAlias) {
-      permissionResource.Properties.DependsOn = this.provider.naming.getLambdaLogicalId(
-        functionName
-      );
+      permissionResource.DependsOn = functionObject.targetAlias.logicalId;
     }
     this.cfTemplate.Resources[authorizerPermissionLogicalId] = permissionResource;
   }
@@ -527,30 +517,11 @@ Object.defineProperties(
             method = String(method).toUpperCase();
             if (method === '*') {
               method = 'ANY';
-              if (
-                Array.from(
-                  allowedMethods,
-                  (allowedMethod) => `${allowedMethod} ${path}`
-                ).some((duplicateRouteKey) => routes.has(duplicateRouteKey))
-              ) {
-                throw new ServerlessError(
-                  `Duplicate method for "${path}" path in function ${functionName} for httpApi event in serverless.yml`,
-                  'DUPLICATE_HTTP_API_METHOD'
-                );
-              }
-            } else {
-              if (!allowedMethods.has(method)) {
-                throw new ServerlessError(
-                  `Invalid "method" property in function ${functionName} for httpApi event in serverless.yml`,
-                  'INVALID_HTTP_API_METHOD'
-                );
-              }
-              if (routes.has(`ANY ${path}`)) {
-                throw new ServerlessError(
-                  `Duplicate method for "${path}" path in function ${functionName} for httpApi event in serverless.yml`,
-                  'DUPLICATE_HTTP_API_METHOD'
-                );
-              }
+            } else if (!allowedMethods.has(method)) {
+              throw new ServerlessError(
+                `Invalid "method" property in function ${functionName} for httpApi event in serverless.yml`,
+                'INVALID_HTTP_API_METHOD'
+              );
             }
             event.resolvedMethod = method;
             event.resolvedPath = path;
@@ -610,6 +581,9 @@ Object.defineProperties(
           if (shouldFillCorsMethods) {
             if (event.resolvedMethod === 'ANY') {
               for (const allowedMethod of allowedMethods) {
+                if (allowedMethod === 'ANY') {
+                  continue;
+                }
                 cors.allowedMethods.add(allowedMethod);
               }
             } else {
@@ -621,17 +595,17 @@ Object.defineProperties(
         const functionTimeout =
           Number(functionData.timeout) || Number(this.serverless.service.provider.timeout) || 6;
 
-        if (functionTimeout > 29) {
-          logWarning(
+        if (functionTimeout > 30) {
+          log.warning(
             `Function (${functionName}) timeout setting (${functionTimeout}) is greater than ` +
-              'maximum allowed timeout for HTTP API endpoint (29s). ' +
+              'maximum allowed timeout for HTTP API endpoint (30s). ' +
               'This may introduce a situation where endpoint times out ' +
               'for a succesful lambda invocation.'
           );
-        } else if (functionTimeout === 29) {
-          logWarning(
+        } else if (functionTimeout === 30) {
+          log.warning(
             `Function (${functionName}) timeout setting (${functionTimeout}) may not provide ` +
-              'enough room to process an HTTP API request (of which timeout is limited to 29s). ' +
+              'enough room to process an HTTP API request (of which timeout is limited to 30s). ' +
               'This may introduce a situation where endpoint times out ' +
               'for a succesful lambda invocation.'
           );
@@ -640,18 +614,20 @@ Object.defineProperties(
         // It's a margin needed for some side processing time on AWS side.
         // Otherwise there's a risk of observing 503 status for successfully resolved invocation
         // (which just fit function timeout setting)
-        routeTargetData.timeout = Math.min(functionTimeout + 0.5, 29);
+        routeTargetData.timeout = Math.min(functionTimeout + 0.5, 30);
       }
     }),
     compileIntegration: d(function (routeTargetData) {
+      const functionConfig = this.serverless.service.getFunction(routeTargetData.functionName);
+      const funcHttpApi = functionConfig.httpApi || {};
       const providerConfig = this.serverless.service.provider;
-      const userConfig = providerConfig.httpApi || {};
+      const providerHttpApi = providerConfig.httpApi || {};
 
       const properties = {
         ApiId: this.getApiIdConfig(),
         IntegrationType: 'AWS_PROXY',
         IntegrationUri: resolveTargetConfig(routeTargetData),
-        PayloadFormatVersion: userConfig.payload || '2.0',
+        PayloadFormatVersion: funcHttpApi.payload || providerHttpApi.payload || '2.0',
       };
       if (routeTargetData.timeout) {
         properties.TimeoutInMillis = Math.round(routeTargetData.timeout * 1000);
diff --git a/lib/plugins/aws/package/compile/events/iotFleetProvisioning.js b/lib/plugins/aws/package/compile/events/iot-fleet-provisioning.js
similarity index 92%
rename from lib/plugins/aws/package/compile/events/iotFleetProvisioning.js
rename to lib/plugins/aws/package/compile/events/iot-fleet-provisioning.js
index 9e2cd30e446..b7e3740761a 100644
--- a/lib/plugins/aws/package/compile/events/iotFleetProvisioning.js
+++ b/lib/plugins/aws/package/compile/events/iot-fleet-provisioning.js
@@ -42,12 +42,10 @@ class AwsCompileIotFleetProvisioningEvents {
         const templateBody = event.iotFleetProvisioning.templateBody;
 
         const lambdaLogicalId = this.provider.naming.getLambdaLogicalId(functionName);
-        const iotFleetProvisioningLogicalId = this.provider.naming.getIotFleetProvisioningLogicalId(
-          functionName
-        );
-        const lambdaPermissionLogicalId = this.provider.naming.getLambdaIotFleetProvisioningPermissionLogicalId(
-          functionName
-        );
+        const iotFleetProvisioningLogicalId =
+          this.provider.naming.getIotFleetProvisioningLogicalId(functionName);
+        const lambdaPermissionLogicalId =
+          this.provider.naming.getLambdaIotFleetProvisioningPermissionLogicalId(functionName);
 
         const provisioningTemplateResource = {
           Type: 'AWS::IoT::ProvisioningTemplate',
diff --git a/lib/plugins/aws/package/compile/events/kafka.js b/lib/plugins/aws/package/compile/events/kafka.js
index 55a06443702..986e57eb791 100644
--- a/lib/plugins/aws/package/compile/events/kafka.js
+++ b/lib/plugins/aws/package/compile/events/kafka.js
@@ -1,5 +1,7 @@
 'use strict';
 
+const ServerlessError = require('../../../../../serverless-error');
+
 class AwsCompileKafkaEvents {
   constructor(serverless) {
     this.serverless = serverless;
@@ -9,9 +11,6 @@ class AwsCompileKafkaEvents {
       'package:compileEvents': this.compileKafkaEvents.bind(this),
     };
 
-    const secretsManagerArnRegex =
-      'arn:[a-z-]+:secretsmanager:[a-z0-9-]+:\\d+:secret:[A-Za-z0-9/_+=.@-]+';
-
     this.serverless.configSchemaHandler.defineFunctionEvent('aws', 'kafka', {
       type: 'object',
       properties: {
@@ -35,21 +34,30 @@ class AwsCompileKafkaEvents {
                 pattern: 'sg-[a-z0-9]+',
               },
             },
+            saslPlainAuth: {
+              type: 'array',
+              minItems: 1,
+              items: { $ref: '#/definitions/awsSecretsManagerArnString' },
+            },
             saslScram256Auth: {
               type: 'array',
               minItems: 1,
-              items: {
-                type: 'string',
-                pattern: secretsManagerArnRegex,
-              },
+              items: { $ref: '#/definitions/awsSecretsManagerArnString' },
             },
             saslScram512Auth: {
               type: 'array',
               minItems: 1,
-              items: {
-                type: 'string',
-                pattern: secretsManagerArnRegex,
-              },
+              items: { $ref: '#/definitions/awsSecretsManagerArnString' },
+            },
+            clientCertificateTlsAuth: {
+              type: 'array',
+              minItems: 1,
+              items: { $ref: '#/definitions/awsSecretsManagerArnString' },
+            },
+            serverRootCaCertificate: {
+              type: 'array',
+              minItems: 1,
+              items: { $ref: '#/definitions/awsSecretsManagerArnString' },
             },
           },
           additionalProperties: false,
@@ -59,6 +67,11 @@ class AwsCompileKafkaEvents {
           minimum: 1,
           maximum: 10000,
         },
+        maximumBatchingWindow: {
+          type: 'number',
+          minimum: 0,
+          maximum: 300,
+        },
         enabled: {
           type: 'boolean',
         },
@@ -116,8 +129,32 @@ class AwsCompileKafkaEvents {
       functionObj.events.forEach((event) => {
         if (!event.kafka) return;
 
+        const {
+          accessConfigurations: {
+            vpcSecurityGroup,
+            vpcSubnet,
+            clientCertificateTlsAuth,
+            serverRootCaCertificate,
+          },
+        } = event.kafka;
+
+        if ((vpcSecurityGroup && !vpcSubnet) || (vpcSubnet && !vpcSecurityGroup)) {
+          const missing = vpcSecurityGroup ? 'vpcSubnet' : 'vpcSecurityGroup';
+          throw new ServerlessError(
+            `You must specify at least one "${missing}" accessConfiguration for function: ${functionName}`,
+            'FUNCTION_KAFKA_VPC_ACCESS_CONFIGURATION_INVALID'
+          );
+        }
+
+        if (serverRootCaCertificate && !clientCertificateTlsAuth) {
+          throw new ServerlessError(
+            `You cannot specify "serverRootCaCertificate" accessConfiguration without providing "clientCertificateTlsAuth" accessConfiguration for function: ${functionName}`,
+            'FUNCTION_KAFKA_CLIENT_CERTIFICATE_TLS_AUTH_CONFIGURATION_MISSING'
+          );
+        }
+
         hasKafkaEvent = true;
-        const { topic, batchSize, enabled } = event.kafka;
+        const { topic, batchSize, maximumBatchingWindow, enabled } = event.kafka;
         const startingPosition = event.kafka.startingPosition || 'TRIM_HORIZON';
 
         const kafkaEventLogicalId = this.provider.naming.getKafkaEventLogicalId(
@@ -159,6 +196,10 @@ class AwsCompileKafkaEvents {
                 prefix = 'security_group:';
                 needsEc2Permissions = true;
                 break;
+              case 'saslPlainAuth':
+                type = 'BASIC_AUTH';
+                needsSecretsManagerPermissions = true;
+                break;
               case 'saslScram256Auth':
                 type = 'SASL_SCRAM_256_AUTH';
                 needsSecretsManagerPermissions = true;
@@ -167,6 +208,14 @@ class AwsCompileKafkaEvents {
                 type = 'SASL_SCRAM_512_AUTH';
                 needsSecretsManagerPermissions = true;
                 break;
+              case 'clientCertificateTlsAuth':
+                type = 'CLIENT_CERTIFICATE_TLS_AUTH';
+                needsSecretsManagerPermissions = true;
+                break;
+              case 'serverRootCaCertificate':
+                type = 'SERVER_ROOT_CA_CERTIFICATE';
+                needsSecretsManagerPermissions = true;
+                break;
               default:
                 type = accessConfigurationType;
             }
@@ -187,6 +236,10 @@ class AwsCompileKafkaEvents {
           kafkaResource.Properties.BatchSize = batchSize;
         }
 
+        if (maximumBatchingWindow) {
+          kafkaResource.Properties.MaximumBatchingWindowInSeconds = maximumBatchingWindow;
+        }
+
         if (enabled != null) {
           kafkaResource.Properties.Enabled = enabled;
         }
diff --git a/lib/plugins/aws/package/compile/events/lib/ensureApiGatewayCloudWatchRole.js b/lib/plugins/aws/package/compile/events/lib/ensure-api-gateway-cloud-watch-role.js
similarity index 86%
rename from lib/plugins/aws/package/compile/events/lib/ensureApiGatewayCloudWatchRole.js
rename to lib/plugins/aws/package/compile/events/lib/ensure-api-gateway-cloud-watch-role.js
index d0eef6b47b5..dedc3e7f489 100644
--- a/lib/plugins/aws/package/compile/events/lib/ensureApiGatewayCloudWatchRole.js
+++ b/lib/plugins/aws/package/compile/events/lib/ensure-api-gateway-cloud-watch-role.js
@@ -2,7 +2,7 @@
 
 const { memoize } = require('lodash');
 const BbPromise = require('bluebird');
-const { addCustomResourceToService } = require('../../../../customResources');
+const { addCustomResourceToService } = require('../../../../custom-resources');
 
 module.exports = memoize(async (provider) =>
   BbPromise.try(() => {
@@ -18,8 +18,10 @@ module.exports = memoize(async (provider) =>
     }
 
     const cfTemplate = provider.serverless.service.provider.compiledCloudFormationTemplate;
-    const customResourceLogicalId = provider.naming.getCustomResourceApiGatewayAccountCloudWatchRoleResourceLogicalId();
-    const customResourceFunctionLogicalId = provider.naming.getCustomResourceApiGatewayAccountCloudWatchRoleHandlerFunctionLogicalId();
+    const customResourceLogicalId =
+      provider.naming.getCustomResourceApiGatewayAccountCloudWatchRoleResourceLogicalId();
+    const customResourceFunctionLogicalId =
+      provider.naming.getCustomResourceApiGatewayAccountCloudWatchRoleHandlerFunctionLogicalId();
 
     cfTemplate.Resources[customResourceLogicalId] = {
       Type: 'Custom::ApiGatewayAccountRole',
diff --git a/lib/plugins/aws/package/compile/events/msk/getMskClusterNameToken.js b/lib/plugins/aws/package/compile/events/msk/get-msk-cluster-name-token.js
similarity index 100%
rename from lib/plugins/aws/package/compile/events/msk/getMskClusterNameToken.js
rename to lib/plugins/aws/package/compile/events/msk/get-msk-cluster-name-token.js
diff --git a/lib/plugins/aws/package/compile/events/msk/index.js b/lib/plugins/aws/package/compile/events/msk/index.js
index 42afca5c406..3a756f25131 100644
--- a/lib/plugins/aws/package/compile/events/msk/index.js
+++ b/lib/plugins/aws/package/compile/events/msk/index.js
@@ -1,6 +1,6 @@
 'use strict';
 
-const getMskClusterNameToken = require('./getMskClusterNameToken');
+const getMskClusterNameToken = require('./get-msk-cluster-name-token');
 
 class AwsCompileMSKEvents {
   constructor(serverless) {
@@ -26,6 +26,11 @@ class AwsCompileMSKEvents {
           minimum: 1,
           maximum: 10000,
         },
+        maximumBatchingWindow: {
+          type: 'number',
+          minimum: 0,
+          maximum: 300,
+        },
         enabled: {
           type: 'boolean',
         },
@@ -71,6 +76,7 @@ class AwsCompileMSKEvents {
           const eventSourceArn = event.msk.arn;
           const topic = event.msk.topic;
           const batchSize = event.msk.batchSize;
+          const maximumBatchingWindow = event.msk.maximumBatchingWindow;
           const enabled = event.msk.enabled;
           const startingPosition = event.msk.startingPosition || 'TRIM_HORIZON';
 
@@ -102,6 +108,10 @@ class AwsCompileMSKEvents {
             mskResource.Properties.BatchSize = batchSize;
           }
 
+          if (maximumBatchingWindow) {
+            mskResource.Properties.MaximumBatchingWindowInSeconds = maximumBatchingWindow;
+          }
+
           if (enabled != null) {
             mskResource.Properties.Enabled = enabled;
           }
diff --git a/lib/plugins/aws/package/compile/events/rabbitmq.js b/lib/plugins/aws/package/compile/events/rabbitmq.js
new file mode 100644
index 00000000000..9b5755b632c
--- /dev/null
+++ b/lib/plugins/aws/package/compile/events/rabbitmq.js
@@ -0,0 +1,152 @@
+'use strict';
+
+class AwsCompileRabbitMQEvents {
+  constructor(serverless) {
+    this.serverless = serverless;
+    this.provider = this.serverless.getProvider('aws');
+
+    this.hooks = {
+      'package:compileEvents': this.compileRabbitMQEvents.bind(this),
+    };
+
+    this.serverless.configSchemaHandler.defineFunctionEvent('aws', 'rabbitmq', {
+      type: 'object',
+      properties: {
+        arn: {
+          anyOf: [
+            {
+              type: 'string',
+              pattern: 'arn:[a-z-]+:mq:[a-z0-9-]+:\\d+:broker:[A-Za-z0-9/_+=.@-]+:b-[a-z0-9-]+',
+            },
+            { $ref: '#/definitions/awsCfImport' },
+            { $ref: '#/definitions/awsCfRef' },
+          ],
+        },
+        basicAuthArn: {
+          anyOf: [
+            { $ref: '#/definitions/awsSecretsManagerArnString' },
+            { $ref: '#/definitions/awsCfImport' },
+            { $ref: '#/definitions/awsCfRef' },
+          ],
+        },
+        batchSize: {
+          type: 'number',
+          minimum: 1,
+          maximum: 10000,
+        },
+        maximumBatchingWindow: {
+          type: 'number',
+          minimum: 0,
+          maximum: 300,
+        },
+        enabled: {
+          type: 'boolean',
+        },
+        queue: {
+          type: 'string',
+        },
+      },
+      additionalProperties: false,
+      required: ['basicAuthArn', 'arn', 'queue'],
+    });
+  }
+
+  compileRabbitMQEvents() {
+    this.serverless.service.getAllFunctions().forEach((functionName) => {
+      const functionObj = this.serverless.service.getFunction(functionName);
+      const cfTemplate = this.serverless.service.provider.compiledCloudFormationTemplate;
+
+      // It is required to add the following statement in order to be able to connect to RabbitMQ cluster
+      const ec2Statement = {
+        Effect: 'Allow',
+        Action: [
+          'ec2:CreateNetworkInterface',
+          'ec2:DescribeNetworkInterfaces',
+          'ec2:DescribeVpcs',
+          'ec2:DeleteNetworkInterface',
+          'ec2:DescribeSubnets',
+          'ec2:DescribeSecurityGroups',
+        ],
+        Resource: '*',
+      };
+
+      // The omission of kms:Decrypt is intentional, since we won't know
+      // which resources should be valid to decrypt.  It's also probably
+      // not best practice to allow '*' for this.
+      const secretsManagerStatement = {
+        Effect: 'Allow',
+        Action: ['secretsmanager:GetSecretValue'],
+        Resource: [],
+      };
+
+      const brokerStatement = {
+        Effect: 'Allow',
+        Action: ['mq:DescribeBroker'],
+        Resource: [],
+      };
+
+      let hasMQEvent = false;
+
+      functionObj.events.forEach((event) => {
+        if (!event.rabbitmq) return;
+
+        hasMQEvent = true;
+        const { basicAuthArn, arn, batchSize, maximumBatchingWindow, enabled, queue } =
+          event.rabbitmq;
+
+        const mqEventLogicalId = this.provider.naming.getRabbitMQEventLogicalId(
+          functionName,
+          queue
+        );
+        const lambdaLogicalId = this.provider.naming.getLambdaLogicalId(functionName);
+        const dependsOn = this.provider.resolveFunctionIamRoleResourceName(functionObj) || [];
+
+        const mqResource = {
+          Type: 'AWS::Lambda::EventSourceMapping',
+          DependsOn: dependsOn,
+          Properties: {
+            FunctionName: {
+              'Fn::GetAtt': [lambdaLogicalId, 'Arn'],
+            },
+            EventSourceArn: arn,
+            Queues: [queue],
+            SourceAccessConfigurations: [
+              {
+                Type: 'BASIC_AUTH',
+                URI: basicAuthArn,
+              },
+            ],
+          },
+        };
+
+        if (batchSize) {
+          mqResource.Properties.BatchSize = batchSize;
+        }
+
+        if (maximumBatchingWindow) {
+          mqResource.Properties.MaximumBatchingWindowInSeconds = maximumBatchingWindow;
+        }
+
+        if (enabled != null) {
+          mqResource.Properties.Enabled = enabled;
+        }
+
+        brokerStatement.Resource.push(arn);
+        secretsManagerStatement.Resource.push(basicAuthArn);
+        cfTemplate.Resources[mqEventLogicalId] = mqResource;
+      });
+
+      // https://docs.aws.amazon.com/lambda/latest/dg/with-mq.html#events-mq-permissions
+      if (cfTemplate.Resources.IamRoleLambdaExecution && hasMQEvent) {
+        const statement =
+          cfTemplate.Resources.IamRoleLambdaExecution.Properties.Policies[0].PolicyDocument
+            .Statement;
+        statement.push(secretsManagerStatement);
+        statement.push(brokerStatement);
+        statement.push(ec2Statement);
+      }
+    });
+  }
+}
+
+module.exports = AwsCompileRabbitMQEvents;
diff --git a/lib/plugins/aws/package/compile/events/s3/configSchema.js b/lib/plugins/aws/package/compile/events/s3/config-schema.js
similarity index 98%
rename from lib/plugins/aws/package/compile/events/s3/configSchema.js
rename to lib/plugins/aws/package/compile/events/s3/config-schema.js
index ef31596f6b1..38b9539f426 100644
--- a/lib/plugins/aws/package/compile/events/s3/configSchema.js
+++ b/lib/plugins/aws/package/compile/events/s3/config-schema.js
@@ -1,5 +1,7 @@
 'use strict';
 
+const { cfValue } = require('../../../../../../utils/aws-schema-get-cf-value');
+
 const destination = {
   type: 'object',
   properties: {
@@ -168,6 +170,9 @@ module.exports = {
                 required: ['SSEAlgorithm'],
                 additionalProperties: false,
               },
+              BucketKeyEnabled: {
+                type: 'boolean',
+              },
             },
             additionalProperties: false,
           },
@@ -272,10 +277,7 @@ module.exports = {
                 type: 'string',
                 format: 'date-time',
               },
-              ExpirationInDays: {
-                type: 'integer',
-                minimum: 0,
-              },
+              ExpirationInDays: cfValue({ type: 'integer', minimum: 0 }),
               Id: {
                 type: 'string',
                 maxLength: 255,
diff --git a/lib/plugins/aws/package/compile/events/s3/index.js b/lib/plugins/aws/package/compile/events/s3/index.js
index 67f875b563c..9bc389a4173 100644
--- a/lib/plugins/aws/package/compile/events/s3/index.js
+++ b/lib/plugins/aws/package/compile/events/s3/index.js
@@ -2,7 +2,7 @@
 
 const _ = require('lodash');
 const BbPromise = require('bluebird');
-const { addCustomResourceToService } = require('../../../../customResources');
+const { addCustomResourceToService } = require('../../../../custom-resources');
 const ServerlessError = require('../../../../../../serverless-error');
 
 class AwsCompileS3Events {
@@ -17,7 +17,13 @@ class AwsCompileS3Events {
         {
           type: 'object',
           properties: {
-            bucket: { type: 'string' },
+            bucket: {
+              anyOf: [
+                { type: 'string' },
+                { $ref: '#/definitions/awsCfFunction' },
+                { $ref: '#/definitions/awsCfIf' },
+              ],
+            },
             event: { type: 'string', pattern: '^s3:.+$' },
             existing: { type: 'boolean' },
             rules: {
@@ -66,6 +72,12 @@ class AwsCompileS3Events {
             let filter = {};
 
             if (typeof event.s3 === 'object') {
+              if (_.isObject(event.s3.bucket)) {
+                throw new ServerlessError(
+                  'When specifying "s3.bucket" with CloudFormation intrinsic function, you need to specify that the bucket is existing via "existing: true" property.',
+                  'S3_INVALID_NEW_BUCKET_FORMAT'
+                );
+              }
               bucketRef = event.s3.bucket;
               if (event.s3.event) {
                 notificationEvent = event.s3.event;
@@ -102,7 +114,7 @@ class AwsCompileS3Events {
                 `${bucketName} - Bucket name must conform to pattern ${this.serverless.configSchemaHandler.schema.definitions.awsS3BucketName.pattern}.`,
                 `Please check provider.s3.${bucketRef} and/or s3 events of function "${functionName}".`,
               ].join(' ');
-              throw new ServerlessError(errorMessage);
+              throw new ServerlessError(errorMessage, 'S3_INVALID_BUCKET_PATTERN');
             }
 
             if (bucketsLambdaConfigurations[bucketName]) {
@@ -271,18 +283,20 @@ class AwsCompileS3Events {
             numEventsForFunc++;
             let rules = null;
             const bucket = event.s3.bucket;
+            // In order to property use it as key and during comparisons below,
+            const stringifiedBucket = _.isObject(bucket) ? JSON.stringify(bucket) : bucket;
             const notificationEvent = event.s3.event || 's3:ObjectCreated:*';
             anyFuncUsesExistingS3Bucket = true;
 
             if (!currentBucketName) {
-              currentBucketName = bucket;
+              currentBucketName = stringifiedBucket;
             }
-            if (bucket !== currentBucketName) {
+            if (stringifiedBucket !== currentBucketName) {
               const errorMessage = [
                 'Only one S3 Bucket can be configured per function.',
-                ` In "${FunctionName}" you're attempting to configure "${currentBucketName}" and "${bucket}" at the same time.`,
+                ` In "${FunctionName}" you're attempting to configure "${currentBucketName}" and "${stringifiedBucket}" at the same time.`,
               ].join('');
-              throw new ServerlessError(errorMessage);
+              throw new ServerlessError(errorMessage, 'S3_MULTIPLE_BUCKETS_PER_FUNCTION');
             }
 
             rules = (event.s3.rules || []).map((rule) => {
@@ -294,19 +308,19 @@ class AwsCompileS3Events {
             });
 
             const eventFunctionLogicalId = this.provider.naming.getLambdaLogicalId(functionName);
-            const customResourceFunctionLogicalId = this.provider.naming.getCustomResourceS3HandlerFunctionLogicalId();
-            const customS3ResourceLogicalId = this.provider.naming.getCustomResourceS3ResourceLogicalId(
-              functionName
-            );
+            const customResourceFunctionLogicalId =
+              this.provider.naming.getCustomResourceS3HandlerFunctionLogicalId();
+            const customS3ResourceLogicalId =
+              this.provider.naming.getCustomResourceS3ResourceLogicalId(functionName);
 
             // store how often the custom S3 resource is used
-            if (bucketResources[bucket]) {
-              bucketResources[bucket] = _.union(bucketResources[bucket], [
+            if (bucketResources[stringifiedBucket]) {
+              bucketResources[stringifiedBucket] = _.union(bucketResources[stringifiedBucket], [
                 customS3ResourceLogicalId,
               ]);
             } else {
               Object.assign(bucketResources, {
-                [bucket]: [customS3ResourceLogicalId],
+                [stringifiedBucket]: [customS3ResourceLogicalId],
               });
             }
 
diff --git a/lib/plugins/aws/package/compile/events/schedule.js b/lib/plugins/aws/package/compile/events/schedule.js
index d7eacf02a4d..e060590692d 100644
--- a/lib/plugins/aws/package/compile/events/schedule.js
+++ b/lib/plugins/aws/package/compile/events/schedule.js
@@ -1,6 +1,7 @@
 'use strict';
 
 const _ = require('lodash');
+const ServerlessError = require('../../../../../serverless-error');
 
 const rateSyntax = '^rate\\((?:1 (?:minute|hour|day)|(?:1\\d+|[2-9]\\d*) (?:minute|hour|day)s)\\)$';
 const cronSyntax = '^cron\\(\\S+ \\S+ \\S+ \\S+ \\S+ \\S+\\)$';
@@ -21,7 +22,14 @@ class AwsCompileScheduledEvents {
         {
           type: 'object',
           properties: {
-            rate: { type: 'string', pattern: scheduleSyntax },
+            rate: {
+              type: 'array',
+              minItems: 1,
+              items: {
+                type: 'string',
+                pattern: scheduleSyntax,
+              },
+            },
             enabled: { type: 'boolean' },
             name: { type: 'string', minLength: 1, maxLength: 64, pattern: '[\\.\\-_A-Za-z0-9]+' },
             description: { type: 'string', maxLength: 512 },
@@ -77,8 +85,7 @@ class AwsCompileScheduledEvents {
       if (functionObj.events) {
         functionObj.events.forEach((event) => {
           if (event.schedule) {
-            scheduleNumberInFunction++;
-            let ScheduleExpression;
+            let ScheduleExpressions;
             let State;
             let Input;
             let InputPath;
@@ -87,7 +94,8 @@ class AwsCompileScheduledEvents {
             let Description;
 
             if (typeof event.schedule === 'object') {
-              ScheduleExpression = event.schedule.rate;
+              ScheduleExpressions = event.schedule.rate;
+
               State = 'ENABLED';
               if (event.schedule.enabled === false) {
                 State = 'DISABLED';
@@ -98,6 +106,13 @@ class AwsCompileScheduledEvents {
               Name = event.schedule.name;
               Description = event.schedule.description;
 
+              if (ScheduleExpressions.length > 1 && Name) {
+                throw new ServerlessError(
+                  'You cannot specify a name when defining more than one rate expression',
+                  'SCHEDULE_NAME_NOT_ALLOWED_MULTIPLE_RATES'
+                );
+              }
+
               if (Input && typeof Input === 'object') {
                 if (typeof Input.body === 'string') {
                   Input.body = JSON.parse(Input.body);
@@ -112,22 +127,27 @@ class AwsCompileScheduledEvents {
                 InputTransformer = this.formatInputTransformer(InputTransformer);
               }
             } else {
-              ScheduleExpression = event.schedule;
+              ScheduleExpressions = [event.schedule];
               State = 'ENABLED';
             }
 
             const lambdaLogicalId = this.provider.naming.getLambdaLogicalId(functionName);
-            const scheduleLogicalId = this.provider.naming.getScheduleLogicalId(
-              functionName,
-              scheduleNumberInFunction
-            );
-            const lambdaPermissionLogicalId = this.provider.naming.getLambdaSchedulePermissionLogicalId(
-              functionName,
-              scheduleNumberInFunction
-            );
             const scheduleId = this.provider.naming.getScheduleId(functionName);
 
-            const scheduleTemplate = `
+            for (const ScheduleExpression of ScheduleExpressions) {
+              scheduleNumberInFunction++;
+
+              const scheduleLogicalId = this.provider.naming.getScheduleLogicalId(
+                functionName,
+                scheduleNumberInFunction
+              );
+              const lambdaPermissionLogicalId =
+                this.provider.naming.getLambdaSchedulePermissionLogicalId(
+                  functionName,
+                  scheduleNumberInFunction
+                );
+
+              const scheduleTemplate = `
               {
                 "Type": "AWS::Events::Rule",
                 "Properties": {
@@ -146,7 +166,7 @@ class AwsCompileScheduledEvents {
               }
             `;
 
-            const permissionTemplate = `
+              const permissionTemplate = `
               {
                 "Type": "AWS::Lambda::Permission",
                 "Properties": {
@@ -158,19 +178,20 @@ class AwsCompileScheduledEvents {
               }
             `;
 
-            const newScheduleObject = {
-              [scheduleLogicalId]: JSON.parse(scheduleTemplate),
-            };
+              const newScheduleObject = {
+                [scheduleLogicalId]: JSON.parse(scheduleTemplate),
+              };
 
-            const newPermissionObject = {
-              [lambdaPermissionLogicalId]: JSON.parse(permissionTemplate),
-            };
+              const newPermissionObject = {
+                [lambdaPermissionLogicalId]: JSON.parse(permissionTemplate),
+              };
 
-            _.merge(
-              this.serverless.service.provider.compiledCloudFormationTemplate.Resources,
-              newScheduleObject,
-              newPermissionObject
-            );
+              _.merge(
+                this.serverless.service.provider.compiledCloudFormationTemplate.Resources,
+                newScheduleObject,
+                newPermissionObject
+              );
+            }
           }
         });
       }
diff --git a/lib/plugins/aws/package/compile/events/sns.js b/lib/plugins/aws/package/compile/events/sns.js
index 198346e6962..fec3d847729 100644
--- a/lib/plugins/aws/package/compile/events/sns.js
+++ b/lib/plugins/aws/package/compile/events/sns.js
@@ -87,7 +87,8 @@ class AwsCompileSNSEvents {
                 // Only true when providing CFN intrinsic function (not string) to arn property without topicName property
                 if (!topicName) {
                   throw new ServerlessError(
-                    'Missing "sns.topicName" setting (it needs to be provided if "sns.arn" is not provided as plain ARN string)'
+                    'Missing "sns.topicName" setting (it needs to be provided if "sns.arn" is not provided as plain ARN string)',
+                    'SNS_MISSING_TOPIC_NAME'
                   );
                 }
               } else {
@@ -102,11 +103,8 @@ class AwsCompileSNSEvents {
             }
 
             if (event.sns.redrivePolicy) {
-              const {
-                deadLetterTargetArn,
-                deadLetterTargetRef,
-                deadLetterTargetImport,
-              } = event.sns.redrivePolicy;
+              const { deadLetterTargetArn, deadLetterTargetRef, deadLetterTargetImport } =
+                event.sns.redrivePolicy;
               let targetArn;
               let targetUrl;
 
diff --git a/lib/plugins/aws/package/compile/events/sqs.js b/lib/plugins/aws/package/compile/events/sqs.js
index 0c3cdcdc9c6..4048630d899 100644
--- a/lib/plugins/aws/package/compile/events/sqs.js
+++ b/lib/plugins/aws/package/compile/events/sqs.js
@@ -1,7 +1,7 @@
 'use strict';
 
 const _ = require('lodash');
-const resolveLambdaTarget = require('../../../utils/resolveLambdaTarget');
+const resolveLambdaTarget = require('../../../utils/resolve-lambda-target');
 
 class AwsCompileSQSEvents {
   constructor(serverless) {
@@ -14,7 +14,7 @@ class AwsCompileSQSEvents {
 
     this.serverless.configSchemaHandler.defineFunctionEvent('aws', 'sqs', {
       anyOf: [
-        { $ref: '#/definitions/awsArn' },
+        { $ref: '#/definitions/awsArnString' },
         {
           type: 'object',
           properties: {
@@ -22,6 +22,8 @@ class AwsCompileSQSEvents {
             batchSize: { type: 'integer', minimum: 1, maximum: 10000 },
             enabled: { type: 'boolean' },
             maximumBatchingWindow: { type: 'integer', minimum: 0, maximum: 300 },
+            functionResponseType: { enum: ['ReportBatchItemFailures'] },
+            filterPatterns: { $ref: '#/definitions/filterPatterns' },
           },
           required: ['arn'],
           additionalProperties: false,
@@ -72,9 +74,8 @@ class AwsCompileSQSEvents {
             const queueLogicalId = this.provider.naming.getQueueLogicalId(functionName, queueName);
 
             const dependsOn = [];
-            const functionIamRoleResourceName = this.provider.resolveFunctionIamRoleResourceName(
-              functionObj
-            );
+            const functionIamRoleResourceName =
+              this.provider.resolveFunctionIamRoleResourceName(functionObj);
             if (functionIamRoleResourceName) {
               dependsOn.push(functionIamRoleResourceName);
             }
@@ -98,6 +99,18 @@ class AwsCompileSQSEvents {
               },
             };
 
+            if (event.sqs.functionResponseType != null) {
+              sqsTemplate.Properties.FunctionResponseTypes = [event.sqs.functionResponseType];
+            }
+
+            if (event.sqs.filterPatterns) {
+              sqsTemplate.Properties.FilterCriteria = {
+                Filters: event.sqs.filterPatterns.map((pattern) => ({
+                  Pattern: JSON.stringify(pattern),
+                })),
+              };
+            }
+
             // add event source ARNs to PolicyDocument statements
             sqsStatement.Resource.push(EventSourceArn);
 
@@ -117,8 +130,9 @@ class AwsCompileSQSEvents {
           this.serverless.service.provider.compiledCloudFormationTemplate.Resources
             .IamRoleLambdaExecution
         ) {
-          const statement = this.serverless.service.provider.compiledCloudFormationTemplate
-            .Resources.IamRoleLambdaExecution.Properties.Policies[0].PolicyDocument.Statement;
+          const statement =
+            this.serverless.service.provider.compiledCloudFormationTemplate.Resources
+              .IamRoleLambdaExecution.Properties.Policies[0].PolicyDocument.Statement;
           if (sqsStatement.Resource.length) {
             statement.push(sqsStatement);
           }
diff --git a/lib/plugins/aws/package/compile/events/stream.js b/lib/plugins/aws/package/compile/events/stream.js
index 34d18fff8aa..876b4b700b8 100644
--- a/lib/plugins/aws/package/compile/events/stream.js
+++ b/lib/plugins/aws/package/compile/events/stream.js
@@ -1,7 +1,7 @@
 'use strict';
 
 const _ = require('lodash');
-const resolveLambdaTarget = require('../../../utils/resolveLambdaTarget');
+const resolveLambdaTarget = require('../../../utils/resolve-lambda-target');
 
 class AwsCompileStreamEvents {
   constructor(serverless) {
@@ -68,6 +68,8 @@ class AwsCompileStreamEvents {
               additionalProperties: false,
               required: ['onFailure'],
             },
+            tumblingWindowInSeconds: { type: 'integer', minimum: 0, maximum: 900 },
+            filterPatterns: { $ref: '#/definitions/filterPatterns' },
           },
           additionalProperties: false,
           anyOf: [
@@ -188,9 +190,8 @@ class AwsCompileStreamEvents {
             );
 
             const dependsOn = [];
-            const functionIamRoleResourceName = this.provider.resolveFunctionIamRoleResourceName(
-              functionObj
-            );
+            const functionIamRoleResourceName =
+              this.provider.resolveFunctionIamRoleResourceName(functionObj);
             if (functionIamRoleResourceName) {
               dependsOn.push(functionIamRoleResourceName);
             }
@@ -204,11 +205,11 @@ class AwsCompileStreamEvents {
               DependsOn: dependsOn,
               Properties: {
                 BatchSize,
-                ParallelizationFactor,
+                Enabled,
                 EventSourceArn,
                 FunctionName: resolveLambdaTarget(functionName, functionObj),
+                ParallelizationFactor,
                 StartingPosition,
-                Enabled,
               },
             };
 
@@ -243,6 +244,11 @@ class AwsCompileStreamEvents {
                 event.stream.maximumRecordAgeInSeconds;
             }
 
+            if (event.stream.tumblingWindowInSeconds != null) {
+              streamResource.Properties.TumblingWindowInSeconds =
+                event.stream.tumblingWindowInSeconds;
+            }
+
             if (event.stream.destinations) {
               let OnFailureDestinationArn;
 
@@ -268,6 +274,14 @@ class AwsCompileStreamEvents {
               };
             }
 
+            if (event.stream.filterPatterns) {
+              streamResource.Properties.FilterCriteria = {
+                Filters: event.stream.filterPatterns.map((pattern) => ({
+                  Pattern: JSON.stringify(pattern),
+                })),
+              };
+            }
+
             const newStreamObject = {
               [streamLogicalId]: streamResource,
             };
@@ -285,9 +299,8 @@ class AwsCompileStreamEvents {
                     ConsumerName: consumerName,
                   },
                 };
-                const consumerLogicalId = this.provider.naming.getStreamConsumerLogicalId(
-                  consumerName
-                );
+                const consumerLogicalId =
+                  this.provider.naming.getStreamConsumerLogicalId(consumerName);
                 newStreamObject[consumerLogicalId] = consumerResource;
                 if (Array.isArray(streamResource.DependsOn)) {
                   streamResource.DependsOn.push(consumerLogicalId);
@@ -318,8 +331,9 @@ class AwsCompileStreamEvents {
           this.serverless.service.provider.compiledCloudFormationTemplate.Resources
             .IamRoleLambdaExecution
         ) {
-          const statement = this.serverless.service.provider.compiledCloudFormationTemplate
-            .Resources.IamRoleLambdaExecution.Properties.Policies[0].PolicyDocument.Statement;
+          const statement =
+            this.serverless.service.provider.compiledCloudFormationTemplate.Resources
+              .IamRoleLambdaExecution.Properties.Policies[0].PolicyDocument.Statement;
           if (dynamodbStreamStatement.Resource.length) {
             statement.push(dynamodbStreamStatement);
           }
diff --git a/lib/plugins/aws/package/compile/events/websockets/index.js b/lib/plugins/aws/package/compile/events/websockets/index.js
index 9379042566f..91c693d623e 100644
--- a/lib/plugins/aws/package/compile/events/websockets/index.js
+++ b/lib/plugins/aws/package/compile/events/websockets/index.js
@@ -5,7 +5,7 @@ const BbPromise = require('bluebird');
 const validate = require('./lib/validate');
 const compileApi = require('./lib/api');
 const compileIntegrations = require('./lib/integrations');
-const compileRouteResponses = require('./lib/routeResponses');
+const compileRouteResponses = require('./lib/route-responses');
 const compilePermissions = require('./lib/permissions');
 const compileRoutes = require('./lib/routes');
 const compileDeployment = require('./lib/deployment');
diff --git a/lib/plugins/aws/package/compile/events/websockets/lib/api.js b/lib/plugins/aws/package/compile/events/websockets/lib/api.js
index 6660e043e89..b4c39638357 100644
--- a/lib/plugins/aws/package/compile/events/websockets/lib/api.js
+++ b/lib/plugins/aws/package/compile/events/websockets/lib/api.js
@@ -30,8 +30,10 @@ module.exports = {
       },
     });
 
-    const defaultRoleResource = this.serverless.service.provider.compiledCloudFormationTemplate
-      .Resources[this.provider.naming.getRoleLogicalId()];
+    const defaultRoleResource =
+      this.serverless.service.provider.compiledCloudFormationTemplate.Resources[
+        this.provider.naming.getRoleLogicalId()
+      ];
 
     if (defaultRoleResource) {
       // insert policy that allows functions to postToConnection
diff --git a/lib/plugins/aws/package/compile/events/websockets/lib/deployment.js b/lib/plugins/aws/package/compile/events/websockets/lib/deployment.js
index 2f0c1724243..60cf98780e4 100644
--- a/lib/plugins/aws/package/compile/events/websockets/lib/deployment.js
+++ b/lib/plugins/aws/package/compile/events/websockets/lib/deployment.js
@@ -2,7 +2,7 @@
 
 const _ = require('lodash');
 const crypto = require('crypto');
-const pickWebsocketsTemplatePart = require('./pickWebsocketsTemplatePart');
+const pickWebsocketsTemplatePart = require('./pick-websockets-template-part');
 
 module.exports = {
   compileDeployment() {
@@ -24,9 +24,8 @@ module.exports = {
       .createHash('sha256')
       .update(JSON.stringify(websocketsTemplatePart))
       .digest('base64');
-    this.websocketsDeploymentLogicalId = this.provider.naming.getWebsocketsDeploymentLogicalId(
-      cfTemplateHash
-    );
+    this.websocketsDeploymentLogicalId =
+      this.provider.naming.getWebsocketsDeploymentLogicalId(cfTemplateHash);
 
     const resources = this.serverless.service.provider.compiledCloudFormationTemplate.Resources;
     _.merge(resources, {
diff --git a/lib/plugins/aws/package/compile/events/websockets/lib/permissions.js b/lib/plugins/aws/package/compile/events/websockets/lib/permissions.js
index c0cdfb859f8..69aca9a708e 100644
--- a/lib/plugins/aws/package/compile/events/websockets/lib/permissions.js
+++ b/lib/plugins/aws/package/compile/events/websockets/lib/permissions.js
@@ -8,9 +8,8 @@ module.exports = {
       const websocketApiId = this.provider.getApiGatewayWebsocketApiId();
       const lambdaLogicalId = this.provider.naming.getLambdaLogicalId(event.functionName);
 
-      const websocketsPermissionLogicalId = this.provider.naming.getLambdaWebsocketsPermissionLogicalId(
-        event.functionName
-      );
+      const websocketsPermissionLogicalId =
+        this.provider.naming.getLambdaWebsocketsPermissionLogicalId(event.functionName);
 
       _.merge(this.serverless.service.provider.compiledCloudFormationTemplate.Resources, {
         [websocketsPermissionLogicalId]: {
@@ -27,9 +26,8 @@ module.exports = {
       });
 
       if (event.authorizer) {
-        const websocketsAuthorizerPermissionLogicalId = this.provider.naming.getLambdaWebsocketsPermissionLogicalId(
-          event.authorizer.name
-        );
+        const websocketsAuthorizerPermissionLogicalId =
+          this.provider.naming.getLambdaWebsocketsPermissionLogicalId(event.authorizer.name);
 
         const authorizerPermissionTemplate = {
           [websocketsAuthorizerPermissionLogicalId]: {
diff --git a/lib/plugins/aws/package/compile/events/websockets/lib/pickWebsocketsTemplatePart.js b/lib/plugins/aws/package/compile/events/websockets/lib/pick-websockets-template-part.js
similarity index 100%
rename from lib/plugins/aws/package/compile/events/websockets/lib/pickWebsocketsTemplatePart.js
rename to lib/plugins/aws/package/compile/events/websockets/lib/pick-websockets-template-part.js
diff --git a/lib/plugins/aws/package/compile/events/websockets/lib/routeResponses.js b/lib/plugins/aws/package/compile/events/websockets/lib/route-responses.js
similarity index 85%
rename from lib/plugins/aws/package/compile/events/websockets/lib/routeResponses.js
rename to lib/plugins/aws/package/compile/events/websockets/lib/route-responses.js
index 2af12cb3968..d7fbfc61209 100644
--- a/lib/plugins/aws/package/compile/events/websockets/lib/routeResponses.js
+++ b/lib/plugins/aws/package/compile/events/websockets/lib/route-responses.js
@@ -7,9 +7,8 @@ module.exports = {
         return;
       }
 
-      const websocketsRouteResponseLogicalId = this.provider.naming.getWebsocketsRouteResponseLogicalId(
-        event.route
-      );
+      const websocketsRouteResponseLogicalId =
+        this.provider.naming.getWebsocketsRouteResponseLogicalId(event.route);
 
       const websocketsRouteLogicalId = this.provider.naming.getWebsocketsRouteLogicalId(
         event.route
diff --git a/lib/plugins/aws/package/compile/events/websockets/lib/stage.js b/lib/plugins/aws/package/compile/events/websockets/lib/stage.js
index 74038bc125b..837f1e09054 100644
--- a/lib/plugins/aws/package/compile/events/websockets/lib/stage.js
+++ b/lib/plugins/aws/package/compile/events/websockets/lib/stage.js
@@ -1,7 +1,7 @@
 'use strict';
 
 const BbPromise = require('bluebird');
-const ensureApiGatewayCloudWatchRole = require('../../lib/ensureApiGatewayCloudWatchRole');
+const ensureApiGatewayCloudWatchRole = require('../../lib/ensure-api-gateway-cloud-watch-role');
 const ServerlessError = require('../../../../../../../serverless-error');
 
 const defaultLogLevel = 'INFO';
@@ -46,7 +46,8 @@ module.exports = {
           throw new ServerlessError(
             `provider.logs.websocket.level is set to an invalid value. Support values are ${Array.from(
               validLogLevels
-            ).join(', ')}, got ${level}.`
+            ).join(', ')}, got ${level}.`,
+            'WEBSOCKETS_INVALID_LOGS_LEVEL'
           );
         }
       }
diff --git a/lib/plugins/aws/package/compile/events/websockets/lib/validate.js b/lib/plugins/aws/package/compile/events/websockets/lib/validate.js
index b7f253cbdcb..c2b52ea1311 100644
--- a/lib/plugins/aws/package/compile/events/websockets/lib/validate.js
+++ b/lib/plugins/aws/package/compile/events/websockets/lib/validate.js
@@ -82,7 +82,8 @@ module.exports = {
                 if (_.isObject(event.websocket.authorizer.arn)) {
                   if (!event.websocket.authorizer.name) {
                     throw new ServerlessError(
-                      'Websocket Authorizer: Non-string "arn" needs to be accompanied with "name"'
+                      'Websocket Authorizer: Non-string "arn" needs to be accompanied with "name"',
+                      'WEBSOCKETS_MISSING_AUTHORIZER_NAME'
                     );
                   }
                   websocketObj.authorizer.name = event.websocket.authorizer.name;
diff --git a/lib/plugins/aws/package/compile/functions.js b/lib/plugins/aws/package/compile/functions.js
index 8a5807e7029..757cc76c23d 100644
--- a/lib/plugins/aws/package/compile/functions.js
+++ b/lib/plugins/aws/package/compile/functions.js
@@ -7,8 +7,10 @@ const fs = require('fs');
 const _ = require('lodash');
 const path = require('path');
 const ServerlessError = require('../../../../serverless-error');
-const deepSortObjectByKey = require('../../../../utils/deepSortObjectByKey');
-const getHashForFilePath = require('../lib/getHashForFilePath');
+const deepSortObjectByKey = require('../../../../utils/deep-sort-object-by-key');
+const getHashForFilePath = require('../lib/get-hash-for-file-path');
+const parseS3URI = require('../../utils/parse-s3-uri');
+const { log } = require('@serverless/utils/log');
 
 class AwsCompileFunctions {
   constructor(serverless, options) {
@@ -30,35 +32,24 @@ class AwsCompileFunctions {
 
     this.hooks = {
       'initialize': () => {
-        if (_.get(this.serverless.service.serviceObject, 'awsKmsKeyArn')) {
-          this.serverless._logDeprecation(
-            'AWS_KMS_KEY_ARN',
-            'Starting with next major version, ' +
-              '"awsKmsKeyArn" service property will be replaced by "provider.kmsKeyArn"'
-          );
-        }
         if (
-          Object.values(this.serverless.service.functions).some(({ awsKmsKeyArn }) => awsKmsKeyArn)
+          this.serverless.service.provider.lambdaHashingVersion === '20200924' &&
+          !this.options['enforce-hash-update']
         ) {
           this.serverless._logDeprecation(
-            'AWS_KMS_KEY_ARN',
-            'Starting with next major version, ' +
-              '"awsKmsKeyArn" function property will be replaced by "kmsKeyArn"'
+            'LAMBDA_HASHING_VERSION_PROPERTY',
+            'Resolution of lambda version hashes with the "20200924" algorithm is deprecated.' +
+              ' It is highly recommend to migrate to new default algorithm. Please see' +
+              ' the deprecation documentation for more details about the migration process.'
           );
         }
-        if (
-          !this.serverless.service.provider.lambdaHashingVersion &&
-          Object.keys(this.serverless.service.functions).length &&
-          (this.serverless.service.provider.versionFunctions ||
-            Object.values(this.serverless.service.functions).some(
-              ({ versionFunction }) => versionFunction
-            ))
-        ) {
+
+        if (this.serverless.service.provider.lambdaHashingVersion === '20201221') {
           this.serverless._logDeprecation(
-            'LAMBDA_HASHING_VERSION_V2',
-            'Resolution of lambda version hashes was improved with better algorithm, ' +
-              'which will be used in next major release.\n' +
-              'Switch to it now by setting "provider.lambdaHashingVersion" to "20201221"'
+            'LAMBDA_HASHING_VERSION_PROPERTY',
+            'Setting "20201221" for "provider.lambdaHashingVersion" is no longer effective as' +
+              ' new hashing algorithm is now used by default. You can safely remove this' +
+              ' property from your configuration.'
           );
         }
       },
@@ -102,18 +93,14 @@ class AwsCompileFunctions {
       _.get(functionObject, 'package.artifact') ||
       _.get(this, 'serverless.service.package.artifact');
 
-    const regex = new RegExp('s3\\.amazonaws\\.com/(.+)/(.+)');
-    const match = artifactFilePath.match(regex);
-
-    if (!match) return;
+    const s3Object = parseS3URI(artifactFilePath);
+    if (!s3Object) return;
+    log.info(`Downloading ${s3Object.Key} from bucket ${s3Object.Bucket}`);
     await new Promise((resolve, reject) => {
       const tmpDir = this.serverless.utils.getTmpDirPath();
-      const filePath = path.join(tmpDir, match[2]);
+      const filePath = path.join(tmpDir, path.basename(s3Object.Key));
 
-      const readStream = S3.getObject({
-        Bucket: match[1],
-        Key: match[2],
-      }).createReadStream();
+      const readStream = S3.getObject(s3Object).createReadStream();
 
       const writeStream = fs.createWriteStream(filePath);
       readStream
@@ -132,11 +119,11 @@ class AwsCompileFunctions {
 
   async addFileToHash(filePath, hash) {
     const lambdaHashingVersion = this.serverless.service.provider.lambdaHashingVersion;
-    if (lambdaHashingVersion) {
+    if (lambdaHashingVersion < 20201221 && !this.options['enforce-hash-update']) {
+      await addFileContentsToHashes(filePath, [hash]);
+    } else {
       const filePathHash = await getHashForFilePath(filePath);
       hash.write(filePathHash);
-    } else {
-      await addFileContentsToHashes(filePath, [hash]);
     }
   }
 
@@ -145,15 +132,18 @@ class AwsCompileFunctions {
     const functionResource = this.cfLambdaFunctionTemplate();
     const functionObject = this.serverless.service.getFunction(functionName);
     functionObject.package = functionObject.package || {};
+    const enforceHashUpdate = this.options['enforce-hash-update'];
 
     if (!functionObject.handler && !functionObject.image) {
       throw new ServerlessError(
-        `Either "handler" or "image" property needs to be set on function "${functionName}"`
+        `Either "handler" or "image" property needs to be set on function "${functionName}"`,
+        'FUNCTION_NEITHER_HANDLER_NOR_IMAGE_DEFINED_ERROR'
       );
     }
     if (functionObject.handler && functionObject.image) {
       throw new ServerlessError(
-        `Either "handler" or "image" property (not both) needs to be set on function "${functionName}".`
+        `Either "handler" or "image" property (not both) needs to be set on function "${functionName}".`,
+        'FUNCTION_BOTH_HANDLER_AND_IMAGE_DEFINED_ERROR'
       );
     }
 
@@ -230,6 +220,10 @@ class AwsCompileFunctions {
     functionResource.Properties.MemorySize = functionObject.memory;
     functionResource.Properties.Timeout = functionObject.timeout;
 
+    const functionArchitecture =
+      functionObject.architecture || this.serverless.service.provider.architecture;
+    if (functionArchitecture) functionResource.Properties.Architectures = [functionArchitecture];
+
     if (functionObject.description) {
       functionResource.Properties.Description = functionObject.description;
     }
@@ -277,12 +271,9 @@ class AwsCompileFunctions {
     }
 
     let kmsKeyArn;
-    const serviceObj = this.serverless.service.serviceObject;
-    if (serviceObj && serviceObj.awsKmsKeyArn) kmsKeyArn = serviceObj.awsKmsKeyArn;
     if (this.serverless.service.provider.kmsKeyArn) {
       kmsKeyArn = this.serverless.service.provider.kmsKeyArn;
     }
-    if (functionObject.awsKmsKeyArn) kmsKeyArn = functionObject.awsKmsKeyArn;
     if (functionObject.kmsKeyArn) kmsKeyArn = functionObject.kmsKeyArn;
 
     if (kmsKeyArn) {
@@ -354,21 +345,24 @@ class AwsCompileFunctions {
     const role = this.provider.getCustomExecutionRole(functionObject);
     this.compileRole(functionResource, role || 'IamRoleLambdaExecution');
 
-    if (!functionObject.vpc) functionObject.vpc = {};
-    if (!this.serverless.service.provider.vpc) this.serverless.service.provider.vpc = {};
+    // ensure provider VPC is not used if function VPC explicitly unset
+    if (functionObject.vpc !== null && functionObject.vpc !== false) {
+      if (!functionObject.vpc) functionObject.vpc = {};
+      if (!this.serverless.service.provider.vpc) this.serverless.service.provider.vpc = {};
 
-    functionResource.Properties.VpcConfig = {
-      SecurityGroupIds:
-        functionObject.vpc.securityGroupIds ||
-        this.serverless.service.provider.vpc.securityGroupIds,
-      SubnetIds: functionObject.vpc.subnetIds || this.serverless.service.provider.vpc.subnetIds,
-    };
+      functionResource.Properties.VpcConfig = {
+        SecurityGroupIds:
+          functionObject.vpc.securityGroupIds ||
+          this.serverless.service.provider.vpc.securityGroupIds,
+        SubnetIds: functionObject.vpc.subnetIds || this.serverless.service.provider.vpc.subnetIds,
+      };
 
-    if (
-      !functionResource.Properties.VpcConfig.SecurityGroupIds ||
-      !functionResource.Properties.VpcConfig.SubnetIds
-    ) {
-      delete functionResource.Properties.VpcConfig;
+      if (
+        !functionResource.Properties.VpcConfig.SecurityGroupIds ||
+        !functionResource.Properties.VpcConfig.SubnetIds
+      ) {
+        delete functionResource.Properties.VpcConfig;
+      }
     }
 
     const fileSystemConfig = functionObject.fileSystemConfig;
@@ -438,6 +432,10 @@ class AwsCompileFunctions {
       // to make sure that a new version is created on configuration changes and
       // not only on source changes.
 
+      if (enforceHashUpdate) {
+        functionResource.Properties.Description = 'temporary-description-to-enforce-hash-update';
+      }
+
       const versionHash = crypto.createHash('sha256');
       versionHash.setEncoding('base64');
       const layerConfigurations = _.cloneDeep(
@@ -478,10 +476,7 @@ class AwsCompileFunctions {
       delete functionProperties.Tags;
 
       const lambdaHashingVersion = this.serverless.service.provider.lambdaHashingVersion;
-      if (lambdaHashingVersion) {
-        functionProperties.layerConfigurations = layerConfigurations;
-        versionHash.write(JSON.stringify(deepSortObjectByKey(functionProperties)));
-      } else {
+      if (lambdaHashingVersion < 20201221 && !this.options['enforce-hash-update']) {
         // sort the layer configurations for hash consistency
         const sortedLayerConfigurations = {};
         const byKey = ([key1], [key2]) => key1.localeCompare(key2);
@@ -496,6 +491,9 @@ class AwsCompileFunctions {
         );
 
         versionHash.write(JSON.stringify(sortedFunctionProperties));
+      } else {
+        functionProperties.layerConfigurations = layerConfigurations;
+        versionHash.write(JSON.stringify(deepSortObjectByKey(functionProperties)));
       }
 
       versionHash.end();
@@ -520,9 +518,8 @@ class AwsCompileFunctions {
       Object.assign(cfTemplate.Resources, newVersionObject);
 
       // Add function versions to Outputs section
-      const functionVersionOutputLogicalId = this.provider.naming.getLambdaVersionOutputLogicalId(
-        functionName
-      );
+      const functionVersionOutputLogicalId =
+        this.provider.naming.getLambdaVersionOutputLogicalId(functionName);
       const newVersionOutput = this.cfOutputLatestVersionTemplate();
 
       newVersionOutput.Value = { Ref: versionLogicalId };
@@ -535,9 +532,8 @@ class AwsCompileFunctions {
         if (!shouldVersionFunction) delete versionResource.DeletionPolicy;
 
         const provisionedConcurrency = Number(functionObject.provisionedConcurrency);
-        const aliasLogicalId = this.provider.naming.getLambdaProvisionedConcurrencyAliasLogicalId(
-          functionName
-        );
+        const aliasLogicalId =
+          this.provider.naming.getLambdaProvisionedConcurrencyAliasLogicalId(functionName);
         const aliasName = this.provider.naming.getLambdaProvisionedConcurrencyAliasName();
 
         functionObject.targetAlias = { name: aliasName, logicalId: aliasLogicalId };
@@ -609,6 +605,7 @@ class AwsCompileFunctions {
         DestinationConfig: destinationConfig,
         Qualifier: functionObject.targetAlias ? functionObject.targetAlias.name : '$LATEST',
       },
+      DependsOn: _.get(functionObject.targetAlias, 'logicalId'),
     };
 
     if (maximumEventAge) {
@@ -624,8 +621,9 @@ class AwsCompileFunctions {
 
   // Memoized in a constructor
   ensureTargetExecutionPermission(functionAddress) {
-    const iamPolicyStatements = this.serverless.service.provider.compiledCloudFormationTemplate
-      .Resources.IamRoleLambdaExecution.Properties.Policies[0].PolicyDocument.Statement;
+    const iamPolicyStatements =
+      this.serverless.service.provider.compiledCloudFormationTemplate.Resources
+        .IamRoleLambdaExecution.Properties.Policies[0].PolicyDocument.Statement;
 
     const action = (() => {
       if (!functionAddress.startsWith('arn:') || functionAddress.includes(':function:')) {
@@ -634,7 +632,10 @@ class AwsCompileFunctions {
       if (functionAddress.includes(':sqs:')) return 'sqs:SendMessage';
       if (functionAddress.includes(':sns:')) return 'sns:Publish';
       if (functionAddress.includes(':event-bus/')) return 'events:PutEvents';
-      throw new ServerlessError(`Unsupported destination target ${functionAddress}`);
+      throw new ServerlessError(
+        `Unsupported destination target ${functionAddress}`,
+        'UNSUPPORTED_DESTINATION_TARGET'
+      );
     })();
     iamPolicyStatements.push({
       Effect: 'Allow',
@@ -719,11 +720,10 @@ function extractLayerConfigurationsFromFunction(functionProperties, cfTemplate)
   functionProperties.Layers.forEach((potentialLocalLayerObject) => {
     if (potentialLocalLayerObject.Ref) {
       const configuration = cfTemplate.Resources[potentialLocalLayerObject.Ref];
+
       if (!configuration) {
-        throw new ServerlessError(
-          `Could not find reference to layer: ${potentialLocalLayerObject.Ref}. Ensure that you are referencing layer defined in your service.`,
-          'LAMBDA_LAYER_REFERENCE_NOT_FOUND'
-        );
+        log.info(`Could not find reference to layer: ${potentialLocalLayerObject.Ref}.`);
+        return;
       }
 
       layerConfigurations.push({
diff --git a/lib/plugins/aws/package/compile/layers.js b/lib/plugins/aws/package/compile/layers.js
index dff0f7af054..226cdb14427 100644
--- a/lib/plugins/aws/package/compile/layers.js
+++ b/lib/plugins/aws/package/compile/layers.js
@@ -5,7 +5,8 @@ const BbPromise = require('bluebird');
 const _ = require('lodash');
 const path = require('path');
 const fsAsync = BbPromise.promisifyAll(require('fs'));
-const getLambdaLayerArtifactPath = require('../../utils/getLambdaLayerArtifactPath');
+const getLambdaLayerArtifactPath = require('../../utils/get-lambda-layer-artifact-path');
+const { log } = require('@serverless/utils/log');
 
 class AwsCompileLayers {
   constructor(serverless, options) {
@@ -48,6 +49,9 @@ class AwsCompileLayers {
     if (layerObject.compatibleRuntimes) {
       newLayer.Properties.CompatibleRuntimes = layerObject.compatibleRuntimes;
     }
+    if (layerObject.compatibleArchitectures) {
+      newLayer.Properties.CompatibleArchitectures = layerObject.compatibleArchitectures;
+    }
 
     let layerLogicalId = this.provider.naming.getLambdaLayerLogicalId(layerName);
     const layerArtifactPath = getLambdaLayerArtifactPath(
@@ -99,15 +103,13 @@ class AwsCompileLayers {
 
       newLayerOutput.Value = { Ref: layerLogicalId };
 
-      const layerHashOutputLogicalId = this.provider.naming.getLambdaLayerHashOutputLogicalId(
-        layerName
-      );
+      const layerHashOutputLogicalId =
+        this.provider.naming.getLambdaLayerHashOutputLogicalId(layerName);
       const newLayerHashOutput = this.cfOutputLayerHashTemplate();
       newLayerHashOutput.Value = sha;
 
-      const layerS3KeyOutputLogicalId = this.provider.naming.getLambdaLayerS3KeyOutputLogicalId(
-        layerName
-      );
+      const layerS3KeyOutputLogicalId =
+        this.provider.naming.getLambdaLayerS3KeyOutputLogicalId(layerName);
       const newLayerS3KeyOutput = this.cfOutputLayerS3KeyTemplate();
       newLayerS3KeyOutput.Value = newLayer.Properties.Content.S3Key;
 
@@ -121,25 +123,23 @@ class AwsCompileLayers {
 
   async compareWithLastLayer(layerName) {
     const stackName = this.provider.naming.getStackName();
-    const layerHashOutputLogicalId = this.provider.naming.getLambdaLayerHashOutputLogicalId(
-      layerName
-    );
+    const layerHashOutputLogicalId =
+      this.provider.naming.getLambdaLayerHashOutputLogicalId(layerName);
 
     return this.provider.request('CloudFormation', 'describeStacks', { StackName: stackName }).then(
       (data) => {
         const lastHash = data.Stacks[0].Outputs.find(
           (output) => output.OutputKey === layerHashOutputLogicalId
         );
-        const compiledCloudFormationTemplate = this.serverless.service.provider
-          .compiledCloudFormationTemplate;
+        const compiledCloudFormationTemplate =
+          this.serverless.service.provider.compiledCloudFormationTemplate;
         const newSha = compiledCloudFormationTemplate.Outputs[layerHashOutputLogicalId].Value;
         if (lastHash == null || lastHash.OutputValue !== newSha) {
           return;
         }
 
-        const layerS3keyOutputLogicalId = this.provider.naming.getLambdaLayerS3KeyOutputLogicalId(
-          layerName
-        );
+        const layerS3keyOutputLogicalId =
+          this.provider.naming.getLambdaLayerS3KeyOutputLogicalId(layerName);
         const lastS3Key = data.Stacks[0].Outputs.find(
           (output) => output.OutputKey === layerS3keyOutputLogicalId
         );
@@ -152,7 +152,7 @@ class AwsCompileLayers {
         layerResource.Properties.Content.S3Key = lastS3Key.OutputValue;
         const layerObject = this.serverless.service.getLayer(layerName);
         layerObject.artifactAlreadyUploaded = true;
-        this.serverless.cli.log(`Layer ${layerName} is already uploaded.`);
+        log.info(`Layer ${layerName} is already uploaded.`);
       },
       (e) => {
         if (e.message.includes('does not exist')) {
diff --git a/lib/plugins/aws/package/index.js b/lib/plugins/aws/package/index.js
index 29fc6fa333e..f7fa251e9ea 100644
--- a/lib/plugins/aws/package/index.js
+++ b/lib/plugins/aws/package/index.js
@@ -1,15 +1,17 @@
 'use strict';
 
-const BbPromise = require('bluebird');
 const path = require('path');
-const mergeCustomProviderResources = require('./lib/mergeCustomProviderResources');
-const stripNullPropsFromTemplateResources = require('./lib/stripNullPropsFromTemplateResources');
-const generateArtifactDirectoryName = require('./lib/generateArtifactDirectoryName');
-const generateCoreTemplate = require('./lib/generateCoreTemplate');
-const saveServiceState = require('./lib/saveServiceState');
-const saveCompiledTemplate = require('./lib/saveCompiledTemplate');
-const mergeIamTemplates = require('./lib/mergeIamTemplates');
-const addExportNameForOutputs = require('./lib/addExportNameForOutputs');
+const mergeCustomProviderResources = require('./lib/merge-custom-provider-resources');
+const stripNullPropsFromTemplateResources = require('./lib/strip-null-props-from-template-resources');
+const generateArtifactDirectoryName = require('./lib/generate-artifact-directory-name');
+const generateCoreTemplate = require('./lib/generate-core-template');
+const saveServiceState = require('./lib/save-service-state');
+const saveCompiledTemplate = require('./lib/save-compiled-template');
+const mergeIamTemplates = require('./lib/merge-iam-templates');
+const addExportNameForOutputs = require('./lib/add-export-name-for-outputs');
+const { log, style, progress } = require('@serverless/utils/log');
+
+const mainProgress = progress.get('main');
 
 class AwsPackage {
   constructor(serverless, options) {
@@ -56,28 +58,37 @@ class AwsPackage {
     };
 
     this.hooks = {
+      'initialize': () => {
+        if (this.serverless.processedInput.commands.join(' ') === 'package') {
+          log.notice();
+          log.notice(
+            `Packaging ${this.serverless.service.service} for stage ${this.serverless
+              .getProvider('aws')
+              .getStage()} ${style.aside(`(${this.serverless.getProvider('aws').getRegion()})`)}`
+          );
+          log.info(); // Ensure gap between verbose logging
+        }
+      },
+      'before:package:cleanup': () => mainProgress.notice('Packaging', { isMainEvent: true }),
       /**
        * Outer lifecycle hooks
        */
-      'package:cleanup': async () =>
-        BbPromise.bind(this)
-          .then(() => this.serverless.pluginManager.spawn('aws:common:validate'))
-          .then(() => this.serverless.pluginManager.spawn('aws:common:cleanupTempDir')),
+      'package:cleanup': async () => {
+        await this.serverless.pluginManager.spawn('aws:common:validate');
+        await this.serverless.pluginManager.spawn('aws:common:cleanupTempDir');
+      },
 
-      'package:initialize': async () => this.generateCoreTemplate(),
+      'package:initialize': async () => {
+        return this.generateCoreTemplate();
+      },
 
       'package:setupProviderConfiguration': () => this.mergeIamTemplates(),
 
-      'before:package:compileFunctions': async () =>
-        BbPromise.bind(this).then(this.generateArtifactDirectoryName),
+      'before:package:compileFunctions': async () => this.generateArtifactDirectoryName(),
 
-      'before:package:compileLayers': async () =>
-        BbPromise.bind(this).then(this.generateArtifactDirectoryName),
+      'before:package:compileLayers': async () => this.generateArtifactDirectoryName(),
 
-      'package:finalize': async () =>
-        BbPromise.bind(this).then(() =>
-          this.serverless.pluginManager.spawn('aws:package:finalize')
-        ),
+      'package:finalize': async () => this.serverless.pluginManager.spawn('aws:package:finalize'),
 
       /**
        * Inner lifecycle hooks
@@ -89,7 +100,7 @@ class AwsPackage {
       },
 
       'aws:package:finalize:mergeCustomProviderResources': async () =>
-        BbPromise.bind(this).then(this.mergeCustomProviderResources),
+        this.mergeCustomProviderResources(),
 
       'aws:package:finalize:stripNullPropsFromTemplateResources': () =>
         this.stripNullPropsFromTemplateResources(),
@@ -99,6 +110,19 @@ class AwsPackage {
         await this.saveServiceState();
         return this.serverless.pluginManager.spawn('aws:common:moveArtifactsToPackage');
       },
+
+      'finalize': () => {
+        if (this.serverless.processedInput.commands.join(' ') === 'package') {
+          log.notice();
+          log.notice.success(
+            `Service packaged ${style.aside(
+              `(${Math.floor(
+                (Date.now() - this.serverless.pluginManager.commandRunStartTime) / 1000
+              )}s)`
+            )}`
+          );
+        }
+      },
     };
   }
 }
diff --git a/lib/plugins/aws/package/lib/addExportNameForOutputs.js b/lib/plugins/aws/package/lib/add-export-name-for-outputs.js
similarity index 100%
rename from lib/plugins/aws/package/lib/addExportNameForOutputs.js
rename to lib/plugins/aws/package/lib/add-export-name-for-outputs.js
diff --git a/lib/plugins/aws/package/lib/generateArtifactDirectoryName.js b/lib/plugins/aws/package/lib/generate-artifact-directory-name.js
similarity index 100%
rename from lib/plugins/aws/package/lib/generateArtifactDirectoryName.js
rename to lib/plugins/aws/package/lib/generate-artifact-directory-name.js
diff --git a/lib/plugins/aws/package/lib/generateCoreTemplate.js b/lib/plugins/aws/package/lib/generate-core-template.js
similarity index 72%
rename from lib/plugins/aws/package/lib/generateCoreTemplate.js
rename to lib/plugins/aws/package/lib/generate-core-template.js
index 9eba01caefa..903b615e2d5 100644
--- a/lib/plugins/aws/package/lib/generateCoreTemplate.js
+++ b/lib/plugins/aws/package/lib/generate-core-template.js
@@ -6,16 +6,17 @@ const ServerlessError = require('../../../../serverless-error');
 
 module.exports = {
   generateCoreTemplate() {
-    this.serverless.service.provider.compiledCloudFormationTemplate = this.serverless.utils.readFileSync(
-      path.join(
-        this.serverless.config.serverlessPath,
-        'plugins',
-        'aws',
-        'package',
-        'lib',
-        'core-cloudformation-template.json'
-      )
-    );
+    this.serverless.service.provider.compiledCloudFormationTemplate =
+      this.serverless.utils.readFileSync(
+        path.join(
+          this.serverless.config.serverlessPath,
+          'plugins',
+          'aws',
+          'package',
+          'lib',
+          'core-cloudformation-template.json'
+        )
+      );
 
     const bucketName = this.serverless.service.provider.deploymentBucket;
 
@@ -44,23 +45,28 @@ module.exports = {
 
       // enable S3 block public access for deployment bucket
       if (deploymentBucketObject.blockPublicAccess) {
-        Object.assign(
-          this.serverless.service.provider.compiledCloudFormationTemplate.Resources[
-            deploymentBucketLogicalId
-          ].Properties,
-          {
-            PublicAccessBlockConfiguration: {
-              BlockPublicAcls: true,
-              BlockPublicPolicy: true,
-              IgnorePublicAcls: true,
-              RestrictPublicBuckets: true,
-            },
-          }
-        );
+        this.serverless.service.provider.compiledCloudFormationTemplate.Resources[
+          deploymentBucketLogicalId
+        ].Properties.PublicAccessBlockConfiguration = {
+          BlockPublicAcls: true,
+          BlockPublicPolicy: true,
+          IgnorePublicAcls: true,
+          RestrictPublicBuckets: true,
+        };
+      }
+
+      // enable S3 bucket versioning
+      if (deploymentBucketObject.versioning) {
+        this.serverless.service.provider.compiledCloudFormationTemplate.Resources[
+          deploymentBucketLogicalId
+        ].Properties.VersioningConfiguration = {
+          Status: 'Enabled',
+        };
       }
 
       if (deploymentBucketObject.skipPolicySetup) {
-        const deploymentBucketPolicyLogicalId = this.provider.naming.getDeploymentBucketPolicyLogicalId();
+        const deploymentBucketPolicyLogicalId =
+          this.provider.naming.getDeploymentBucketPolicyLogicalId();
         delete this.serverless.service.provider.compiledCloudFormationTemplate.Resources[
           deploymentBucketPolicyLogicalId
         ];
@@ -75,18 +81,20 @@ module.exports = {
       const errorMessage = [
         'You cannot enable and disable S3 Transfer Acceleration at the same time',
       ].join('');
-      throw new ServerlessError(errorMessage);
+      throw new ServerlessError(errorMessage, 'S3_ACCELERATION_ENABLED_AND_DISABLED');
     }
 
     if (bucketName) {
       if (isS3TransferAccelerationEnabled) {
-        const warningMessage =
-          'Warning: S3 Transfer Acceleration will not be enabled on deploymentBucket.';
-        this.serverless.cli.log(warningMessage);
+        throw new ServerlessError(
+          'It is not possible to enable S3 Transfer Acceleration on an user provided bucket. In order to avoid this error, stop using `--aws-s3-accelerate` flag',
+          'S3_TRANSFER_ACCELERATION_ON_EXISTING_BUCKET'
+        );
       }
       this.bucketName = bucketName;
       this.serverless.service.package.deploymentBucket = bucketName;
-      this.serverless.service.provider.compiledCloudFormationTemplate.Outputs.ServerlessDeploymentBucketName.Value = bucketName;
+      this.serverless.service.provider.compiledCloudFormationTemplate.Outputs.ServerlessDeploymentBucketName.Value =
+        bucketName;
 
       delete this.serverless.service.provider.compiledCloudFormationTemplate.Resources
         .ServerlessDeploymentBucket;
@@ -107,9 +115,10 @@ module.exports = {
         }
       );
       // keep track of acceleration status via CloudFormation Output
-      this.serverless.service.provider.compiledCloudFormationTemplate.Outputs.ServerlessDeploymentBucketAccelerated = {
-        Value: true,
-      };
+      this.serverless.service.provider.compiledCloudFormationTemplate.Outputs.ServerlessDeploymentBucketAccelerated =
+        {
+          Value: true,
+        };
     } else if (isS3TransferAccelerationDisabled && isS3TransferAccelerationSupported) {
       // explicitly disable acceleration via CloudFormation
       Object.assign(
diff --git a/lib/plugins/aws/package/lib/getHashForFilePath.js b/lib/plugins/aws/package/lib/get-hash-for-file-path.js
similarity index 100%
rename from lib/plugins/aws/package/lib/getHashForFilePath.js
rename to lib/plugins/aws/package/lib/get-hash-for-file-path.js
diff --git a/lib/plugins/aws/package/lib/mergeCustomProviderResources.js b/lib/plugins/aws/package/lib/merge-custom-provider-resources.js
similarity index 84%
rename from lib/plugins/aws/package/lib/mergeCustomProviderResources.js
rename to lib/plugins/aws/package/lib/merge-custom-provider-resources.js
index 4ac48103148..664e3683541 100644
--- a/lib/plugins/aws/package/lib/mergeCustomProviderResources.js
+++ b/lib/plugins/aws/package/lib/merge-custom-provider-resources.js
@@ -1,6 +1,7 @@
 'use strict';
 
 const _ = require('lodash');
+const ServerlessError = require('../../../../serverless-error');
 
 module.exports = {
   mergeCustomProviderResources() {
@@ -29,10 +30,9 @@ module.exports = {
       for (const [resourceName, resourceDefinition] of Object.entries(extensions)) {
         for (const [extensionAttributeName, value] of Object.entries(resourceDefinition)) {
           if (!template.Resources[resourceName]) {
-            template.Resources[resourceName] = {};
-            this.serverless._logDeprecation(
-              'RESOURCES_EXTENSIONS_REFERENCE_TO_NONEXISTENT_RESOURCE',
-              'Starting with next major version, extensions to nonexistent resources will throw an error instead of passing silently.'
+            throw new ServerlessError(
+              `Cannot extend "${resourceName}" resource, as it's not found in generated stack`,
+              'RESOURCE_EXTENSION_NOT_EXISTING'
             );
           }
 
@@ -71,11 +71,13 @@ module.exports = {
 
             // default includes any future attributes we don't know about yet.
             default:
-              throw new Error(
-                `${resourceName}: Sorry, extending the ${extensionAttributeName} resource ` +
+              throw new ServerlessError(
+                `Cannot extend "${resourceName}" resource, as extending ` +
+                  `the "${extensionAttributeName}" ` +
                   'attribute at this point is not supported. Feel free to propose support ' +
                   'for it in the Framework issue tracker: ' +
-                  'https://github.com/serverless/serverless/issues'
+                  'https://github.com/serverless/serverless/issues',
+                'RESOURCE_EXTENSION_UNSUPPORTED_ATTRIBUTE'
               );
           }
         }
diff --git a/lib/plugins/aws/package/lib/mergeIamTemplates.js b/lib/plugins/aws/package/lib/merge-iam-templates.js
similarity index 90%
rename from lib/plugins/aws/package/lib/mergeIamTemplates.js
rename to lib/plugins/aws/package/lib/merge-iam-templates.js
index 54aaa7666dd..e0bf88aeca5 100644
--- a/lib/plugins/aws/package/lib/mergeIamTemplates.js
+++ b/lib/plugins/aws/package/lib/merge-iam-templates.js
@@ -86,10 +86,12 @@ module.exports = {
     } else if (iamRole.permissionBoundary) {
       iamRoleLambdaExecutionTemplate.Properties.PermissionsBoundary = iamRole.permissionBoundary;
     } else if (this.serverless.service.provider.rolePermissionsBoundary) {
-      iamRoleLambdaExecutionTemplate.Properties.PermissionsBoundary = this.serverless.service.provider.rolePermissionsBoundary;
+      iamRoleLambdaExecutionTemplate.Properties.PermissionsBoundary =
+        this.serverless.service.provider.rolePermissionsBoundary;
     }
 
-    iamRoleLambdaExecutionTemplate.Properties.Policies[0].PolicyName = this.provider.naming.getPolicyName();
+    iamRoleLambdaExecutionTemplate.Properties.Policies[0].PolicyName =
+      this.provider.naming.getPolicyName();
 
     _.merge(this.serverless.service.provider.compiledCloudFormationTemplate.Resources, {
       [this.provider.naming.getRoleLogicalId()]: iamRoleLambdaExecutionTemplate,
@@ -100,19 +102,18 @@ module.exports = {
     }-${this.provider.getStage()}`;
     const logGroupsPrefix = this.provider.naming.getLogGroupName(canonicalFunctionNamePrefix);
 
-    const policyDocumentStatements = this.serverless.service.provider.compiledCloudFormationTemplate
-      .Resources[this.provider.naming.getRoleLogicalId()].Properties.Policies[0].PolicyDocument
-      .Statement;
+    const policyDocumentStatements =
+      this.serverless.service.provider.compiledCloudFormationTemplate.Resources[
+        this.provider.naming.getRoleLogicalId()
+      ].Properties.Policies[0].PolicyDocument.Statement;
 
     let hasOneOrMoreCanonicallyNamedFunctions = false;
     const disableLogsCanonicallyNamedFunctions = [];
 
     // Ensure policies for functions with custom name resolution
     this.serverless.service.getAllFunctions().forEach((functionName) => {
-      const {
-        name: resolvedFunctionName,
-        disableLogs: areLogsDisabled,
-      } = this.serverless.service.getFunction(functionName);
+      const { name: resolvedFunctionName, disableLogs: areLogsDisabled } =
+        this.serverless.service.getFunction(functionName);
       if (!resolvedFunctionName || resolvedFunctionName.startsWith(canonicalFunctionNamePrefix)) {
         if (areLogsDisabled) {
           disableLogsCanonicallyNamedFunctions.push(resolvedFunctionName);
@@ -123,9 +124,8 @@ module.exports = {
       }
 
       if (!areLogsDisabled) {
-        const customFunctionNamelogGroupsPrefix = this.provider.naming.getLogGroupName(
-          resolvedFunctionName
-        );
+        const customFunctionNamelogGroupsPrefix =
+          this.provider.naming.getLogGroupName(resolvedFunctionName);
 
         policyDocumentStatements[0].Resource.push({
           'Fn::Sub':
@@ -214,9 +214,10 @@ module.exports = {
 
   mergeManagedPolicies(managedPolicies) {
     if (!managedPolicies.length) return;
-    const resource = this.serverless.service.provider.compiledCloudFormationTemplate.Resources[
-      this.provider.naming.getRoleLogicalId()
-    ].Properties;
+    const resource =
+      this.serverless.service.provider.compiledCloudFormationTemplate.Resources[
+        this.provider.naming.getRoleLogicalId()
+      ].Properties;
     if (!Array.isArray(resource.ManagedPolicyArns)) {
       resource.ManagedPolicyArns = [];
     }
diff --git a/lib/plugins/aws/package/lib/saveCompiledTemplate.js b/lib/plugins/aws/package/lib/save-compiled-template.js
similarity index 100%
rename from lib/plugins/aws/package/lib/saveCompiledTemplate.js
rename to lib/plugins/aws/package/lib/save-compiled-template.js
diff --git a/lib/plugins/aws/package/lib/saveServiceState.js b/lib/plugins/aws/package/lib/save-service-state.js
similarity index 94%
rename from lib/plugins/aws/package/lib/saveServiceState.js
rename to lib/plugins/aws/package/lib/save-service-state.js
index 754695682aa..7783f7dae3a 100644
--- a/lib/plugins/aws/package/lib/saveServiceState.js
+++ b/lib/plugins/aws/package/lib/save-service-state.js
@@ -2,7 +2,7 @@
 
 const path = require('path');
 const _ = require('lodash');
-const findReferences = require('../../utils/findReferences');
+const findReferences = require('../../utils/find-references');
 
 module.exports = {
   saveServiceState() {
diff --git a/lib/plugins/aws/package/lib/strip-null-props-from-template-resources.js b/lib/plugins/aws/package/lib/strip-null-props-from-template-resources.js
new file mode 100644
index 00000000000..8f42efbe534
--- /dev/null
+++ b/lib/plugins/aws/package/lib/strip-null-props-from-template-resources.js
@@ -0,0 +1,23 @@
+'use strict';
+
+const stripNullPropsFromObj = (obj) => {
+  Object.entries(obj).forEach(([propName, propVal]) => {
+    if (propVal === null) {
+      delete obj[propName];
+    } else if (typeof propVal === 'object') {
+      stripNullPropsFromObj(propVal);
+    }
+  });
+};
+
+module.exports = {
+  stripNullPropsFromTemplateResources() {
+    const resources = this.serverless.service.provider.compiledCloudFormationTemplate.Resources;
+
+    for (const resource of Object.values(resources)) {
+      if (resource.Properties) {
+        stripNullPropsFromObj(resource.Properties);
+      }
+    }
+  },
+};
diff --git a/lib/plugins/aws/package/lib/stripNullPropsFromTemplateResources.js b/lib/plugins/aws/package/lib/stripNullPropsFromTemplateResources.js
deleted file mode 100644
index b63b3c829de..00000000000
--- a/lib/plugins/aws/package/lib/stripNullPropsFromTemplateResources.js
+++ /dev/null
@@ -1,17 +0,0 @@
-'use strict';
-
-module.exports = {
-  stripNullPropsFromTemplateResources() {
-    const resources = this.serverless.service.provider.compiledCloudFormationTemplate.Resources;
-
-    for (const resource of Object.values(resources)) {
-      if (resource.Properties) {
-        for (const [propName, propVal] of Object.entries(resource.Properties)) {
-          if (propVal === null) {
-            delete resource.Properties[propName];
-          }
-        }
-      }
-    }
-  },
-};
diff --git a/lib/plugins/aws/provider.js b/lib/plugins/aws/provider.js
index baad1017a67..0c0de407da4 100644
--- a/lib/plugins/aws/provider.js
+++ b/lib/plugins/aws/provider.js
@@ -4,18 +4,20 @@ const AWS = require('aws-sdk');
 const BbPromise = require('bluebird');
 const _ = require('lodash');
 const naming = require('./lib/naming.js');
-const fs = require('fs');
-const getS3EndpointForRegion = require('./utils/getS3EndpointForRegion');
+const fsp = require('fs').promises;
+const getS3EndpointForRegion = require('./utils/get-s3-endpoint-for-region');
 const memoizeeMethods = require('memoizee/methods');
 const readline = require('readline');
-const reportDeprecatedProperties = require('../../utils/report-deprecated-properties');
 const { ALB_LISTENER_REGEXP } = require('./package/compile/events/alb/lib/validate');
 const d = require('d');
 const path = require('path');
 const spawnExt = require('child-process-ext/spawn');
 const ServerlessError = require('../../serverless-error');
 const awsRequest = require('../../aws/request');
-const log = require('@serverless/utils/log');
+const { cfValue } = require('../../utils/aws-schema-get-cf-value');
+const reportDeprecatedProperties = require('../../utils/report-deprecated-properties');
+const deepSortObjectByKey = require('../../utils/deep-sort-object-by-key');
+const { progress, log } = require('@serverless/utils/log');
 
 const isLambdaArn = RegExp.prototype.test.bind(/^arn:[^:]+:lambda:/);
 const isEcrUri = RegExp.prototype.test.bind(
@@ -170,12 +172,12 @@ const oidcAlbAuthorizer = {
   type: 'object',
   properties: {
     type: { const: 'oidc' },
-    authorizationEndpoint: { format: 'uri' },
+    authorizationEndpoint: { format: 'uri', type: 'string' },
     clientId: { type: 'string' },
     clientSecret: { type: 'string' },
-    issuer: { format: 'uri' },
-    tokenEndpoint: { format: 'uri' },
-    userInfoEndpoint: { format: 'uri' },
+    issuer: { format: 'uri', type: 'string' },
+    tokenEndpoint: { format: 'uri', type: 'string' },
+    userInfoEndpoint: { format: 'uri', type: 'string' },
     ...baseAlbAuthorizerProperties,
   },
   required: [
@@ -228,9 +230,8 @@ class AwsProvider {
             }
           }
         }
-
         reportDeprecatedProperties(
-          'PROVIDER_IAM_SETTINGS',
+          'PROVIDER_IAM_SETTINGS_V3',
           {
             'provider.role': 'provider.iam.role',
             'provider.rolePermissionsBoundary': 'provider.iam.role.permissionsBoundary',
@@ -245,10 +246,9 @@ class AwsProvider {
     };
 
     if (this.serverless.service.provider.name === 'aws') {
-      // Below ideally should be in hooks.intialize, but variables resolution depend on this
+      // Below ideally should be in hooks.initialize, but variables resolution depend on this
       this.serverless.service.provider.region = this.getRegion();
-      require('../../utils/awsSdkPatch');
-      // TODO: Complete schema, see https://github.com/serverless/serverless/issues/8016
+      require('../../utils/aws-sdk-patch');
       serverless.configSchemaHandler.defineProvider('aws', {
         definitions: {
           awsAccountId: {
@@ -275,27 +275,39 @@ class AwsProvider {
               anyOf: [
                 { type: 'string' },
                 {
-                  type: 'object',
-                  properties: {
-                    name: { type: 'string' },
-                    value: { type: 'string' },
-                    description: { type: 'string' },
-                    customerId: { type: 'string' },
-                  },
-                  anyOf: [{ required: ['name'] }, { required: ['value'] }],
-                  additionalProperties: false,
+                  $ref: '#/definitions/awsApiGatewayApiKeysProperties',
                 },
                 {
                   type: 'object',
                   maxProperties: 1,
                   additionalProperties: {
                     type: 'array',
-                    items: { type: 'string' },
+                    items: {
+                      oneOf: [
+                        { type: 'string' },
+                        { $ref: '#/definitions/awsApiGatewayApiKeysProperties' },
+                      ],
+                    },
                   },
                 },
               ],
             },
           },
+          awsApiGatewayApiKeysProperties: {
+            type: 'object',
+            properties: {
+              name: { type: 'string' },
+              value: { type: 'string' },
+              description: { type: 'string' },
+              customerId: { type: 'string' },
+              enabled: { type: 'boolean' },
+            },
+            additionalProperties: false,
+          },
+          awsHttpApiPayload: {
+            type: 'string',
+            enum: ['1.0', '2.0'],
+          },
           awsArn: {
             anyOf: [
               { $ref: '#/definitions/awsArnString' },
@@ -306,6 +318,19 @@ class AwsProvider {
             type: 'string',
             pattern: '^arn:',
           },
+          awsCfArrayInstruction: {
+            anyOf: [
+              {
+                type: 'array',
+                items: { $ref: '#/definitions/awsCfInstruction' },
+              },
+              { $ref: '#/definitions/awsCfSplit' },
+            ],
+          },
+          awsSecretsManagerArnString: {
+            type: 'string',
+            pattern: 'arn:[a-z-]+:secretsmanager:[a-z0-9-]+:\\d+:secret:[A-Za-z0-9/_+=.@-]+',
+          },
           awsCfFunction: {
             anyOf: [
               { $ref: '#/definitions/awsCfImport' },
@@ -336,6 +361,19 @@ class AwsProvider {
             additionalProperties: false,
             required: ['Fn::ImportValue'],
           },
+          awsCfIf: {
+            type: 'object',
+            properties: {
+              'Fn::If': {
+                type: 'array',
+                minItems: 3,
+                maxItems: 3,
+                items: { $ref: '#/definitions/awsCfInstruction' },
+              },
+            },
+            required: ['Fn::If'],
+            additionalProperties: false,
+          },
           awsCfImportLocallyResolvable: {
             type: 'object',
             properties: {
@@ -376,13 +414,29 @@ class AwsProvider {
                 type: 'array',
                 minItems: 2,
                 maxItems: 2,
-                items: [{ type: 'string' }, { $ref: '#/definitions/awsCfFunction' }],
-                additionalItems: false,
+                items: {
+                  oneOf: [{ type: 'string' }, { $ref: '#/definitions/awsCfFunction' }],
+                },
               },
             },
             required: ['Fn::Split'],
             additionalProperties: false,
           },
+          awsCfFindInMap: {
+            type: 'object',
+            properties: {
+              'Fn::FindInMap': {
+                type: 'array',
+                minItems: 3,
+                maxItems: 3,
+                items: {
+                  oneOf: [{ type: 'string' }, { $ref: '#/definitions/awsCfFunction' }],
+                },
+              },
+            },
+            required: ['Fn::FindInMap'],
+            additionalProperties: false,
+          },
           awsCfSub: {
             type: 'object',
             properties: {
@@ -401,6 +455,7 @@ class AwsProvider {
                   AWS: {
                     anyOf: [
                       { const: '*' },
+                      { $ref: '#/definitions/awsCfIf' },
                       {
                         type: 'array',
                         items: {
@@ -424,9 +479,16 @@ class AwsProvider {
             anyOf: [
               { const: '*' },
               { $ref: '#/definitions/awsArn' },
+              { $ref: '#/definitions/awsLogicalResourceId' },
               {
                 type: 'array',
-                items: { anyOf: [{ const: '*' }, { $ref: '#/definitions/awsArn' }] },
+                items: {
+                  anyOf: [
+                    { const: '*' },
+                    { $ref: '#/definitions/awsArn' },
+                    { $ref: '#/definitions/awsLogicalResourceId' },
+                  ],
+                },
               },
             ],
           },
@@ -454,11 +516,22 @@ class AwsProvider {
               ],
             },
           },
+          awsKmsArn: {
+            anyOf: [
+              { $ref: '#/definitions/awsCfFunction' },
+              { type: 'string', pattern: '^arn:aws[a-z-]*:kms' },
+            ],
+          },
+          awsLambdaArchitecture: { enum: ['arm64', 'x86_64'] },
           awsLambdaEnvironment: {
             type: 'object',
             patternProperties: {
               '^[A-Za-z_][a-zA-Z0-9_]*$': {
-                anyOf: [{ const: '' }, { $ref: '#/definitions/awsCfInstruction' }],
+                anyOf: [
+                  { const: '' },
+                  { $ref: '#/definitions/awsCfInstruction' },
+                  { $ref: '#/definitions/awsCfIf' },
+                ],
               },
             },
             additionalProperties: false,
@@ -478,22 +551,19 @@ class AwsProvider {
           },
           awsLambdaRuntime: {
             enum: [
-              'dotnetcore2.1',
               'dotnetcore3.1',
               'go1.x',
               'java11',
               'java8',
               'java8.al2',
-              'nodejs10.x',
               'nodejs12.x',
               'nodejs14.x',
               'provided',
               'provided.al2',
-              'python2.7',
               'python3.6',
               'python3.7',
               'python3.8',
-              'ruby2.5',
+              'python3.9',
               'ruby2.7',
             ],
           },
@@ -511,6 +581,7 @@ class AwsProvider {
                     maxItems: 5,
                   },
                   { $ref: '#/definitions/awsCfSplit' },
+                  { $ref: '#/definitions/awsCfFindInMap' },
                 ],
               },
               subnetIds: {
@@ -521,12 +592,17 @@ class AwsProvider {
                     maxItems: 16,
                   },
                   { $ref: '#/definitions/awsCfSplit' },
+                  { $ref: '#/definitions/awsCfFindInMap' },
                 ],
               },
             },
             additionalProperties: false,
             required: ['securityGroupIds', 'subnetIds'],
           },
+          awsLogicalResourceId: {
+            type: 'string',
+            pattern: '^[#A-Za-z0-9-_./]+[*]?$',
+          },
           awsLogGroupName: {
             type: 'string',
             pattern: '^[/#A-Za-z0-9-_.]+$',
@@ -598,9 +674,28 @@ class AwsProvider {
             pattern:
               '^\\d+\\.dkr\\.ecr\\.[a-z0-9-]+..amazonaws.com\\/([^@]+)|([^@:]+@sha256:[a-f0-9]{64})$',
           },
+          filterPatterns: {
+            type: 'array',
+            minItems: 1,
+            maxItems: 10,
+            items: { type: 'object' },
+          },
         },
         provider: {
           properties: {
+            alb: {
+              type: 'object',
+              properties: {
+                targetGroupPrefix: { type: 'string', maxLength: 16 },
+                authorizers: {
+                  type: 'object',
+                  additionalProperties: {
+                    anyOf: [oidcAlbAuthorizer, cognitoAlbAuthorizer],
+                  },
+                },
+              },
+              additionalProperties: false,
+            },
             apiGateway: {
               type: 'object',
               properties: {
@@ -613,6 +708,7 @@ class AwsProvider {
                   items: { type: 'string', pattern: '^\\S+\\/\\S+$' },
                 },
                 description: { type: 'string' },
+                disableDefaultEndpoint: { type: 'boolean' },
                 metrics: { type: 'boolean' },
                 minimumCompressionSize: { type: 'integer', minimum: 0, maximum: 10485760 },
                 resourcePolicy: { $ref: '#/definitions/awsResourcePolicyStatements' },
@@ -654,7 +750,7 @@ class AwsProvider {
                   },
                   additionalProperties: false,
                 },
-                shouldStartNameWithService: { const: true },
+                shouldStartNameWithService: { type: 'boolean' },
                 usagePlan: {
                   anyOf: [
                     apiGatewayUsagePlan,
@@ -672,21 +768,8 @@ class AwsProvider {
               },
               additionalProperties: false,
             },
-            apiKeys: { $ref: '#/definitions/awsApiGatewayApiKeys' },
             apiName: { type: 'string' },
-            alb: {
-              type: 'object',
-              properties: {
-                targetGroupPrefix: { type: 'string', maxLength: 16 },
-                authorizers: {
-                  type: 'object',
-                  additionalProperties: {
-                    anyOf: [oidcAlbAuthorizer, cognitoAlbAuthorizer],
-                  },
-                },
-              },
-              additionalProperties: false,
-            },
+            architecture: { $ref: '#/definitions/awsLambdaArchitecture' },
             cfnRole: { $ref: '#/definitions/awsArn' },
             cloudFront: {
               type: 'object',
@@ -735,7 +818,7 @@ class AwsProvider {
                             additionalProperties: false,
                           },
                         },
-                        requires: [
+                        required: [
                           'CookiesConfig',
                           'EnableAcceptEncodingGzip',
                           'HeadersConfig',
@@ -766,6 +849,7 @@ class AwsProvider {
                     skipPolicySetup: { type: 'boolean' },
                     maxPreviousDeploymentArtifacts: { type: 'integer', minimum: 0 },
                     name: { $ref: '#/definitions/awsS3BucketName' },
+                    versioning: { type: 'boolean' },
                     serverSideEncryption: { enum: ['AES256', 'aws:kms'] },
                     sseCustomerAlgorithim: { type: 'string' },
                     sseCustomerKey: { type: 'string' },
@@ -778,6 +862,7 @@ class AwsProvider {
               ],
             },
             deploymentPrefix: { type: 'string' },
+            disableRollback: { type: 'boolean' },
             endpointType: {
               anyOf: ['REGIONAL', 'EDGE', 'PRIVATE'].map(caseInsensitive),
             },
@@ -785,7 +870,7 @@ class AwsProvider {
             eventBridge: {
               type: 'object',
               properties: {
-                useCloudFormation: { const: true },
+                useCloudFormation: { type: 'boolean' },
               },
               additionalProperties: false,
             },
@@ -826,7 +911,7 @@ class AwsProvider {
                           managedExternally: { type: 'boolean' },
                           resultTtlInSeconds: { type: 'integer', minimum: 0, maximum: 3600 },
                           enableSimpleResponses: { type: 'boolean' },
-                          payloadVersion: { type: 'string', enum: ['1.0', '2.0'] },
+                          payloadVersion: { $ref: '#/definitions/awsHttpApiPayload' },
                           identitySource: {
                             anyOf: [
                               { $ref: '#/definitions/awsCfInstruction' },
@@ -870,6 +955,7 @@ class AwsProvider {
                 metrics: { type: 'boolean' },
                 useProviderTags: { const: true },
                 disableDefaultEndpoint: { type: 'boolean' },
+                shouldStartNameWithService: { type: 'boolean' },
               },
               additionalProperties: false,
             },
@@ -886,13 +972,17 @@ class AwsProvider {
                           type: 'string',
                           pattern: '^[A-Za-z0-9/_+=,.@-]{1,64}$',
                         },
+                        path: {
+                          type: 'string',
+                          pattern: '(^\\/$)|(^\\/[\u0021-\u007f]+\\/$)',
+                        },
                         managedPolicies: {
                           type: 'array',
                           items: { $ref: '#/definitions/awsArn' },
                         },
                         statements: { $ref: '#/definitions/awsIamPolicyStatements' },
-                        permissionBoundary: { $ref: '#/definitions/awsArnString' },
-                        permissionsBoundary: { $ref: '#/definitions/awsArnString' },
+                        permissionBoundary: { $ref: '#/definitions/awsArn' },
+                        permissionsBoundary: { $ref: '#/definitions/awsArn' },
                         tags: { $ref: '#/definitions/awsResourceTags' },
                       },
                       additionalProperties: false,
@@ -908,6 +998,7 @@ class AwsProvider {
             ecr: {
               type: 'object',
               properties: {
+                scanOnPush: { type: 'boolean' },
                 images: {
                   type: 'object',
                   patternProperties: {
@@ -920,7 +1011,8 @@ class AwsProvider {
                             path: { type: 'string' },
                             file: { type: 'string' },
                             buildArgs: { type: 'object', additionalProperties: { type: 'string' } },
-                            cacheFrom: { type: 'array', additionalProperties: { type: 'string' } },
+                            cacheFrom: { type: 'array', items: { type: 'string' } },
+                            platform: { type: 'string' },
                           },
                           additionalProperties: false,
                         },
@@ -938,7 +1030,7 @@ class AwsProvider {
             kmsKeyArn: { $ref: '#/definitions/awsKmsArn' },
             lambdaHashingVersion: {
               type: 'string',
-              enum: ['20201221'],
+              enum: ['20200924', '20201221'],
             },
             layers: { $ref: '#/definitions/awsLambdaLayers' },
             logRetentionInDays: {
@@ -1002,6 +1094,9 @@ class AwsProvider {
                 'us-east-2',
                 'us-gov-east-1',
                 'us-gov-west-1',
+                'us-iso-east-1',
+                'us-iso-west-1',
+                'us-isob-east-1',
                 'us-west-1',
                 'us-west-2',
                 'af-south-1',
@@ -1012,6 +1107,7 @@ class AwsProvider {
                 'ap-south-1',
                 'ap-southeast-1',
                 'ap-southeast-2',
+                'ap-southeast-3',
                 'ca-central-1',
                 'cn-north-1',
                 'cn-northwest-1',
@@ -1025,7 +1121,6 @@ class AwsProvider {
                 'sa-east-1',
               ],
             },
-            resourcePolicy: { $ref: '#/definitions/awsResourcePolicyStatements' },
             role: { $ref: '#/definitions/awsLambdaRole' },
             rolePermissionsBoundary: { $ref: '#/definitions/awsArnString' },
             rollbackConfiguration: {
@@ -1050,9 +1145,9 @@ class AwsProvider {
             runtime: { $ref: '#/definitions/awsLambdaRuntime' },
             s3: {
               type: 'object',
-              additionalProperties: require('./package/compile/events/s3/configSchema'),
+              additionalProperties: require('./package/compile/events/s3/config-schema'),
             },
-            stage: { type: 'string' },
+            stage: { $ref: '#/definitions/stage' },
             stackName: {
               type: 'string',
               pattern: '^[a-zA-Z][a-zA-Z0-9-]*$',
@@ -1083,24 +1178,8 @@ class AwsProvider {
               },
               additionalProperties: false,
             },
-            usagePlan: {
-              anyOf: [
-                apiGatewayUsagePlan,
-                {
-                  type: 'array',
-                  items: {
-                    type: 'object',
-                    additionalProperties: apiGatewayUsagePlan,
-                    maxProperties: 1,
-                  },
-                },
-              ],
-            },
             vpc: { $ref: '#/definitions/awsLambdaVpcConfig' },
-            vpcEndpointIds: {
-              type: 'array',
-              items: { $ref: '#/definitions/awsCfInstruction' },
-            },
+            vpcEndpointIds: { $ref: '#/definitions/awsCfArrayInstruction' },
             versionFunctions: { $ref: '#/definitions/awsLambdaVersioning' },
             websocketsApiName: { type: 'string' },
             websocketsApiRouteSelectionExpression: { type: 'string' },
@@ -1108,6 +1187,7 @@ class AwsProvider {
         },
         function: {
           properties: {
+            architecture: { $ref: '#/definitions/awsLambdaArchitecture' },
             awsKmsKeyArn: { $ref: '#/definitions/awsKmsArn' },
             condition: { $ref: '#/definitions/awsResourceCondition' },
             dependsOn: { $ref: '#/definitions/awsResourceDependsOn' },
@@ -1201,7 +1281,7 @@ class AwsProvider {
               additionalProperties: false,
             },
             provisionedConcurrency: { type: 'integer', minimum: 1 },
-            reservedConcurrency: { type: 'integer', minimum: 0 },
+            reservedConcurrency: cfValue({ type: 'integer', minimum: 0 }),
             role: { $ref: '#/definitions/awsLambdaRole' },
             runtime: { $ref: '#/definitions/awsLambdaRuntime' },
             tags: { $ref: '#/definitions/awsResourceTags' },
@@ -1209,6 +1289,13 @@ class AwsProvider {
             tracing: { $ref: '#/definitions/awsLambdaTracing' },
             versionFunction: { $ref: '#/definitions/awsLambdaVersioning' },
             vpc: { $ref: '#/definitions/awsLambdaVpcConfig' },
+            httpApi: {
+              type: 'object',
+              properties: {
+                payload: { $ref: '#/definitions/awsHttpApiPayload' },
+              },
+              additionalProperties: false,
+            },
           },
           additionalProperties: false,
         },
@@ -1224,6 +1311,11 @@ class AwsProvider {
                   pattern: '^(\\d{12}|\\*|arn:(aws[a-zA-Z-]*):iam::\\d{12}:root)$',
                 },
               },
+              compatibleArchitectures: {
+                type: 'array',
+                items: { $ref: '#/definitions/awsLambdaArchitecture' },
+                maxItems: 2,
+              },
               compatibleRuntimes: {
                 type: 'array',
                 items: { $ref: '#/definitions/awsLambdaRuntime' },
@@ -1255,6 +1347,7 @@ class AwsProvider {
           },
         },
         resources: {
+          type: 'object',
           properties: {
             AWSTemplateFormatVersion: {
               type: 'string',
@@ -1355,6 +1448,9 @@ class AwsProvider {
     // Store credentials in this variable to avoid creating them several times (messes up MFA).
     this.cachedCredentials = null;
 
+    // Store accountId to be used in `generateTelemetry` logic
+    this.accountId = null;
+
     Object.assign(this.naming, naming);
   }
 
@@ -1372,11 +1468,7 @@ class AwsProvider {
    * @prop [options.region] - Specify when to request to different region
    */
   async request(service, method, params, options) {
-    // Emit a warning for misuses of the old signature including stage and region
     // TODO: Determine calling module and log that
-    if (process.env.SLS_DEBUG && options != null && !_.isObject(options)) {
-      log('WARNING: Inappropriate call of provider.request()');
-    }
     const requestOptions = _.isObject(options) ? options : {};
     const shouldCache = _.get(requestOptions, 'useCache', false);
     // Copy is required as the credentials may be modified during the request
@@ -1493,7 +1585,7 @@ class AwsProvider {
   }
 
   getRuntime(runtime) {
-    const defaultRuntime = 'nodejs12.x';
+    const defaultRuntime = 'nodejs14.x';
     const runtimeSourceValue = this.getRuntimeSourceValue();
     return runtime || runtimeSourceValue.value || defaultRuntime;
   }
@@ -1567,7 +1659,10 @@ class AwsProvider {
       if (!alias) return arnGetter;
       return { 'Fn::Join': [':', [arnGetter, alias.name]] };
     }
-    throw new Error(`Unrecognized function address ${functionAddress}`);
+    throw new ServerlessError(
+      `Unrecognized function address ${functionAddress}`,
+      'UNRECOGNIZED_FUNCTION_ADDRESS'
+    );
   }
 
   resolveLayerArtifactName(layerName) {
@@ -1601,9 +1696,10 @@ class AwsProvider {
         return customRole['Fn::GetAtt'][0];
       }
       if (
-        // otherwise, check if we have an import or parameters ref
+        // otherwise, check if we have an import, parameters ref or sub
         customRole['Fn::ImportValue'] ||
-        customRole.Ref
+        customRole.Ref ||
+        customRole['Fn::Sub']
       ) {
         return null;
       }
@@ -1639,20 +1735,6 @@ class AwsProvider {
     return stageSourceValue.value || defaultStage;
   }
 
-  getAccountInfo() {
-    return this.request('STS', 'getCallerIdentity', {}).then((result) => {
-      const arn = result.Arn;
-      const accountId = result.Account;
-      const partition = arn.split(':')[1]; // ex: arn:aws:iam:acctId:user/xyz
-      return {
-        accountId,
-        partition,
-        arn: result.Arn,
-        userId: result.UserId,
-      };
-    });
-  }
-
   /**
    * Get API Gateway Rest API ID from serverless config
    */
@@ -1746,7 +1828,9 @@ class AwsProvider {
     const pushDockerArgs = ['push', remoteTag];
     try {
       const { stdBuffer: pushDockerStdBuffer } = await spawnExt('docker', pushDockerArgs);
-      process.stdout.write(pushDockerStdBuffer);
+      if (pushDockerStdBuffer) {
+        log.info(pushDockerStdBuffer.toString().trimRight());
+      }
       return pushDockerStdBuffer.toString();
     } catch (err) {
       if (
@@ -1769,6 +1853,21 @@ class AwsProvider {
 Object.defineProperties(
   AwsProvider.prototype,
   memoizeeMethods({
+    getAccountInfo: d(
+      async function () {
+        const result = await this.request('STS', 'getCallerIdentity', {});
+        const arn = result.Arn;
+        const accountId = result.Account;
+        const partition = arn.split(':')[1]; // ex: arn:aws:iam:acctId:user/xyz
+        return {
+          accountId,
+          partition,
+          arn: result.Arn,
+          userId: result.UserId,
+        };
+      },
+      { promise: true }
+    ),
     getAccountId: d(
       async function () {
         const result = await this.getAccountInfo();
@@ -1807,12 +1906,10 @@ Object.defineProperties(
         ];
         try {
           const { stdBuffer } = await spawnExt('docker', dockerArgs);
-          this.serverless.cli.log('Login to Docker succeeded!');
+          log.info('Login to Docker succeeded!');
           if (stdBuffer.includes('password will be stored unencrypted')) {
-            this.serverless.cli.log(
-              'WARNING: Docker authentication token will be stored unencrypted in docker config. Configure Docker credential helper to remove this warning.',
-              'Serverless',
-              { color: 'orange' }
+            log.warning(
+              'Docker authentication token will be stored unencrypted in docker config. Configure Docker credential helper to remove this warning.'
             );
           }
         } catch (err) {
@@ -1827,7 +1924,7 @@ Object.defineProperties(
       { promise: true }
     ),
     getOrCreateEcrRepository: d(
-      async function () {
+      async function (scanOnPush) {
         const registryId = await this.getAccountId();
         const repositoryName = this.naming.getEcrRepositoryName();
         let repositoryUri;
@@ -1843,6 +1940,7 @@ Object.defineProperties(
           }
           const result = await this.request('ECR', 'createRepository', {
             repositoryName,
+            imageScanningConfiguration: { scanOnPush },
           });
           repositoryUri = result.repository.repositoryUri;
         }
@@ -1854,14 +1952,23 @@ Object.defineProperties(
       { promise: true }
     ),
     resolveImageUriAndShaFromPath: d(
-      async function (imageName, imagePath, imageFilename, buildArgs, cacheFrom) {
+      async function ({
+        imageName,
+        imagePath,
+        imageFilename,
+        buildArgs,
+        cacheFrom,
+        platform,
+        scanOnPush,
+      }) {
+        const imageProgress = progress.get(`containerImage:${imageName}`);
         await this.ensureDockerIsAvailable();
 
         let isDockerfileAvailable = false;
         const pathToDockerfile = path.resolve(this.serverless.serviceDir, imagePath, imageFilename);
 
         try {
-          const stats = await fs.promises.stat(pathToDockerfile);
+          const stats = await fsp.stat(pathToDockerfile);
           isDockerfileAvailable = stats.isFile();
         } catch {
           // pass and handle after catch block
@@ -1873,7 +1980,7 @@ Object.defineProperties(
           );
         }
 
-        const { repositoryUri, repositoryName } = await this.getOrCreateEcrRepository();
+        const { repositoryUri, repositoryName } = await this.getOrCreateEcrRepository(scanOnPush);
 
         const localTag = `${repositoryName}:${imageName}`;
         const remoteTag = `${repositoryUri}:${imageName}`;
@@ -1898,42 +2005,61 @@ Object.defineProperties(
           imagePath,
         ];
 
-        try {
-          const { stdBuffer: buildDockerStdBuffer } = await spawnExt('docker', buildDockerArgs);
-          process.stdout.write(buildDockerStdBuffer);
-        } catch (err) {
-          throw new ServerlessError(
-            `Encountered error during executing: docker ${buildDockerArgs.join(
-              ' '
-            )}\nOutput of the command:\n${err.stdBuffer}`,
-            'DOCKER_BUILD_ERROR'
-          );
-        }
+        // This is an optional argument, so we only append to the arguments if "platform" is specified.
+        if (platform !== '') buildDockerArgs.push(`--platform=${platform}`);
 
-        const tagDockerArgs = ['tag', localTag, remoteTag];
+        let imageSha;
         try {
-          const { stdBuffer: tagDockerStdBuffer } = await spawnExt('docker', tagDockerArgs);
-          process.stdout.write(tagDockerStdBuffer);
-        } catch (err) {
-          throw new ServerlessError(
-            `Encountered error during executing: docker ${tagDockerArgs.join(
-              ' '
-            )}\nOutput of the command:\n${err.stdBuffer}`,
-            'DOCKER_TAG_ERROR'
-          );
-        }
+          imageProgress.notice(`Building image "${imageName}"`);
+          try {
+            const { stdBuffer: buildDockerStdBuffer } = await spawnExt('docker', buildDockerArgs);
+            if (buildDockerStdBuffer) {
+              log.info(buildDockerStdBuffer.toString().trimRight());
+            }
+          } catch (err) {
+            throw new ServerlessError(
+              `Encountered error during executing: docker ${buildDockerArgs.join(
+                ' '
+              )}\nOutput of the command:\n${err.stdBuffer}`,
+              'DOCKER_BUILD_ERROR'
+            );
+          }
 
-        const dockerPushOutput = await this.dockerPushToEcr(remoteTag);
+          imageProgress.notice(`Tagging image "${imageName}"`);
+          const tagDockerArgs = ['tag', localTag, remoteTag];
+          try {
+            const { stdBuffer: tagDockerStdBuffer } = await spawnExt('docker', tagDockerArgs);
+            if (tagDockerStdBuffer) {
+              log.info(tagDockerStdBuffer.toString().trimRight());
+            }
+          } catch (err) {
+            throw new ServerlessError(
+              `Encountered error during executing: docker ${tagDockerArgs.join(
+                ' '
+              )}\nOutput of the command:\n${err.stdBuffer}`,
+              'DOCKER_TAG_ERROR'
+            );
+          }
 
-        // Extract imageSha from `docker push` output
-        const imageSha = dockerPushOutput.match(/(sha256:[a-f0-9]{64})/)[0];
+          imageProgress.notice(`Uploading image "${imageName}"`);
+          const dockerPushOutput = await this.dockerPushToEcr(remoteTag);
+          // Extract imageSha from `docker push` output
+          imageSha = dockerPushOutput.match(/(sha256:[a-f0-9]{64})/)[0];
+        } finally {
+          imageProgress.remove();
+        }
 
         return {
           functionImageSha: imageSha.slice('sha256:'.length),
           functionImageUri: `${repositoryUri}@${imageSha}`,
         };
       },
-      { promise: true }
+      {
+        promise: true,
+        normalizer: (args) => {
+          return JSON.stringify(deepSortObjectByKey(args[0]));
+        },
+      }
     ),
     resolveImageUriAndShaFromUri: d(
       async function (image) {
@@ -2004,6 +2130,8 @@ Object.defineProperties(
         const defaultDockerfile = 'Dockerfile';
         const defaultBuildArgs = {};
         const defaultCacheFrom = [];
+        const defaultScanOnPush = false;
+        const defaultPlatform = '';
 
         if (imageUri) {
           return await this.resolveImageUriAndShaFromUri(imageUri);
@@ -2014,6 +2142,12 @@ Object.defineProperties(
           `ecr.images.${imageName}`
         );
 
+        const imageScanDefinedInProvider = _.get(
+          this.serverless.service.provider,
+          'ecr.scanOnPush',
+          defaultScanOnPush
+        );
+
         if (!imageDefinedInProvider) {
           throw new ServerlessError(
             `Referenced "${imageName}" not defined in "provider.ecr.images"`,
@@ -2046,27 +2180,37 @@ Object.defineProperties(
               'ECR_IMAGE_BOTH_URI_AND_CACHEFROM_DEFINED_ERROR'
             );
           }
+          if (imageDefinedInProvider.uri && imageDefinedInProvider.platform) {
+            throw new ServerlessError(
+              `The "platform" property cannot be used with "uri" property "${imageName}"`,
+              'ECR_IMAGE_BOTH_URI_AND_PLATFORM_DEFINED_ERROR'
+            );
+          }
           if (imageDefinedInProvider.path) {
-            return await this.resolveImageUriAndShaFromPath(
+            return await this.resolveImageUriAndShaFromPath({
               imageName,
-              imageDefinedInProvider.path,
-              imageDefinedInProvider.file || defaultDockerfile,
-              imageDefinedInProvider.buildArgs || defaultBuildArgs,
-              imageDefinedInProvider.cacheFrom || defaultCacheFrom
-            );
+              imagePath: imageDefinedInProvider.path,
+              imageFilename: imageDefinedInProvider.file || defaultDockerfile,
+              buildArgs: imageDefinedInProvider.buildArgs || defaultBuildArgs,
+              cacheFrom: imageDefinedInProvider.cacheFrom || defaultCacheFrom,
+              platform: imageDefinedInProvider.platform || defaultPlatform,
+              scanOnPush: imageScanDefinedInProvider,
+            });
           }
           return await this.resolveImageUriAndShaFromUri(imageDefinedInProvider.uri);
         }
         if (isEcrUri(imageDefinedInProvider)) {
           return await this.resolveImageUriAndShaFromUri(imageDefinedInProvider);
         }
-        return await this.resolveImageUriAndShaFromPath(
+        return await this.resolveImageUriAndShaFromPath({
           imageName,
-          imageDefinedInProvider,
-          defaultDockerfile,
-          imageDefinedInProvider.buildArgs || defaultBuildArgs,
-          imageDefinedInProvider.cacheFrom || defaultCacheFrom
-        );
+          imagePath: imageDefinedInProvider,
+          imageFilename: defaultDockerfile,
+          buildArgs: imageDefinedInProvider.buildArgs || defaultBuildArgs,
+          cacheFrom: imageDefinedInProvider.cacheFrom || defaultCacheFrom,
+          platform: imageDefinedInProvider.platform || defaultPlatform,
+          scanOnPush: imageScanDefinedInProvider,
+        });
       },
       { promise: true }
     ),
diff --git a/lib/plugins/aws/remove/index.js b/lib/plugins/aws/remove/index.js
index 3aee2304fcd..a6962c703f8 100644
--- a/lib/plugins/aws/remove/index.js
+++ b/lib/plugins/aws/remove/index.js
@@ -1,11 +1,15 @@
 'use strict';
 
 const validate = require('../lib/validate');
-const monitorStack = require('../lib/monitorStack');
+const monitorStack = require('../lib/monitor-stack');
+const checkIfBucketExists = require('../lib/check-if-bucket-exists');
 const emptyS3Bucket = require('./lib/bucket');
 const removeStack = require('./lib/stack');
 const removeEcrRepository = require('./lib/ecr');
-const checkIfEcrRepositoryExists = require('../lib/checkIfEcrRepositoryExists');
+const checkIfEcrRepositoryExists = require('../lib/check-if-ecr-repository-exists');
+const { log, style, progress } = require('@serverless/utils/log');
+
+const mainProgress = progress.get('main');
 
 class AwsRemove {
   constructor(serverless, options) {
@@ -20,20 +24,54 @@ class AwsRemove {
       removeStack,
       monitorStack,
       removeEcrRepository,
-      checkIfEcrRepositoryExists
+      checkIfEcrRepositoryExists,
+      checkIfBucketExists
     );
 
     this.hooks = {
+      'initialize': async () => {
+        if (this.serverless.processedInput.commands.join(' ') === 'remove') {
+          log.notice(
+            `Removing ${this.serverless.service.service} from stage ${this.serverless
+              .getProvider('aws')
+              .getStage()} ${style.aside(`(${this.serverless.getProvider('aws').getRegion()})`)}`
+          );
+          log.info(); // Ensure gap between verbose logging
+
+          // This is used to ensure that for `remove` command, the `accountId` will be resolved and available
+          // for `generatePayload` telemetry logic
+          this.provider.getAccountId().then(
+            (accountId) => (this.provider.accountId = accountId),
+            () => {
+              /* pass on all errors */
+            }
+          );
+        }
+      },
       'remove:remove': async () => {
         const doesEcrRepositoryExistPromise = this.checkIfEcrRepositoryExists();
         await this.validate();
+        mainProgress.notice('Removing objects from S3 bucket', { isMainEvent: true });
         await this.emptyS3Bucket();
+        mainProgress.notice('Removing CloudFormation stack', { isMainEvent: true });
         const cfData = await this.removeStack();
         await this.monitorStack('delete', cfData);
         if (await doesEcrRepositoryExistPromise) {
+          mainProgress.notice('Removing ECR repository', { isMainEvent: true });
           await this.removeEcrRepository();
         }
       },
+      'finalize': () => {
+        if (this.serverless.processedInput.commands.join(' ') !== 'remove') return;
+        log.notice();
+        log.notice.success(
+          `Service ${this.serverless.service.service} has been successfully removed ${style.aside(
+            `(${Math.floor(
+              (Date.now() - this.serverless.pluginManager.commandRunStartTime) / 1000
+            )}s)`
+          )}`
+        );
+      },
     };
   }
 }
diff --git a/lib/plugins/aws/remove/lib/bucket.js b/lib/plugins/aws/remove/lib/bucket.js
index e755460f6ff..aa0cc52a77e 100644
--- a/lib/plugins/aws/remove/lib/bucket.js
+++ b/lib/plugins/aws/remove/lib/bucket.js
@@ -1,55 +1,99 @@
 'use strict';
 
-const BbPromise = require('bluebird');
+const { log } = require('@serverless/utils/log');
 
 module.exports = {
   async setServerlessDeploymentBucketName() {
-    return this.provider.getServerlessDeploymentBucketName().then((bucketName) => {
+    try {
+      const bucketName = await this.provider.getServerlessDeploymentBucketName();
       this.bucketName = bucketName;
+    } catch (err) {
+      // If there is a validation error with expected message, it means that logical resource for
+      // S3 bucket does not exist and we want to proceed with empty `bucketName`
+      if (
+        err.providerError.code !== 'ValidationError' ||
+        !err.message.includes('does not exist for stack')
+      ) {
+        throw err;
+      }
+    }
+  },
+
+  async listObjectsV2() {
+    this.objectsInBucket = [];
+
+    const serviceStage = `${this.serverless.service.service}/${this.provider.getStage()}`;
+
+    const result = await this.provider.request('S3', 'listObjectsV2', {
+      Bucket: this.bucketName,
+      Prefix: `${this.provider.getDeploymentPrefix()}/${serviceStage}`,
     });
+
+    if (result) {
+      result.Contents.forEach((object) => {
+        this.objectsInBucket.push({
+          Key: object.Key,
+        });
+      });
+    }
   },
 
-  async listObjects() {
+  async listObjectVersions() {
     this.objectsInBucket = [];
 
-    this.serverless.cli.log('Getting all objects in S3 bucket...');
     const serviceStage = `${this.serverless.service.service}/${this.provider.getStage()}`;
 
-    return this.provider
-      .request('S3', 'listObjectsV2', {
-        Bucket: this.bucketName,
-        Prefix: `${this.provider.getDeploymentPrefix()}/${serviceStage}`,
-      })
-      .then((result) => {
-        if (result) {
-          result.Contents.forEach((object) => {
-            this.objectsInBucket.push({
-              Key: object.Key,
-            });
+    const result = await this.provider.request('S3', 'listObjectVersions', {
+      Bucket: this.bucketName,
+      Prefix: `${this.provider.getDeploymentPrefix()}/${serviceStage}`,
+    });
+
+    if (result) {
+      if (result.Versions) {
+        result.Versions.forEach((object) => {
+          this.objectsInBucket.push({
+            Key: object.Key,
+            VersionId: object.VersionId,
           });
-        }
-        return BbPromise.resolve();
-      });
+        });
+      }
+
+      if (result.DeleteMarkers) {
+        result.DeleteMarkers.forEach((object) => {
+          this.objectsInBucket.push({
+            Key: object.Key,
+            VersionId: object.VersionId,
+          });
+        });
+      }
+    }
+  },
+
+  async listObjects() {
+    const deploymentBucketObject = this.serverless.service.provider.deploymentBucketObject;
+    return deploymentBucketObject && deploymentBucketObject.versioning
+      ? this.listObjectVersions()
+      : this.listObjectsV2();
   },
 
   async deleteObjects() {
-    this.serverless.cli.log('Removing objects in S3 bucket...');
     if (this.objectsInBucket.length) {
-      return this.provider.request('S3', 'deleteObjects', {
+      await this.provider.request('S3', 'deleteObjects', {
         Bucket: this.bucketName,
         Delete: {
           Objects: this.objectsInBucket,
         },
       });
     }
-
-    return BbPromise.resolve();
   },
 
   async emptyS3Bucket() {
-    return BbPromise.bind(this)
-      .then(this.setServerlessDeploymentBucketName)
-      .then(this.listObjects)
-      .then(this.deleteObjects);
+    await this.setServerlessDeploymentBucketName();
+    if (this.bucketName && (await this.checkIfBucketExists(this.bucketName))) {
+      await this.listObjects();
+      await this.deleteObjects();
+    } else {
+      log.info('S3 bucket not found. Skipping S3 bucket objects removal');
+    }
   },
 };
diff --git a/lib/plugins/aws/remove/lib/ecr.js b/lib/plugins/aws/remove/lib/ecr.js
index 03345132f63..ff44da63816 100644
--- a/lib/plugins/aws/remove/lib/ecr.js
+++ b/lib/plugins/aws/remove/lib/ecr.js
@@ -2,7 +2,6 @@
 
 module.exports = {
   async removeEcrRepository() {
-    this.serverless.cli.log('Removing ECR repository...');
     const registryId = await this.provider.getAccountId();
     const repositoryName = this.provider.naming.getEcrRepositoryName();
     const params = {
diff --git a/lib/plugins/aws/remove/lib/stack.js b/lib/plugins/aws/remove/lib/stack.js
index 32b69e1c8df..c3baa80d1a2 100644
--- a/lib/plugins/aws/remove/lib/stack.js
+++ b/lib/plugins/aws/remove/lib/stack.js
@@ -4,7 +4,6 @@ const BbPromise = require('bluebird');
 
 module.exports = {
   async remove() {
-    this.serverless.cli.log('Removing Stack...');
     const stackName = this.provider.naming.getStackName();
     const params = {
       StackName: stackName,
diff --git a/lib/plugins/aws/rollbackFunction.js b/lib/plugins/aws/rollback-function.js
similarity index 68%
rename from lib/plugins/aws/rollbackFunction.js
rename to lib/plugins/aws/rollback-function.js
index de288d8b893..8040128a593 100644
--- a/lib/plugins/aws/rollbackFunction.js
+++ b/lib/plugins/aws/rollback-function.js
@@ -1,8 +1,12 @@
 'use strict';
 
 const BbPromise = require('bluebird');
+const ServerlessError = require('../../serverless-error');
 const validate = require('./lib/validate');
 const fetch = require('node-fetch');
+const { style, log, progress } = require('@serverless/utils/log');
+
+const mainProgress = progress.get('main');
 
 class AwsRollbackFunction {
   constructor(serverless, options) {
@@ -29,7 +33,11 @@ class AwsRollbackFunction {
     // versions need to be string so that AWS understands it
     funcVersion = String(this.options['function-version']);
 
-    this.serverless.cli.log(`Rolling back function "${funcName}" to version "${funcVersion}"...`);
+    log.notice();
+    log.notice(`Rolling back function ${funcName} to version "${funcVersion}"`);
+    log.info(); // Ensure gap between verbose logging
+
+    mainProgress.notice('Updating', { isMainEvent: true });
 
     const funcObj = this.serverless.service.getFunction(funcName);
 
@@ -49,9 +57,12 @@ class AwsRollbackFunction {
             ` and version "${funcVersion}" is available for this function.`,
             ' Please check the docs for more info.',
           ].join('');
-          throw new Error(errorMessage);
+          throw new ServerlessError(errorMessage, 'AWS_FUNCTION_NOT_FOUND');
         }
-        throw new Error(error.message);
+        throw new ServerlessError(
+          `Cannot resolve function "${funcName}": ${error.message}`,
+          'AWS_FUNCTION_NOT_ACCESIBLE'
+        );
       });
   }
 
@@ -64,8 +75,6 @@ class AwsRollbackFunction {
   async restoreFunction(zipBuffer) {
     const funcName = this.options.function;
 
-    this.serverless.cli.log('Restoring function...');
-
     const funcObj = this.serverless.service.getFunction(funcName);
 
     const params = {
@@ -74,7 +83,16 @@ class AwsRollbackFunction {
     };
 
     return this.provider.request('Lambda', 'updateFunctionCode', params).then(() => {
-      this.serverless.cli.log(`Successfully rolled back function "${this.options.function}"`);
+      log.notice();
+      log.notice.success(
+        `Successfully rolled back function ${funcName} to version "${
+          this.options['function-version']
+        }" ${style.aside(
+          `(${Math.floor(
+            (Date.now() - this.serverless.pluginManager.commandRunStartTime) / 1000
+          )}s)`
+        )}`
+      );
     });
   }
 }
diff --git a/lib/plugins/aws/rollback.js b/lib/plugins/aws/rollback.js
index 0ad026b3f08..53d5c2f99b3 100644
--- a/lib/plugins/aws/rollback.js
+++ b/lib/plugins/aws/rollback.js
@@ -1,11 +1,16 @@
 'use strict';
-
-const BbPromise = require('bluebird');
 const validate = require('./lib/validate');
-const setBucketName = require('./lib/setBucketName');
-const updateStack = require('./lib/updateStack');
-const monitorStack = require('./lib/monitorStack');
-const findAndGroupDeployments = require('./utils/findAndGroupDeployments');
+const setBucketName = require('./lib/set-bucket-name');
+const updateStack = require('./lib/update-stack');
+const monitorStack = require('./lib/monitor-stack');
+const waitForChangeSetCreation = require('./lib/wait-for-change-set-creation');
+const getCreateChangeSetParams = require('./lib/get-create-change-set-params');
+const getExecuteChangeSetParams = require('./lib/get-execute-change-set-params');
+const findAndGroupDeployments = require('./utils/find-and-group-deployments');
+const ServerlessError = require('../../serverless-error');
+const { style, log, progress } = require('@serverless/utils/log');
+
+const mainProgress = progress.get('main');
 
 class AwsRollback {
   constructor(serverless, options) {
@@ -13,26 +18,59 @@ class AwsRollback {
     this.options = options;
     this.provider = this.serverless.getProvider('aws');
 
-    Object.assign(this, validate, setBucketName, updateStack, monitorStack);
+    Object.assign(
+      this,
+      validate,
+      setBucketName,
+      updateStack,
+      monitorStack,
+      waitForChangeSetCreation,
+      getCreateChangeSetParams,
+      getExecuteChangeSetParams
+    );
 
     this.hooks = {
-      'before:rollback:initialize': async () => BbPromise.bind(this).then(this.validate),
+      'before:rollback:initialize': async () => this.validate(),
+
       'rollback:rollback': async () => {
         if (!this.options.timestamp) {
-          const command = this.serverless.pluginManager.spawn('deploy:list');
-          this.serverless.cli.log(
-            [
-              'Use a timestamp from the deploy list below to rollback to a specific version.',
-              'Run `sls rollback -t YourTimeStampHere`',
-            ].join('\n')
+          log.notice(
+            'Select a timestamp from the deploy list below and run "sls rollback -t <timestamp>" to rollback your service to a specific version.'
           );
-          return command;
+          log.notice();
+          await this.serverless.pluginManager.spawn('deploy:list');
+          return;
         }
 
-        return BbPromise.bind(this)
-          .then(this.setBucketName)
-          .then(this.setStackToUpdate)
-          .then(this.updateStack);
+        log.notice();
+        log.notice(
+          `Rolling back ${this.serverless.service.service} to timestamp "${this.options.timestamp}"`
+        );
+        log.info(); // Ensure gap between verbose logging
+
+        await this.setBucketName();
+        await this.setStackToUpdate();
+        mainProgress.notice('Validating', { isMainEvent: true });
+        const result = await this.updateStack();
+
+        log.notice();
+        if (result) {
+          log.notice.success(
+            `Service rolled back to timestamp "${this.options.timestamp}" ${style.aside(
+              `(${Math.floor(
+                (Date.now() - this.serverless.pluginManager.commandRunStartTime) / 1000
+              )}s)`
+            )}`
+          );
+        } else {
+          log.notice.skip(
+            `No updates to be performed. Rollback skipped. ${style.aside(
+              `(${Math.floor(
+                (Date.now() - this.serverless.pluginManager.commandRunStartTime) / 1000
+              )}s)`
+            )}`
+          );
+        }
       },
     };
   }
@@ -44,45 +82,41 @@ class AwsRollback {
     const deploymentPrefix = this.provider.getDeploymentPrefix();
     const prefix = `${deploymentPrefix}/${serviceName}/${stage}`;
 
-    return this.provider
-      .request('S3', 'listObjectsV2', {
-        Bucket: this.bucketName,
-        Prefix: prefix,
-      })
-      .then((response) => {
-        const deployments = findAndGroupDeployments(response, deploymentPrefix, serviceName, stage);
-
-        if (deployments.length === 0) {
-          const msg = "Couldn't find any existing deployments.";
-          const hint = 'Please verify that stage and region are correct.';
-          return BbPromise.reject(`${msg} ${hint}`);
-        }
+    const response = await this.provider.request('S3', 'listObjectsV2', {
+      Bucket: this.bucketName,
+      Prefix: prefix,
+    });
+    const deployments = findAndGroupDeployments(response, deploymentPrefix, serviceName, stage);
 
-        let date = new Date(this.options.timestamp);
+    if (deployments.length === 0) {
+      const msg = "Couldn't find any existing deployments.";
+      const hint = 'Please verify that stage and region are correct.';
+      throw new ServerlessError(`${msg} ${hint}`, 'ROLLBACK_DEPLOYMENTS_NOT_FOUND');
+    }
 
-        // The if below is added due issues#5664 - Check it for more details
-        if (date instanceof Date === false || isNaN(date.valueOf())) {
-          date = new Date(Number(this.options.timestamp));
-        }
+    let date = new Date(this.options.timestamp);
 
-        const dateString = `${date.getTime().toString()}-${date.toISOString()}`;
-        const exists = deployments.some((deployment) =>
-          deployment.some(
-            (item) =>
-              item.directory === dateString &&
-              item.file === this.provider.naming.getCompiledTemplateS3Suffix()
-          )
-        );
+    // The if below is added due issues#5664 - Check it for more details
+    if (date instanceof Date === false || isNaN(date.valueOf())) {
+      date = new Date(Number(this.options.timestamp));
+    }
 
-        if (!exists) {
-          const msg = `Couldn't find a deployment for the timestamp: ${this.options.timestamp}.`;
-          const hint = 'Please verify that the timestamp, stage and region are correct.';
-          return BbPromise.reject(`${msg} ${hint}`);
-        }
+    const dateString = `${date.getTime().toString()}-${date.toISOString()}`;
+    const exists = deployments.some((deployment) =>
+      deployment.some(
+        (item) =>
+          item.directory === dateString &&
+          item.file === this.provider.naming.getCompiledTemplateS3Suffix()
+      )
+    );
+
+    if (!exists) {
+      const msg = `Couldn't find a deployment for the timestamp: ${this.options.timestamp}.`;
+      const hint = 'Please verify that the timestamp, stage and region are correct.';
+      throw new ServerlessError(`${msg} ${hint}`, 'ROLLBACK_DEPLOYMENT_NOT_FOUND');
+    }
 
-        service.package.artifactDirectoryName = `${prefix}/${dateString}`;
-        return BbPromise.resolve();
-      });
+    service.package.artifactDirectoryName = `${prefix}/${dateString}`;
   }
 }
 
diff --git a/lib/plugins/aws/utils/arnRegularExpressions.js b/lib/plugins/aws/utils/arn-regular-expressions.js
similarity index 100%
rename from lib/plugins/aws/utils/arnRegularExpressions.js
rename to lib/plugins/aws/utils/arn-regular-expressions.js
diff --git a/lib/plugins/aws/utils/credentials.js b/lib/plugins/aws/utils/credentials.js
index e603e009c87..1ea82b923e3 100644
--- a/lib/plugins/aws/utils/credentials.js
+++ b/lib/plugins/aws/utils/credentials.js
@@ -4,6 +4,7 @@ const { join } = require('path');
 const { constants, readFile, writeFile, mkdir } = require('fs');
 const os = require('os');
 const BbPromise = require('bluebird');
+const ServerlessError = require('../../../serverless-error');
 
 const homedir = os.homedir();
 const awsConfigDirPath = join(homedir, '.aws');
@@ -43,7 +44,7 @@ const parseFileProfiles = (content) => {
   return profiles;
 };
 
-const writeCredentialsContent = (content) =>
+const writeCredentialsContent = async (content) =>
   new BbPromise((resolve, reject) =>
     writeFile(
       credentialsFilePath,
@@ -71,7 +72,7 @@ const writeCredentialsContent = (content) =>
   );
 
 module.exports = {
-  resolveFileProfiles() {
+  async resolveFileProfiles() {
     return new BbPromise((resolve, reject) => {
       if (!credentialsFilePath) {
         resolve(new Map());
@@ -99,9 +100,14 @@ module.exports = {
     };
   },
 
-  saveFileProfiles(profiles) {
+  async saveFileProfiles(profiles) {
     return new BbPromise((resolve) => {
-      if (!credentialsFilePath) throw new Error('Could not resolve path to user credentials file');
+      if (!credentialsFilePath) {
+        throw new ServerlessError(
+          'Could not resolve path to user credentials file',
+          'UNKNOWN_AWS_CREDENTIALS_PATH'
+        );
+      }
       resolve(
         writeCredentialsContent(
           `${Array.from(profiles)
diff --git a/lib/plugins/aws/utils/findAndGroupDeployments.js b/lib/plugins/aws/utils/find-and-group-deployments.js
similarity index 100%
rename from lib/plugins/aws/utils/findAndGroupDeployments.js
rename to lib/plugins/aws/utils/find-and-group-deployments.js
diff --git a/lib/plugins/aws/utils/findReferences.js b/lib/plugins/aws/utils/find-references.js
similarity index 100%
rename from lib/plugins/aws/utils/findReferences.js
rename to lib/plugins/aws/utils/find-references.js
diff --git a/lib/plugins/aws/utils/format-lambda-log-event.js b/lib/plugins/aws/utils/format-lambda-log-event.js
new file mode 100644
index 00000000000..ac2a8e1bafc
--- /dev/null
+++ b/lib/plugins/aws/utils/format-lambda-log-event.js
@@ -0,0 +1,51 @@
+'use strict';
+
+const dayjs = require('dayjs');
+const { style } = require('@serverless/utils/log');
+
+module.exports = (msgParam) => {
+  let msg = msgParam;
+  const dateFormat = 'YYYY-MM-DD HH:mm:ss.SSS';
+
+  if (!msg.startsWith('REPORT')) msg = msg.trimRight();
+
+  if (msg.startsWith('START')) {
+    msg = 'START';
+    return style.aside(msg);
+  }
+
+  if (msg.startsWith('REPORT')) {
+    const splitted = msg.split('\t');
+    // Replace REPORT with END and filter out RequestId
+    msg = `END ${splitted.slice(1).join('\t')}`;
+    return style.aside(msg);
+  }
+
+  if (msg.trim() === 'Process exited before completing request') {
+    return style.error(msg);
+  }
+
+  const splitted = msg.split('\t');
+
+  if (splitted.length < 3) {
+    return msg;
+  }
+
+  let date = '';
+  let reqId = '';
+  let level = '';
+  if (!isNaN(new Date(splitted[0]).getTime())) {
+    date = splitted[0];
+    reqId = splitted[1];
+  } else if (!isNaN(new Date(splitted[1]).getTime())) {
+    date = splitted[1];
+    reqId = splitted[2];
+    level = `${splitted[0]}\t`;
+  } else {
+    return msg;
+  }
+  const text = msg.split(`${reqId}\t`)[1];
+  const time = dayjs(date).format(dateFormat);
+
+  return `${style.aside(`${time}\t`)}${level}${text}`;
+};
diff --git a/lib/plugins/aws/utils/formatLambdaLogEvent.js b/lib/plugins/aws/utils/formatLambdaLogEvent.js
deleted file mode 100644
index 05aa5183501..00000000000
--- a/lib/plugins/aws/utils/formatLambdaLogEvent.js
+++ /dev/null
@@ -1,44 +0,0 @@
-'use strict';
-
-const dayjs = require('dayjs');
-const chalk = require('chalk');
-const os = require('os');
-
-module.exports = (msgParam) => {
-  let msg = msgParam;
-  const dateFormat = 'YYYY-MM-DD HH:mm:ss.SSS (Z)';
-
-  if (msg.startsWith('REPORT')) {
-    msg += os.EOL;
-  }
-
-  if (msg.startsWith('START') || msg.startsWith('END') || msg.startsWith('REPORT')) {
-    return chalk.gray(msg);
-  } else if (msg.trim() === 'Process exited before completing request') {
-    return chalk.red(msg);
-  }
-
-  const splitted = msg.split('\t');
-
-  if (splitted.length < 3) {
-    return msg;
-  }
-
-  let date = '';
-  let reqId = '';
-  let level = '';
-  if (!isNaN(new Date(splitted[0]).getTime())) {
-    date = splitted[0];
-    reqId = splitted[1];
-  } else if (!isNaN(new Date(splitted[1]).getTime())) {
-    date = splitted[1];
-    reqId = splitted[2];
-    level = `${splitted[0]}\t`;
-  } else {
-    return msg;
-  }
-  const text = msg.split(`${reqId}\t`)[1];
-  const time = chalk.green(dayjs(date).format(dateFormat));
-
-  return `${time}\t${chalk.yellow(reqId)}\t${level}${text}`;
-};
diff --git a/lib/plugins/aws/utils/getLambdaLayerArtifactPath.js b/lib/plugins/aws/utils/get-lambda-layer-artifact-path.js
similarity index 100%
rename from lib/plugins/aws/utils/getLambdaLayerArtifactPath.js
rename to lib/plugins/aws/utils/get-lambda-layer-artifact-path.js
diff --git a/lib/plugins/aws/utils/get-monitoring-frequency.js b/lib/plugins/aws/utils/get-monitoring-frequency.js
new file mode 100644
index 00000000000..8c978df21c4
--- /dev/null
+++ b/lib/plugins/aws/utils/get-monitoring-frequency.js
@@ -0,0 +1,5 @@
+'use strict';
+
+module.exports = (frequency = null) => {
+  return frequency || process.env.SLS_AWS_MONITORING_FREQUENCY || 5000;
+};
diff --git a/lib/plugins/aws/utils/getS3EndpointForRegion.js b/lib/plugins/aws/utils/get-s3-endpoint-for-region.js
similarity index 70%
rename from lib/plugins/aws/utils/getS3EndpointForRegion.js
rename to lib/plugins/aws/utils/get-s3-endpoint-for-region.js
index 39392ff1099..24f35371a56 100644
--- a/lib/plugins/aws/utils/getS3EndpointForRegion.js
+++ b/lib/plugins/aws/utils/get-s3-endpoint-for-region.js
@@ -6,6 +6,10 @@ module.exports = function getS3EndpointForRegion(region) {
   if (strRegion.match(/us-gov/)) return `s3-${strRegion}.amazonaws.com`;
   // look for china - currently s3.cn-north-1.amazonaws.com.cn
   if (strRegion.match(/cn-/)) return `s3.${strRegion}.amazonaws.com.cn`;
+  // look for AWS ISO (US)
+  if (strRegion.match(/iso-/)) return `s3.${strRegion}.c2s.ic.gov`;
+  // look for AWS ISOB (US)
+  if (strRegion.match(/isob-/)) return `s3.${strRegion}.sc2s.sgov.gov`;
   // default s3 endpoint for other regions
   return 's3.amazonaws.com';
 };
diff --git a/lib/plugins/aws/utils/getS3ObjectsFromStacks.js b/lib/plugins/aws/utils/get-s3-objects-from-stacks.js
similarity index 100%
rename from lib/plugins/aws/utils/getS3ObjectsFromStacks.js
rename to lib/plugins/aws/utils/get-s3-objects-from-stacks.js
diff --git a/lib/plugins/aws/utils/is-change-set-without-changes.js b/lib/plugins/aws/utils/is-change-set-without-changes.js
new file mode 100644
index 00000000000..3b1a33201d5
--- /dev/null
+++ b/lib/plugins/aws/utils/is-change-set-without-changes.js
@@ -0,0 +1,15 @@
+'use strict';
+
+module.exports = (changeSetDescription) => {
+  const errorMessages = [
+    'No updates are to be performed.',
+    "The submitted information didn't contain changes.",
+  ];
+
+  return (
+    changeSetDescription.Status === 'FAILED' &&
+    errorMessages.some(
+      (msg) => changeSetDescription.StatusReason && changeSetDescription.StatusReason.includes(msg)
+    )
+  );
+};
diff --git a/lib/plugins/aws/utils/parse-s3-uri.js b/lib/plugins/aws/utils/parse-s3-uri.js
new file mode 100644
index 00000000000..02538a2a0e9
--- /dev/null
+++ b/lib/plugins/aws/utils/parse-s3-uri.js
@@ -0,0 +1,33 @@
+'use strict';
+
+// https://docs.aws.amazon.com/AmazonS3/latest/userguide/access-bucket-intro.html
+const patterns = [
+  // S3 URI. Ex: s3://bucket/path/to/artifact.zip
+  new RegExp('^s3://(?<bucket>[^/]+)/(?<key>.+)'),
+
+  // New style S3 URL.
+  // Ex: https://bucket.s3.amazonaws.com/path/to/artifact.zip
+  // Ex: https://bucket.s3.region.amazonaws.com/path/to/artifact.zip
+  // Ex: https://bucket.s3-region.amazonaws.com/path/to/artifact.zip
+  new RegExp('(?<bucket>[^/]+)\\.s3([\\.-][\\w\\d-]+)?\\.amazonaws\\.com/(?<key>.+)'),
+
+  // Old style S3 URL.
+  // Ex: https://s3.amazonaws.com/bucket/path/to/artifact.zip
+  // Ex: https://s3.region.amazonaws.com/bucket/path/to/artifact.zip
+  // Ex: https://s3-region.amazonaws.com/bucket/path/to/artifact.zip
+  new RegExp('s3([\\.-][\\w\\d-]+)?\\.amazonaws\\.com/(?<bucket>[^/]+)/(?<key>.+)'),
+];
+
+module.exports = (url) => {
+  for (const regex of patterns) {
+    const match = url.match(regex);
+    if (match) {
+      return {
+        Bucket: match.groups.bucket,
+        Key: match.groups.key,
+      };
+    }
+  }
+
+  return null;
+};
diff --git a/lib/plugins/aws/utils/resolveCfImportValue.js b/lib/plugins/aws/utils/resolve-cf-import-value.js
similarity index 81%
rename from lib/plugins/aws/utils/resolveCfImportValue.js
rename to lib/plugins/aws/utils/resolve-cf-import-value.js
index 5e9b7be00cd..78baba0d19e 100644
--- a/lib/plugins/aws/utils/resolveCfImportValue.js
+++ b/lib/plugins/aws/utils/resolve-cf-import-value.js
@@ -2,7 +2,7 @@
 
 const ServerlessError = require('../../../serverless-error');
 
-function resolveCfImportValue(provider, name, sdkParams = {}) {
+async function resolveCfImportValue(provider, name, sdkParams = {}) {
   return provider.request('CloudFormation', 'listExports', sdkParams).then((result) => {
     const targetExportMeta = result.Exports.find((exportMeta) => exportMeta.Name === name);
     if (targetExportMeta) return targetExportMeta.Value;
@@ -11,7 +11,8 @@ function resolveCfImportValue(provider, name, sdkParams = {}) {
     }
 
     throw new ServerlessError(
-      `Could not resolve Fn::ImportValue with name ${name}. Are you sure this value is exported ?`
+      `Could not resolve Fn::ImportValue with name ${name}. Are you sure this value is exported ?`,
+      'CF_IMPORT_RESOLUTION'
     );
   });
 }
diff --git a/lib/plugins/aws/utils/resolveCfRefValue.js b/lib/plugins/aws/utils/resolve-cf-ref-value.js
similarity index 82%
rename from lib/plugins/aws/utils/resolveCfRefValue.js
rename to lib/plugins/aws/utils/resolve-cf-ref-value.js
index 08ef8039e03..ba3de7a43c8 100644
--- a/lib/plugins/aws/utils/resolveCfRefValue.js
+++ b/lib/plugins/aws/utils/resolve-cf-ref-value.js
@@ -2,7 +2,7 @@
 
 const ServerlessError = require('../../../serverless-error');
 
-function resolveCfRefValue(provider, resourceLogicalId, sdkParams = {}) {
+async function resolveCfRefValue(provider, resourceLogicalId, sdkParams = {}) {
   return provider
     .request(
       'CloudFormation',
@@ -19,7 +19,8 @@ function resolveCfRefValue(provider, resourceLogicalId, sdkParams = {}) {
       }
 
       throw new ServerlessError(
-        `Could not resolve Ref with name ${resourceLogicalId}. Are you sure this value matches one resource logical ID ?`
+        `Could not resolve Ref with name ${resourceLogicalId}. Are you sure this value matches one resource logical ID ?`,
+        'CF_REF_RESOLUTION'
       );
     });
 }
diff --git a/lib/plugins/aws/utils/resolveLambdaTarget.js b/lib/plugins/aws/utils/resolve-lambda-target.js
similarity index 100%
rename from lib/plugins/aws/utils/resolveLambdaTarget.js
rename to lib/plugins/aws/utils/resolve-lambda-target.js
diff --git a/lib/plugins/config.js b/lib/plugins/config.js
index 2a4d4529726..f1e11d19176 100644
--- a/lib/plugins/config.js
+++ b/lib/plugins/config.js
@@ -1,18 +1,16 @@
 'use strict';
 
-const BbPromise = require('bluebird');
 const config = require('@serverless/utils/config');
 const ServerlessError = require('../serverless-error');
 const cliCommandsSchema = require('../cli/commands-schema');
-const muteConsoleLog = require('../utils/log/muteConsoleLog');
-const tabtabOptions = require('../utils/tabCompletion/tabtabOptions');
-const isNpmPackageWritable = require('../utils/npmPackage/isWritable');
-const isNpmGlobalPackage = require('../utils/npmPackage/isGlobal');
+const isNpmPackageWritable = require('../utils/npm-package/is-writable');
+const isNpmGlobalPackage = require('../utils/npm-package/is-global');
 const renderCommandHelp = require('../cli/render-help/command');
+const isLocallyInstalled = require('../cli/is-locally-installed');
+const { log } = require('@serverless/utils/log');
 
 // class wide constants
 const validProviders = new Set(['aws']);
-const validShells = new Set(['bash', 'zsh', 'fish']);
 
 // TODO: update to look like the list in the "create" plugin
 // once more than one provider is supported
@@ -41,23 +39,9 @@ class Config {
       },
     };
 
-    this.commands.config.commands.tabcompletion = {
-      type: 'container',
-      commands: {
-        install: {
-          ...cliCommandsSchema.get('config tabcompletion install'),
-        },
-        uninstall: {
-          ...cliCommandsSchema.get('config tabcompletion uninstall'),
-        },
-      },
-    };
-
     this.hooks = {
       'config:config': async () => this.updateConfig(),
       'before:config:credentials:config': () => this.validate(),
-      'config:tabcompletion:install:install': async () => this.tabtabCompletionInstall(),
-      'config:tabcompletion:uninstall:uninstall': async () => this.tabtabCompletionUninstall(),
     };
   }
 
@@ -69,7 +53,7 @@ class Config {
         `Provider "${provider}" is not supported.`,
         ` Supported providers are: ${humanReadableProvidersList}.`,
       ].join('');
-      throw new ServerlessError(errorMessage);
+      throw new ServerlessError(errorMessage, 'INVALID_PROVIDER');
     }
   }
 
@@ -80,96 +64,43 @@ class Config {
     }
     if (this.options.autoupdate) {
       if (config.get('autoUpdate.enabled')) {
-        this.serverless.cli.log('Auto update is already turned on');
+        log.notice.skip('Auto update is already turned on');
         return;
       }
-      if (this.serverless.isLocallyInstalled) {
-        throw new ServerlessError(noSupportErrorMessage);
+      if (isLocallyInstalled) {
+        throw new ServerlessError(noSupportErrorMessage, 'AUTO_UPDATE_NOT_SUPPORTED');
       }
       if (this.serverless.isStandaloneExecutable) {
         if (process.platform === 'win32') {
-          throw new ServerlessError(noSupportErrorMessage);
+          throw new ServerlessError(noSupportErrorMessage, 'AUTO_UPDATE_NOT_SUPPORTED');
         }
       } else {
-        if (!(await isNpmGlobalPackage())) {
-          throw new ServerlessError(noSupportErrorMessage);
+        if (!isNpmGlobalPackage()) {
+          throw new ServerlessError(noSupportErrorMessage, 'AUTO_UPDATE_NOT_SUPPORTED');
         }
-        if (!(await isNpmPackageWritable(this.serverless))) {
+        if (!(await isNpmPackageWritable())) {
           throw new ServerlessError(
-            'Auto update cannot be set, due to missing write access to npm global installation'
+            'Auto update cannot be set, due to missing write access to npm global installation',
+            'AUTO_UPDATE_NOT_SET_MISSING_WRITE_ACCESS'
           );
         }
       }
       config.set('autoUpdate.enabled', true);
 
-      this.serverless.cli.log(
+      log.notice.success(
         'Auto update successfully turned on (Turn off at any time with "serverless config --no-autoupdate")'
       );
     } else {
       if (!config.get('autoUpdate.enabled')) {
-        this.serverless.cli.log('Auto update is already turned off');
+        log.notice.skip('Auto update is already turned off');
         return;
       }
       config.set('autoUpdate.enabled', false);
-      this.serverless.cli.log(
+      log.notice.success(
         'Auto update successfully turned off (Turn on at any time with "serverless config --autoupdate")'
       );
     }
   }
-
-  async tabtabCompletionInstall() {
-    return BbPromise.try(() => {
-      const shell = this.serverless.processedInput.options.shell || 'bash';
-
-      if (!validShells.has(shell)) {
-        throw new ServerlessError(
-          `Shell "${shell}" is not supported. Supported shells: ${Array.from(validShells)}.`
-        );
-      }
-      const location = (() => {
-        if (this.serverless.processedInput.options.location) {
-          return this.serverless.processedInput.options.location;
-        }
-        const { BASH_LOCATION, FISH_LOCATION, ZSH_LOCATION } = require('tabtab/lib/constants');
-        switch (shell) {
-          case 'bash':
-            return BASH_LOCATION;
-          case 'zsh':
-            return ZSH_LOCATION;
-          case 'fish':
-            return FISH_LOCATION;
-          default:
-            throw new Error('Unexpected shell choice');
-        }
-      })();
-      const { install } = require('tabtab/lib/installer');
-      return muteConsoleLog(() =>
-        tabtabOptions.reduce(
-          (previousOperation, options) =>
-            previousOperation.then(() => install(Object.assign({ location }, options))),
-          BbPromise.resolve()
-        )
-      ).then(() =>
-        this.serverless.cli.log(
-          `Tab autocompletion setup for ${shell}. Make sure to reload your SHELL.`
-        )
-      );
-    });
-  }
-
-  async tabtabCompletionUninstall() {
-    return BbPromise.try(() => {
-      const { uninstall } = require('tabtab/lib/installer');
-      return muteConsoleLog(() =>
-        tabtabOptions.reduce(
-          (previousOperation, options) => previousOperation.then(() => uninstall(options)),
-          BbPromise.resolve()
-        )
-      ).then(() =>
-        this.serverless.cli.log('Tab autocompletion uninstalled (for all configured shells).')
-      );
-    });
-  }
 }
 
 module.exports = Config;
diff --git a/lib/plugins/create/create.js b/lib/plugins/create/create.js
index 8cc048d147a..398351fcd9c 100644
--- a/lib/plugins/create/create.js
+++ b/lib/plugins/create/create.js
@@ -7,13 +7,14 @@ const untildify = require('untildify');
 
 const ServerlessError = require('../../serverless-error');
 const cliCommandsSchema = require('../../cli/commands-schema');
-const createFromTemplate = require('../../utils/createFromTemplate');
+const createFromTemplate = require('../../utils/create-from-template');
 const recommendedTemplatesList = require('../../templates/recommended-list');
 const humanReadableTemplatesList = require('../../templates/recommended-list/human-readable');
-const download = require('../../utils/downloadTemplateFromRepo');
-const renameService = require('../../utils/renameService').renameService;
-const copyDirContentsSync = require('../../utils/fs/copyDirContentsSync');
-const dirExistsSync = require('../../utils/fs/dirExistsSync');
+const download = require('../../utils/download-template-from-repo');
+const renameService = require('../../utils/rename-service').renameService;
+const copyDirContentsSync = require('../../utils/fs/copy-dir-contents-sync');
+const dirExistsSync = require('../../utils/fs/dir-exists-sync');
+const { progress, log, style } = require('@serverless/utils/log');
 
 const handleServiceCreationError = (error) => {
   if (error.code !== 'EACCESS') throw error;
@@ -22,9 +23,11 @@ const handleServiceCreationError = (error) => {
     'Please check that you have the required permissions to write to the directory',
   ].join('');
 
-  throw new ServerlessError(errorMessage);
+  throw new ServerlessError(errorMessage, 'UNABLE_TO_CREATE_SERVICE');
 };
 
+const mainProgress = progress.get('main');
+
 class Create {
   constructor(serverless, options) {
     this.serverless = serverless;
@@ -37,16 +40,16 @@ class Create {
     };
 
     this.hooks = {
-      'create:create': () => BbPromise.bind(this).then(this.create),
+      'create:create': async () => BbPromise.bind(this).then(this.create),
     };
   }
 
-  create() {
-    this.serverless.cli.log('Generating boilerplate...');
-
+  async create() {
     if ('template' in this.options) {
       return this.createFromTemplate();
     } else if ('template-url' in this.options) {
+      // We only show progress in case of setup from `template-url` as setting up from local files is fast
+      mainProgress.notice('Setting up new project', { isMainEvent: true });
       return download
         .downloadTemplateFromRepo(
           this.options['template-url'],
@@ -54,19 +57,19 @@ class Create {
           this.options.path
         )
         .then((serviceName) => {
-          const message = [
-            `Successfully installed "${serviceName}" `,
-            `${
-              this.options.name && this.options.name !== serviceName
-                ? `as "${this.options.name}"`
-                : ''
-            }`,
-          ].join('');
-
-          this.serverless.cli.log(message);
+          log.notice();
+          log.notice.success(
+            `Project successfully created in "${
+              this.options.path || `./${serviceName}`
+            }" ${style.aside(
+              `(${Math.floor(
+                (Date.now() - this.serverless.pluginManager.commandRunStartTime) / 1000
+              )}s)`
+            )}`
+          );
         })
         .catch((err) => {
-          throw new ServerlessError(err);
+          throw new ServerlessError(err, 'BOILERPLATE_GENERATION_ERROR');
         });
     } else if ('template-path' in this.options) {
       // Copying template from a local directory
@@ -75,7 +78,7 @@ class Create {
         : path.join(process.cwd(), this.options.name);
       if (dirExistsSync(serviceDir)) {
         const errorMessage = `A folder named "${serviceDir}" already exists.`;
-        throw new ServerlessError(errorMessage);
+        throw new ServerlessError(errorMessage, 'TARGET_FOLDER_ALREADY_EXISTS');
       }
       copyDirContentsSync(untildify(this.options['template-path']), serviceDir, {
         noLinks: true,
@@ -83,17 +86,21 @@ class Create {
       if (this.options.name) {
         renameService(this.options.name, serviceDir);
       }
+      log.notice();
+      log.notice.success(
+        `Project sucessfully created in "${this.options.path || `./${this.options.name}`}"`
+      );
     } else {
       const errorMessage = [
         'You must either pass a template name (--template), ',
         'a URL (--template-url) or a local path (--template-path).',
       ].join('');
-      throw new ServerlessError(errorMessage);
+      throw new ServerlessError(errorMessage, 'MISSING_TEMPLATE_CLI_PARAM');
     }
     return BbPromise.resolve();
   }
 
-  createFromTemplate() {
+  async createFromTemplate() {
     const notPlugin = this.options.template !== 'plugin';
 
     if (!recommendedTemplatesList.includes(this.options.template)) {
@@ -101,7 +108,7 @@ class Create {
         `Template "${this.options.template}" is not supported.`,
         ` Supported templates are: ${humanReadableTemplatesList}.`,
       ].join('');
-      throw new ServerlessError(errorMessage);
+      throw new ServerlessError(errorMessage, 'NOT_SUPPORTED_TEMPLATE');
     }
 
     // store the custom options for the service if given
@@ -125,11 +132,9 @@ class Create {
           'Rename or move the directory and try again if you want serverless to create it"',
         ].join('');
 
-        throw new ServerlessError(errorMessage);
+        throw new ServerlessError(errorMessage, 'TARGET_FOLDER_ALREADY_EXISTS');
       }
 
-      this.serverless.cli.log(`Generating boilerplate in "${newPath}"`);
-
       fse.mkdirsSync(newPath);
       process.chdir(newPath);
     } else {
@@ -144,7 +149,7 @@ class Create {
             `Move the file and try again if you want serverless to write a new "${filename}"`,
           ].join('');
 
-          throw new ServerlessError(errorMessage);
+          throw new ServerlessError(errorMessage, 'TEMPLATE_FILE_ALREADY_EXISTS');
         }
       });
     }
@@ -166,14 +171,19 @@ class Create {
 
     return createFromTemplate(this.options.template, process.cwd(), { name: serviceName }).then(
       () => {
-        this.serverless.cli.asciiGreeting();
-        this.serverless.cli.log(
-          `Successfully generated boilerplate for template: "${this.options.template}"`
+        log.notice();
+        log.notice.success(
+          `Project sucessfully created in "${this.options.path || './'}" from "${
+            this.options.template
+          }" template`
         );
 
         if (!(boilerplatePath || serviceName) && notPlugin) {
-          this.serverless.cli.log(
-            'NOTE: Please update the "service" property in serverless.yml with your service name'
+          log.notice();
+          log.notice(
+            style.aside(
+              'Please update the "service" property in serverless.yml with your service name'
+            )
           );
         }
       },
diff --git a/lib/plugins/create/templates/aliyun-nodejs/serverless.yml b/lib/plugins/create/templates/aliyun-nodejs/serverless.yml
index 1f6e61f6c23..f4c2a9f0477 100644
--- a/lib/plugins/create/templates/aliyun-nodejs/serverless.yml
+++ b/lib/plugins/create/templates/aliyun-nodejs/serverless.yml
@@ -11,7 +11,7 @@
 
 service: aliyun-nodejs
 
-frameworkVersion: '2'
+frameworkVersion: '3'
 
 provider:
   name: aliyun
diff --git a/lib/plugins/create/templates/aws-alexa-typescript/serverless.yml b/lib/plugins/create/templates/aws-alexa-typescript/serverless.yml
index 9f6b529bda6..f374b0e9374 100644
--- a/lib/plugins/create/templates/aws-alexa-typescript/serverless.yml
+++ b/lib/plugins/create/templates/aws-alexa-typescript/serverless.yml
@@ -4,7 +4,7 @@ service: aws-alexa-typescript # NOTE: update this with your service name
 #app: your-app-name
 #org: your-org-name
 
-frameworkVersion: '2'
+frameworkVersion: '3'
 
 plugins:
   - serverless-webpack
@@ -13,7 +13,6 @@ plugins:
 provider:
   name: aws
   runtime: nodejs12.x
-  lambdaHashingVersion: 20201221
 
 custom:
   alexa:
diff --git a/lib/plugins/create/templates/aws-clojure-gradle/serverless.yml b/lib/plugins/create/templates/aws-clojure-gradle/serverless.yml
index 424f7f541b9..35be126645b 100644
--- a/lib/plugins/create/templates/aws-clojure-gradle/serverless.yml
+++ b/lib/plugins/create/templates/aws-clojure-gradle/serverless.yml
@@ -19,7 +19,7 @@ service: aws-clojure
 
 # You can pin your service to only deploy with a specific Serverless version
 # Check out our docs for more details
-frameworkVersion: '2'
+frameworkVersion: '3'
 
 provider:
   name: aws
@@ -27,27 +27,28 @@ provider:
   timeout: 300
   memorySize: 1536
   logRetentionInDays: 30
-  lambdaHashingVersion: 20201221
 
 # you can overwrite defaults here
 #  stage: dev
 #  region: us-east-1
 
 # you can add statements to the Lambda function's IAM Role here
-#  iamRoleStatements:
-#    - Effect: "Allow"
-#      Action:
-#        - "s3:ListBucket"
-#      Resource: { "Fn::Join" : ["", ["arn:aws:s3:::", { "Ref" : "ServerlessDeploymentBucket" } ] ]  }
-#    - Effect: "Allow"
-#      Action:
-#        - "s3:PutObject"
-#      Resource:
-#        Fn::Join:
-#          - ""
-#          - - "arn:aws:s3:::"
-#            - "Ref" : "ServerlessDeploymentBucket"
-#            - "/*"
+#  iam:
+#    role:
+#      statements:
+#        - Effect: "Allow"
+#          Action:
+#            - "s3:ListBucket"
+#          Resource: { "Fn::Join" : ["", ["arn:aws:s3:::", { "Ref" : "ServerlessDeploymentBucket" } ] ]  }
+#        - Effect: "Allow"
+#          Action:
+#            - "s3:PutObject"
+#          Resource:
+#            Fn::Join:
+#              - ""
+#              - - "arn:aws:s3:::"
+#                - "Ref" : "ServerlessDeploymentBucket"
+#                - "/*"
 
 # you can define service wide environment variables here
 #  environment:
diff --git a/lib/plugins/create/templates/aws-clojurescript-gradle/serverless.yml b/lib/plugins/create/templates/aws-clojurescript-gradle/serverless.yml
index 1583f3f660a..2f8d059037d 100644
--- a/lib/plugins/create/templates/aws-clojurescript-gradle/serverless.yml
+++ b/lib/plugins/create/templates/aws-clojurescript-gradle/serverless.yml
@@ -18,32 +18,33 @@ service: aws-clojurescript-gradle
 
 # You can pin your service to only deploy with a specific Serverless version
 # Check out our docs for more details
-frameworkVersion: '2'
+frameworkVersion: '3'
 
 provider:
   name: aws
   runtime: nodejs12.x
-  lambdaHashingVersion: 20201221
 
 # you can overwrite defaults here
 #  stage: dev
 #  region: us-east-1
 
 # you can add statements to the Lambda function's IAM Role here
-#  iamRoleStatements:
-#    - Effect: "Allow"
-#      Action:
-#        - "s3:ListBucket"
-#      Resource: { "Fn::Join" : ["", ["arn:aws:s3:::", { "Ref" : "ServerlessDeploymentBucket" } ] ]  }
-#    - Effect: "Allow"
-#      Action:
-#        - "s3:PutObject"
-#      Resource:
-#        Fn::Join:
-#          - ""
-#          - - "arn:aws:s3:::"
-#            - "Ref" : "ServerlessDeploymentBucket"
-#            - "/*"
+#  iam:
+#    role:
+#      statements:
+#        - Effect: "Allow"
+#          Action:
+#            - "s3:ListBucket"
+#          Resource: { "Fn::Join" : ["", ["arn:aws:s3:::", { "Ref" : "ServerlessDeploymentBucket" } ] ]  }
+#        - Effect: "Allow"
+#          Action:
+#            - "s3:PutObject"
+#          Resource:
+#            Fn::Join:
+#              - ""
+#              - - "arn:aws:s3:::"
+#                - "Ref" : "ServerlessDeploymentBucket"
+#                - "/*"
 
 # you can define service wide environment variables here
 #  environment:
diff --git a/lib/plugins/create/templates/aws-csharp/serverless.yml b/lib/plugins/create/templates/aws-csharp/serverless.yml
index 90e86a50b82..3eeec6bff50 100644
--- a/lib/plugins/create/templates/aws-csharp/serverless.yml
+++ b/lib/plugins/create/templates/aws-csharp/serverless.yml
@@ -18,32 +18,33 @@ service: aws-csharp # NOTE: update this with your service name
 
 # You can pin your service to only deploy with a specific Serverless version
 # Check out our docs for more details
-frameworkVersion: '2'
+frameworkVersion: '3'
 
 provider:
   name: aws
   runtime: dotnetcore3.1
-  lambdaHashingVersion: 20201221
 
 # you can overwrite defaults here
 #  stage: dev
 #  region: us-east-1
 
 # you can add statements to the Lambda function's IAM Role here
-#  iamRoleStatements:
-#    - Effect: "Allow"
-#      Action:
-#        - "s3:ListBucket"
-#      Resource: { "Fn::Join" : ["", ["arn:aws:s3:::", { "Ref" : "ServerlessDeploymentBucket" } ] ]  }
-#    - Effect: "Allow"
-#      Action:
-#        - "s3:PutObject"
-#      Resource:
-#        Fn::Join:
-#          - ""
-#          - - "arn:aws:s3:::"
-#            - "Ref" : "ServerlessDeploymentBucket"
-#            - "/*"
+#  iam:
+#    role:
+#      statements:
+#        - Effect: "Allow"
+#          Action:
+#            - "s3:ListBucket"
+#          Resource: { "Fn::Join" : ["", ["arn:aws:s3:::", { "Ref" : "ServerlessDeploymentBucket" } ] ]  }
+#        - Effect: "Allow"
+#          Action:
+#            - "s3:PutObject"
+#          Resource:
+#            Fn::Join:
+#              - ""
+#              - - "arn:aws:s3:::"
+#                - "Ref" : "ServerlessDeploymentBucket"
+#                - "/*"
 
 # you can define service wide environment variables here
 #  environment:
diff --git a/lib/plugins/create/templates/aws-fsharp/serverless.yml b/lib/plugins/create/templates/aws-fsharp/serverless.yml
index 328c3f6a1b3..2e946dc400f 100644
--- a/lib/plugins/create/templates/aws-fsharp/serverless.yml
+++ b/lib/plugins/create/templates/aws-fsharp/serverless.yml
@@ -18,32 +18,33 @@ service: aws-fsharp # NOTE: update this with your service name
 
 # You can pin your service to only deploy with a specific Serverless version
 # Check out our docs for more details
-frameworkVersion: '2'
+frameworkVersion: '3'
 
 provider:
   name: aws
   runtime: dotnetcore3.1
-  lambdaHashingVersion: 20201221
 
 # you can overwrite defaults here
 #  stage: dev
 #  region: us-east-1
 
 # you can add statements to the Lambda function's IAM Role here
-#  iamRoleStatements:
-#    - Effect: "Allow"
-#      Action:
-#        - "s3:ListBucket"
-#      Resource: { "Fn::Join" : ["", ["arn:aws:s3:::", { "Ref" : "ServerlessDeploymentBucket" } ] ]  }
-#    - Effect: "Allow"
-#      Action:
-#        - "s3:PutObject"
-#      Resource:
-#        Fn::Join:
-#          - ""
-#          - - "arn:aws:s3:::"
-#            - "Ref" : "ServerlessDeploymentBucket"
-#            - "/*"
+#  iam:
+#    role:
+#      statements:
+#        - Effect: "Allow"
+#          Action:
+#            - "s3:ListBucket"
+#          Resource: { "Fn::Join" : ["", ["arn:aws:s3:::", { "Ref" : "ServerlessDeploymentBucket" } ] ]  }
+#        - Effect: "Allow"
+#          Action:
+#            - "s3:PutObject"
+#          Resource:
+#            Fn::Join:
+#              - ""
+#              - - "arn:aws:s3:::"
+#                - "Ref" : "ServerlessDeploymentBucket"
+#                - "/*"
 
 # you can define service wide environment variables here
 #  environment:
diff --git a/lib/plugins/create/templates/aws-go-dep/Makefile b/lib/plugins/create/templates/aws-go-dep/Makefile
index e1a16281c80..d3556a5464e 100644
--- a/lib/plugins/create/templates/aws-go-dep/Makefile
+++ b/lib/plugins/create/templates/aws-go-dep/Makefile
@@ -2,8 +2,8 @@
 
 build:
 	dep ensure -v
-	env GOOS=linux go build -ldflags="-s -w" -o bin/hello hello/main.go
-	env GOOS=linux go build -ldflags="-s -w" -o bin/world world/main.go
+	env GOARCH=amd64 GOOS=linux go build -ldflags="-s -w" -o bin/hello hello/main.go
+	env GOARCH=amd64 GOOS=linux go build -ldflags="-s -w" -o bin/world world/main.go
 
 clean:
 	rm -rf ./bin ./vendor Gopkg.lock
diff --git a/lib/plugins/create/templates/aws-go-dep/serverless.yml b/lib/plugins/create/templates/aws-go-dep/serverless.yml
index 3240ae7003c..154b5293848 100644
--- a/lib/plugins/create/templates/aws-go-dep/serverless.yml
+++ b/lib/plugins/create/templates/aws-go-dep/serverless.yml
@@ -18,32 +18,33 @@ service: aws-go-dep # NOTE: update this with your service name
 
 # You can pin your service to only deploy with a specific Serverless version
 # Check out our docs for more details
-frameworkVersion: '2'
+frameworkVersion: '3'
 
 provider:
   name: aws
   runtime: go1.x
-  lambdaHashingVersion: 20201221
 
 # you can overwrite defaults here
 #  stage: dev
 #  region: us-east-1
 
 # you can add statements to the Lambda function's IAM Role here
-#  iamRoleStatements:
-#    - Effect: "Allow"
-#      Action:
-#        - "s3:ListBucket"
-#      Resource: { "Fn::Join" : ["", ["arn:aws:s3:::", { "Ref" : "ServerlessDeploymentBucket" } ] ]  }
-#    - Effect: "Allow"
-#      Action:
-#        - "s3:PutObject"
-#      Resource:
-#        Fn::Join:
-#          - ""
-#          - - "arn:aws:s3:::"
-#            - "Ref" : "ServerlessDeploymentBucket"
-#            - "/*"
+#  iam:
+#    role:
+#      statements:
+#        - Effect: "Allow"
+#          Action:
+#            - "s3:ListBucket"
+#          Resource: { "Fn::Join" : ["", ["arn:aws:s3:::", { "Ref" : "ServerlessDeploymentBucket" } ] ]  }
+#        - Effect: "Allow"
+#          Action:
+#            - "s3:PutObject"
+#          Resource:
+#            Fn::Join:
+#              - ""
+#              - - "arn:aws:s3:::"
+#                - "Ref" : "ServerlessDeploymentBucket"
+#                - "/*"
 
 # you can define service wide environment variables here
 #  environment:
diff --git a/lib/plugins/create/templates/aws-go-mod/Makefile b/lib/plugins/create/templates/aws-go-mod/Makefile
index 9622e9b36fd..c18bb3b47d3 100644
--- a/lib/plugins/create/templates/aws-go-mod/Makefile
+++ b/lib/plugins/create/templates/aws-go-mod/Makefile
@@ -2,8 +2,8 @@
 
 build: gomodgen
 	export GO111MODULE=on
-	env GOOS=linux go build -ldflags="-s -w" -o bin/hello hello/main.go
-	env GOOS=linux go build -ldflags="-s -w" -o bin/world world/main.go
+	env GOARCH=amd64 GOOS=linux go build -ldflags="-s -w" -o bin/hello hello/main.go
+	env GOARCH=amd64 GOOS=linux go build -ldflags="-s -w" -o bin/world world/main.go
 
 clean:
 	rm -rf ./bin ./vendor go.sum
diff --git a/lib/plugins/create/templates/aws-go-mod/serverless.yml b/lib/plugins/create/templates/aws-go-mod/serverless.yml
index f7543659758..da2d0d82b8b 100644
--- a/lib/plugins/create/templates/aws-go-mod/serverless.yml
+++ b/lib/plugins/create/templates/aws-go-mod/serverless.yml
@@ -18,32 +18,33 @@ service: aws-go-mod # NOTE: update this with your service name
 
 # You can pin your service to only deploy with a specific Serverless version
 # Check out our docs for more details
-frameworkVersion: '2'
+frameworkVersion: '3'
 
 provider:
   name: aws
   runtime: go1.x
-  lambdaHashingVersion: 20201221
 
 # you can overwrite defaults here
 #  stage: dev
 #  region: us-east-1
 
 # you can add statements to the Lambda function's IAM Role here
-#  iamRoleStatements:
-#    - Effect: "Allow"
-#      Action:
-#        - "s3:ListBucket"
-#      Resource: { "Fn::Join" : ["", ["arn:aws:s3:::", { "Ref" : "ServerlessDeploymentBucket" } ] ]  }
-#    - Effect: "Allow"
-#      Action:
-#        - "s3:PutObject"
-#      Resource:
-#        Fn::Join:
-#          - ""
-#          - - "arn:aws:s3:::"
-#            - "Ref" : "ServerlessDeploymentBucket"
-#            - "/*"
+#  iam:
+#    role:
+#      statements:
+#        - Effect: "Allow"
+#          Action:
+#            - "s3:ListBucket"
+#          Resource: { "Fn::Join" : ["", ["arn:aws:s3:::", { "Ref" : "ServerlessDeploymentBucket" } ] ]  }
+#        - Effect: "Allow"
+#          Action:
+#            - "s3:PutObject"
+#          Resource:
+#            Fn::Join:
+#              - ""
+#              - - "arn:aws:s3:::"
+#                - "Ref" : "ServerlessDeploymentBucket"
+#                - "/*"
 
 # you can define service wide environment variables here
 #  environment:
diff --git a/lib/plugins/create/templates/aws-go/Makefile b/lib/plugins/create/templates/aws-go/Makefile
index 3623a7971be..96f31068d4d 100644
--- a/lib/plugins/create/templates/aws-go/Makefile
+++ b/lib/plugins/create/templates/aws-go/Makefile
@@ -1,8 +1,8 @@
 .PHONY: build clean deploy
 
 build:
-	env GOOS=linux go build -ldflags="-s -w" -o bin/hello hello/main.go
-	env GOOS=linux go build -ldflags="-s -w" -o bin/world world/main.go
+	env GOARCH=amd64 GOOS=linux go build -ldflags="-s -w" -o bin/hello hello/main.go
+	env GOARCH=amd64 GOOS=linux go build -ldflags="-s -w" -o bin/world world/main.go
 
 clean:
 	rm -rf ./bin
diff --git a/lib/plugins/create/templates/aws-go/serverless.yml b/lib/plugins/create/templates/aws-go/serverless.yml
index 83e7197200e..5ca39c85e9e 100644
--- a/lib/plugins/create/templates/aws-go/serverless.yml
+++ b/lib/plugins/create/templates/aws-go/serverless.yml
@@ -18,32 +18,33 @@ service: aws-go # NOTE: update this with your service name
 
 # You can pin your service to only deploy with a specific Serverless version
 # Check out our docs for more details
-frameworkVersion: '2'
+frameworkVersion: '3'
 
 provider:
   name: aws
   runtime: go1.x
-  lambdaHashingVersion: 20201221
 
 # you can overwrite defaults here
 #  stage: dev
 #  region: us-east-1
 
 # you can add statements to the Lambda function's IAM Role here
-#  iamRoleStatements:
-#    - Effect: "Allow"
-#      Action:
-#        - "s3:ListBucket"
-#      Resource: { "Fn::Join" : ["", ["arn:aws:s3:::", { "Ref" : "ServerlessDeploymentBucket" } ] ]  }
-#    - Effect: "Allow"
-#      Action:
-#        - "s3:PutObject"
-#      Resource:
-#        Fn::Join:
-#          - ""
-#          - - "arn:aws:s3:::"
-#            - "Ref" : "ServerlessDeploymentBucket"
-#            - "/*"
+#  iam:
+#    role:
+#      statements:
+#        - Effect: "Allow"
+#          Action:
+#            - "s3:ListBucket"
+#          Resource: { "Fn::Join" : ["", ["arn:aws:s3:::", { "Ref" : "ServerlessDeploymentBucket" } ] ]  }
+#        - Effect: "Allow"
+#          Action:
+#            - "s3:PutObject"
+#          Resource:
+#            Fn::Join:
+#              - ""
+#              - - "arn:aws:s3:::"
+#                - "Ref" : "ServerlessDeploymentBucket"
+#                - "/*"
 
 # you can define service wide environment variables here
 #  environment:
diff --git a/lib/plugins/create/templates/aws-groovy-gradle/serverless.yml b/lib/plugins/create/templates/aws-groovy-gradle/serverless.yml
index 181e27f9194..8693ab18396 100644
--- a/lib/plugins/create/templates/aws-groovy-gradle/serverless.yml
+++ b/lib/plugins/create/templates/aws-groovy-gradle/serverless.yml
@@ -18,32 +18,33 @@ service: aws-groovy-gradle # NOTE: update this with your service name
 
 # You can pin your service to only deploy with a specific Serverless version
 # Check out our docs for more details
-frameworkVersion: '2'
+frameworkVersion: '3'
 
 provider:
   name: aws
   runtime: java8
-  lambdaHashingVersion: 20201221
 
 # you can overwrite defaults here
 #  stage: dev
 #  region: us-east-1
 
 # you can add statements to the Lambda function's IAM Role here
-#  iamRoleStatements:
-#    - Effect: "Allow"
-#      Action:
-#        - "s3:ListBucket"
-#      Resource: { "Fn::Join" : ["", ["arn:aws:s3:::", { "Ref" : "ServerlessDeploymentBucket" } ] ]  }
-#    - Effect: "Allow"
-#      Action:
-#        - "s3:PutObject"
-#      Resource:
-#        Fn::Join:
-#          - ""
-#          - - "arn:aws:s3:::"
-#            - "Ref" : "ServerlessDeploymentBucket"
-#            - "/*"
+#  iam:
+#    role:
+#      statements:
+#        - Effect: "Allow"
+#          Action:
+#            - "s3:ListBucket"
+#          Resource: { "Fn::Join" : ["", ["arn:aws:s3:::", { "Ref" : "ServerlessDeploymentBucket" } ] ]  }
+#        - Effect: "Allow"
+#          Action:
+#            - "s3:PutObject"
+#          Resource:
+#            Fn::Join:
+#              - ""
+#              - - "arn:aws:s3:::"
+#                - "Ref" : "ServerlessDeploymentBucket"
+#                - "/*"
 
 # you can define service wide environment variables here
 #  environment:
diff --git a/lib/plugins/create/templates/aws-java-gradle/serverless.yml b/lib/plugins/create/templates/aws-java-gradle/serverless.yml
index 63c5c79eb73..c1183c8ea26 100644
--- a/lib/plugins/create/templates/aws-java-gradle/serverless.yml
+++ b/lib/plugins/create/templates/aws-java-gradle/serverless.yml
@@ -18,32 +18,33 @@ service: aws-java-gradle # NOTE: update this with your service name
 
 # You can pin your service to only deploy with a specific Serverless version
 # Check out our docs for more details
-frameworkVersion: '2'
+frameworkVersion: '3'
 
 provider:
   name: aws
   runtime: java8
-  lambdaHashingVersion: 20201221
 
 # you can overwrite defaults here
 #  stage: dev
 #  region: us-east-1
 
 # you can add statements to the Lambda function's IAM Role here
-#  iamRoleStatements:
-#    - Effect: "Allow"
-#      Action:
-#        - "s3:ListBucket"
-#      Resource: { "Fn::Join" : ["", ["arn:aws:s3:::", { "Ref" : "ServerlessDeploymentBucket" } ] ]  }
-#    - Effect: "Allow"
-#      Action:
-#        - "s3:PutObject"
-#      Resource:
-#        Fn::Join:
-#          - ""
-#          - - "arn:aws:s3:::"
-#            - "Ref" : "ServerlessDeploymentBucket"
-#            - "/*"
+#  iam:
+#    role:
+#      statements:
+#        - Effect: "Allow"
+#          Action:
+#            - "s3:ListBucket"
+#          Resource: { "Fn::Join" : ["", ["arn:aws:s3:::", { "Ref" : "ServerlessDeploymentBucket" } ] ]  }
+#        - Effect: "Allow"
+#          Action:
+#            - "s3:PutObject"
+#          Resource:
+#            Fn::Join:
+#              - ""
+#              - - "arn:aws:s3:::"
+#                - "Ref" : "ServerlessDeploymentBucket"
+#                - "/*"
 
 # you can define service wide environment variables here
 #  environment:
diff --git a/lib/plugins/create/templates/aws-java-maven/pom.xml b/lib/plugins/create/templates/aws-java-maven/pom.xml
index 3f3bff61fb8..4970bb7a044 100644
--- a/lib/plugins/create/templates/aws-java-maven/pom.xml
+++ b/lib/plugins/create/templates/aws-java-maven/pom.xml
@@ -17,32 +17,32 @@
     <dependency>
       <groupId>com.amazonaws</groupId>
       <artifactId>aws-lambda-java-log4j2</artifactId>
-      <version>1.1.0</version>
+      <version>1.5.0</version>
     </dependency>
     <dependency>
       <groupId>org.apache.logging.log4j</groupId>
       <artifactId>log4j-core</artifactId>
-      <version>2.8.2</version>
+      <version>2.17.1</version>
     </dependency>
     <dependency>
       <groupId>org.apache.logging.log4j</groupId>
       <artifactId>log4j-api</artifactId>
-      <version>2.8.2</version>
+      <version>2.17.1</version>
     </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-core</artifactId>
-      <version>2.9.10</version>
+      <version>2.11.0</version>
     </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-databind</artifactId>
-      <version>2.9.10</version>
+      <version>2.11.0</version>
     </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-annotations</artifactId>
-      <version>2.9.10</version>
+      <version>2.11.0</version>
     </dependency>
   </dependencies>
 
diff --git a/lib/plugins/create/templates/aws-java-maven/serverless.yml b/lib/plugins/create/templates/aws-java-maven/serverless.yml
index 5d03bc65e55..5878ea50ff7 100644
--- a/lib/plugins/create/templates/aws-java-maven/serverless.yml
+++ b/lib/plugins/create/templates/aws-java-maven/serverless.yml
@@ -18,32 +18,33 @@ service: aws-java-maven # NOTE: update this with your service name
 
 # You can pin your service to only deploy with a specific Serverless version
 # Check out our docs for more details
-frameworkVersion: '2'
+frameworkVersion: '3'
 
 provider:
   name: aws
   runtime: java8
-  lambdaHashingVersion: 20201221
 
 # you can overwrite defaults here
 #  stage: dev
 #  region: us-east-1
 
 # you can add statements to the Lambda function's IAM Role here
-#  iamRoleStatements:
-#    - Effect: "Allow"
-#      Action:
-#        - "s3:ListBucket"
-#      Resource: { "Fn::Join" : ["", ["arn:aws:s3:::", { "Ref" : "ServerlessDeploymentBucket" } ] ]  }
-#    - Effect: "Allow"
-#      Action:
-#        - "s3:PutObject"
-#      Resource:
-#        Fn::Join:
-#          - ""
-#          - - "arn:aws:s3:::"
-#            - "Ref" : "ServerlessDeploymentBucket"
-#            - "/*"
+#  iam:
+#    role:
+#      statements:
+#        - Effect: "Allow"
+#          Action:
+#            - "s3:ListBucket"
+#          Resource: { "Fn::Join" : ["", ["arn:aws:s3:::", { "Ref" : "ServerlessDeploymentBucket" } ] ]  }
+#        - Effect: "Allow"
+#          Action:
+#            - "s3:PutObject"
+#          Resource:
+#            Fn::Join:
+#              - ""
+#              - - "arn:aws:s3:::"
+#                - "Ref" : "ServerlessDeploymentBucket"
+#                - "/*"
 
 # you can define service wide environment variables here
 #  environment:
diff --git a/lib/plugins/create/templates/aws-kotlin-jvm-gradle-kts/build.gradle.kts b/lib/plugins/create/templates/aws-kotlin-jvm-gradle-kts/build.gradle.kts
index 63e6ef2e0b1..71e0cf981e5 100644
--- a/lib/plugins/create/templates/aws-kotlin-jvm-gradle-kts/build.gradle.kts
+++ b/lib/plugins/create/templates/aws-kotlin-jvm-gradle-kts/build.gradle.kts
@@ -38,7 +38,7 @@ repositories {
 dependencies {
     api("org.jetbrains.kotlin:kotlin-stdlib:1.3.71")
     api("com.amazonaws:aws-lambda-java-core:1.2.1")
-    api("com.amazonaws:aws-lambda-java-log4j2:1.2.0")
+    api("com.amazonaws:aws-lambda-java-log4j2:1.5.1")
     api("org.slf4j:slf4j-simple:1.7.30")
     api("com.fasterxml.jackson.core:jackson-core:2.11.0")
     api("com.fasterxml.jackson.core:jackson-databind:2.11.0")
diff --git a/lib/plugins/create/templates/aws-kotlin-jvm-gradle-kts/serverless.yml b/lib/plugins/create/templates/aws-kotlin-jvm-gradle-kts/serverless.yml
index 2775ade568e..39316daa66b 100644
--- a/lib/plugins/create/templates/aws-kotlin-jvm-gradle-kts/serverless.yml
+++ b/lib/plugins/create/templates/aws-kotlin-jvm-gradle-kts/serverless.yml
@@ -18,32 +18,33 @@ service: aws-kotlin-jvm-gradle # NOTE: update this with your service name
 
 # You can pin your service to only deploy with a specific Serverless version
 # Check out our docs for more details
-frameworkVersion: '2'
+frameworkVersion: '3'
 
 provider:
   name: aws
   runtime: java8
-  lambdaHashingVersion: 20201221
 
 # you can overwrite defaults here
 #  stage: dev
 #  region: us-east-1
 
 # you can add statements to the Lambda function's IAM Role here
-#  iamRoleStatements:
-#    - Effect: "Allow"
-#      Action:
-#        - "s3:ListBucket"
-#      Resource: { "Fn::Join" : ["", ["arn:aws:s3:::", { "Ref" : "ServerlessDeploymentBucket" } ] ]  }
-#    - Effect: "Allow"
-#      Action:
-#        - "s3:PutObject"
-#      Resource:
-#        Fn::Join:
-#          - ""
-#          - - "arn:aws:s3:::"
-#            - "Ref" : "ServerlessDeploymentBucket"
-#            - "/*"
+#  iam:
+#    role:
+#      statements:
+#        - Effect: "Allow"
+#          Action:
+#            - "s3:ListBucket"
+#          Resource: { "Fn::Join" : ["", ["arn:aws:s3:::", { "Ref" : "ServerlessDeploymentBucket" } ] ]  }
+#        - Effect: "Allow"
+#          Action:
+#            - "s3:PutObject"
+#          Resource:
+#            Fn::Join:
+#              - ""
+#              - - "arn:aws:s3:::"
+#                - "Ref" : "ServerlessDeploymentBucket"
+#                - "/*"
 
 # you can define service wide environment variables here
 #  environment:
diff --git a/lib/plugins/create/templates/aws-kotlin-jvm-gradle/build.gradle b/lib/plugins/create/templates/aws-kotlin-jvm-gradle/build.gradle
index b090c59c2c4..f105c694a1a 100644
--- a/lib/plugins/create/templates/aws-kotlin-jvm-gradle/build.gradle
+++ b/lib/plugins/create/templates/aws-kotlin-jvm-gradle/build.gradle
@@ -35,9 +35,9 @@ dependencies {
   api (
       'org.jetbrains.kotlin:kotlin-stdlib:1.3.72',
       'com.amazonaws:aws-lambda-java-core:1.2.1',
-      'com.amazonaws:aws-lambda-java-log4j2:1.2.0',
-      'org.apache.logging.log4j:log4j-api:2.13.3',
-      'org.apache.logging.log4j:log4j-core:2.13.3',
+      'com.amazonaws:aws-lambda-java-log4j2:1.5.1',
+      'org.apache.logging.log4j:log4j-api:2.17.1',
+      'org.apache.logging.log4j:log4j-core:2.17.1',
       'com.fasterxml.jackson.core:jackson-core:2.11.0',
       'com.fasterxml.jackson.core:jackson-databind:2.11.0',
       'com.fasterxml.jackson.core:jackson-annotations:2.11.0'
diff --git a/lib/plugins/create/templates/aws-kotlin-jvm-gradle/serverless.yml b/lib/plugins/create/templates/aws-kotlin-jvm-gradle/serverless.yml
index cecb2f57ee5..7f357662082 100644
--- a/lib/plugins/create/templates/aws-kotlin-jvm-gradle/serverless.yml
+++ b/lib/plugins/create/templates/aws-kotlin-jvm-gradle/serverless.yml
@@ -18,32 +18,33 @@ service: aws-kotlin-jvm-gradle # NOTE: update this with your service name
 
 # You can pin your service to only deploy with a specific Serverless version
 # Check out our docs for more details
-frameworkVersion: '2'
+frameworkVersion: '3'
 
 provider:
   name: aws
   runtime: java11
-  lambdaHashingVersion: 20201221
 
 # you can overwrite defaults here
 #  stage: dev
 #  region: us-east-1
 
 # you can add statements to the Lambda function's IAM Role here
-#  iamRoleStatements:
-#    - Effect: "Allow"
-#      Action:
-#        - "s3:ListBucket"
-#      Resource: { "Fn::Join" : ["", ["arn:aws:s3:::", { "Ref" : "ServerlessDeploymentBucket" } ] ]  }
-#    - Effect: "Allow"
-#      Action:
-#        - "s3:PutObject"
-#      Resource:
-#        Fn::Join:
-#          - ""
-#          - - "arn:aws:s3:::"
-#            - "Ref" : "ServerlessDeploymentBucket"
-#            - "/*"
+#  iam:
+#    role:
+#      statements:
+#        - Effect: "Allow"
+#          Action:
+#            - "s3:ListBucket"
+#          Resource: { "Fn::Join" : ["", ["arn:aws:s3:::", { "Ref" : "ServerlessDeploymentBucket" } ] ]  }
+#        - Effect: "Allow"
+#          Action:
+#            - "s3:PutObject"
+#          Resource:
+#            Fn::Join:
+#              - ""
+#              - - "arn:aws:s3:::"
+#                - "Ref" : "ServerlessDeploymentBucket"
+#                - "/*"
 
 # you can define service wide environment variables here
 #  environment:
diff --git a/lib/plugins/create/templates/aws-kotlin-jvm-maven/pom.xml b/lib/plugins/create/templates/aws-kotlin-jvm-maven/pom.xml
index 534ccf6a87e..213fac1329e 100644
--- a/lib/plugins/create/templates/aws-kotlin-jvm-maven/pom.xml
+++ b/lib/plugins/create/templates/aws-kotlin-jvm-maven/pom.xml
@@ -20,7 +20,7 @@
             <dependency>
                 <groupId>com.fasterxml.jackson</groupId>
                 <artifactId>jackson-bom</artifactId>
-                <version>2.9.10</version>
+                <version>2.11.0</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>
@@ -41,37 +41,37 @@
         <dependency>
             <groupId>com.amazonaws</groupId>
             <artifactId>aws-lambda-java-log4j2</artifactId>
-            <version>1.1.0</version>
+            <version>1.5.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-core</artifactId>
-            <version>2.11.1</version>
+            <version>2.17.1</version>
         </dependency>
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-api</artifactId>
-            <version>2.11.1</version>
+            <version>2.17.1</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-core</artifactId>
-            <version>2.9.10</version>
+            <version>2.11.0</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
-            <version>2.9.10</version>
+            <version>2.11.0</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-annotations</artifactId>
-            <version>2.9.10</version>
+            <version>2.11.0</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.module</groupId>
             <artifactId>jackson-module-kotlin</artifactId>
-            <version>2.9.10</version>
+            <version>2.11.0</version>
         </dependency>
     </dependencies>
 
diff --git a/lib/plugins/create/templates/aws-kotlin-jvm-maven/serverless.yml b/lib/plugins/create/templates/aws-kotlin-jvm-maven/serverless.yml
index e41c9bff261..b25ed8bf613 100644
--- a/lib/plugins/create/templates/aws-kotlin-jvm-maven/serverless.yml
+++ b/lib/plugins/create/templates/aws-kotlin-jvm-maven/serverless.yml
@@ -18,32 +18,33 @@ service: aws-kotlin-jvm-maven # NOTE: update this with your service name
 
 # You can pin your service to only deploy with a specific Serverless version
 # Check out our docs for more details
-frameworkVersion: '2'
+frameworkVersion: '3'
 
 provider:
   name: aws
   runtime: java8
-  lambdaHashingVersion: 20201221
 
 # you can overwrite defaults here
 #  stage: dev
 #  region: us-east-1
 
 # you can add statements to the Lambda function's IAM Role here
-#  iamRoleStatements:
-#    - Effect: "Allow"
-#      Action:
-#        - "s3:ListBucket"
-#      Resource: { "Fn::Join" : ["", ["arn:aws:s3:::", { "Ref" : "ServerlessDeploymentBucket" } ] ]  }
-#    - Effect: "Allow"
-#      Action:
-#        - "s3:PutObject"
-#      Resource:
-#        Fn::Join:
-#          - ""
-#          - - "arn:aws:s3:::"
-#            - "Ref" : "ServerlessDeploymentBucket"
-#            - "/*"
+#  iam:
+#    role:
+#      statements:
+#        - Effect: "Allow"
+#          Action:
+#            - "s3:ListBucket"
+#          Resource: { "Fn::Join" : ["", ["arn:aws:s3:::", { "Ref" : "ServerlessDeploymentBucket" } ] ]  }
+#        - Effect: "Allow"
+#          Action:
+#            - "s3:PutObject"
+#          Resource:
+#            Fn::Join:
+#              - ""
+#              - - "arn:aws:s3:::"
+#                - "Ref" : "ServerlessDeploymentBucket"
+#                - "/*"
 
 # you can define service wide environment variables here
 #  environment:
diff --git a/lib/plugins/create/templates/aws-kotlin-nodejs-gradle/serverless.yml b/lib/plugins/create/templates/aws-kotlin-nodejs-gradle/serverless.yml
index a6b7ea71822..67787db0a70 100644
--- a/lib/plugins/create/templates/aws-kotlin-nodejs-gradle/serverless.yml
+++ b/lib/plugins/create/templates/aws-kotlin-nodejs-gradle/serverless.yml
@@ -18,32 +18,33 @@ service: aws-kotlin-nodejs-gradle # NOTE: update this with your service name
 
 # You can pin your service to only deploy with a specific Serverless version
 # Check out our docs for more details
-frameworkVersion: '2'
+frameworkVersion: '3'
 
 provider:
   name: aws
   runtime: nodejs12.x
-  lambdaHashingVersion: 20201221
 
 # you can overwrite defaults here
 #  stage: dev
 #  region: us-east-1
 
 # you can add statements to the Lambda function's IAM Role here
-#  iamRoleStatements:
-#    - Effect: "Allow"
-#      Action:
-#        - "s3:ListBucket"
-#      Resource: { "Fn::Join" : ["", ["arn:aws:s3:::", { "Ref" : "ServerlessDeploymentBucket" } ] ]  }
-#    - Effect: "Allow"
-#      Action:
-#        - "s3:PutObject"
-#      Resource:
-#        Fn::Join:
-#          - ""
-#          - - "arn:aws:s3:::"
-#            - "Ref" : "ServerlessDeploymentBucket"
-#            - "/*"
+#  iam:
+#    role:
+#      statements:
+#        - Effect: "Allow"
+#          Action:
+#            - "s3:ListBucket"
+#          Resource: { "Fn::Join" : ["", ["arn:aws:s3:::", { "Ref" : "ServerlessDeploymentBucket" } ] ]  }
+#        - Effect: "Allow"
+#          Action:
+#            - "s3:PutObject"
+#          Resource:
+#            Fn::Join:
+#              - ""
+#              - - "arn:aws:s3:::"
+#                - "Ref" : "ServerlessDeploymentBucket"
+#                - "/*"
 
 # you can define service wide environment variables here
 #  environment:
diff --git a/lib/plugins/create/templates/aws-nodejs-docker/serverless.yml b/lib/plugins/create/templates/aws-nodejs-docker/serverless.yml
index 3ae730f489c..5f57c8c7ba7 100644
--- a/lib/plugins/create/templates/aws-nodejs-docker/serverless.yml
+++ b/lib/plugins/create/templates/aws-nodejs-docker/serverless.yml
@@ -18,11 +18,10 @@ service: test-aws-nodejs-docker # NOTE: update this with your service name
 
 # You can pin your service to only deploy with a specific Serverless version
 # Check out our docs for more details
-frameworkVersion: '2'
+frameworkVersion: '3'
 
 provider:
   name: aws
-  lambdaHashingVersion: 20201221
   ecr:
     # In this section you can define images that will be built locally and uploaded to ECR
     images:
@@ -34,20 +33,22 @@ provider:
 #  region: us-east-1
 
 # you can add statements to the Lambda function's IAM Role here
-#  iamRoleStatements:
-#    - Effect: "Allow"
-#      Action:
-#        - "s3:ListBucket"
-#      Resource: { "Fn::Join" : ["", ["arn:aws:s3:::", { "Ref" : "ServerlessDeploymentBucket" } ] ]  }
-#    - Effect: "Allow"
-#      Action:
-#        - "s3:PutObject"
-#      Resource:
-#        Fn::Join:
-#          - ""
-#          - - "arn:aws:s3:::"
-#            - "Ref" : "ServerlessDeploymentBucket"
-#            - "/*"
+#  iam:
+#    role:
+#      statements:
+#        - Effect: "Allow"
+#          Action:
+#            - "s3:ListBucket"
+#          Resource: { "Fn::Join" : ["", ["arn:aws:s3:::", { "Ref" : "ServerlessDeploymentBucket" } ] ]  }
+#        - Effect: "Allow"
+#          Action:
+#            - "s3:PutObject"
+#          Resource:
+#            Fn::Join:
+#              - ""
+#              - - "arn:aws:s3:::"
+#                - "Ref" : "ServerlessDeploymentBucket"
+#                - "/*"
 
 # you can define service wide environment variables here
 #  environment:
diff --git a/lib/plugins/create/templates/aws-nodejs-ecma-script/serverless.yml b/lib/plugins/create/templates/aws-nodejs-ecma-script/serverless.yml
index a88a6be4d4b..aec574d84e3 100644
--- a/lib/plugins/create/templates/aws-nodejs-ecma-script/serverless.yml
+++ b/lib/plugins/create/templates/aws-nodejs-ecma-script/serverless.yml
@@ -3,7 +3,7 @@ service:
 # app and org for use with dashboard.serverless.com
 #app: your-app-name
 #org: your-org-name
-frameworkVersion: '2'
+frameworkVersion: '3'
 
 # Add the serverless-webpack plugin
 plugins:
@@ -12,7 +12,6 @@ plugins:
 provider:
   name: aws
   runtime: nodejs12.x
-  lambdaHashingVersion: 20201221
 
 functions:
   first:
diff --git a/lib/plugins/create/templates/aws-nodejs-typescript/.gitignore b/lib/plugins/create/templates/aws-nodejs-typescript/.gitignore
index 98374934311..167a9a7ec82 100644
--- a/lib/plugins/create/templates/aws-nodejs-typescript/.gitignore
+++ b/lib/plugins/create/templates/aws-nodejs-typescript/.gitignore
@@ -5,5 +5,5 @@ jspm_packages
 # Serverless directories
 .serverless
 
-# Webpack directories
-.webpack
\ No newline at end of file
+# esbuild directories
+.esbuild
\ No newline at end of file
diff --git a/lib/plugins/create/templates/aws-nodejs-typescript/package.json b/lib/plugins/create/templates/aws-nodejs-typescript/package.json
index 04a59b673ef..8e082290f5d 100644
--- a/lib/plugins/create/templates/aws-nodejs-typescript/package.json
+++ b/lib/plugins/create/templates/aws-nodejs-typescript/package.json
@@ -10,24 +10,20 @@
     "node": ">=14.15.0"
   },
   "dependencies": {
-    "@middy/core": "^1.5.2",
-    "@middy/http-json-body-parser": "^1.5.2",
-    "source-map-support": "^0.5.19"
+    "@middy/core": "^2.5.3",
+    "@middy/http-json-body-parser": "^2.5.3"
   },
   "devDependencies": {
-    "@serverless/typescript": "^2.23.0",
+    "@serverless/typescript": "^3.0.0",
     "@types/aws-lambda": "^8.10.71",
     "@types/node": "^14.14.25",
+    "esbuild": "^0.14.11",
     "json-schema-to-ts": "^1.5.0",
-    "serverless": "^2.23.0",
-    "serverless-webpack": "^5.3.5",
-    "ts-loader": "^8.0.15",
-    "ts-node": "^9.1.1",
+    "serverless": "^3.0.0",
+    "serverless-esbuild": "^1.23.3",
+    "ts-node": "^10.4.0",
     "tsconfig-paths": "^3.9.0",
-    "tsconfig-paths-webpack-plugin": "^3.3.0",
-    "typescript": "^4.1.3",
-    "webpack": "^5.20.2",
-    "webpack-node-externals": "^2.5.2"
+    "typescript": "^4.1.3"
   },
   "author": "The serverless webpack authors (https://github.com/elastic-coders/serverless-webpack)",
   "license": "MIT"
diff --git a/lib/plugins/create/templates/aws-nodejs-typescript/serverless.ts b/lib/plugins/create/templates/aws-nodejs-typescript/serverless.ts
index 74a2a88a337..07bea3c0f67 100644
--- a/lib/plugins/create/templates/aws-nodejs-typescript/serverless.ts
+++ b/lib/plugins/create/templates/aws-nodejs-typescript/serverless.ts
@@ -4,14 +4,8 @@ import hello from '@functions/hello';
 
 const serverlessConfiguration: AWS = {
   service: 'aws-nodejs-typescript',
-  frameworkVersion: '2',
-  custom: {
-    webpack: {
-      webpackConfig: './webpack.config.js',
-      includeModules: true,
-    },
-  },
-  plugins: ['serverless-webpack'],
+  frameworkVersion: '3',
+  plugins: ['serverless-esbuild'],
   provider: {
     name: 'aws',
     runtime: 'nodejs14.x',
@@ -21,11 +15,24 @@ const serverlessConfiguration: AWS = {
     },
     environment: {
       AWS_NODEJS_CONNECTION_REUSE_ENABLED: '1',
+      NODE_OPTIONS: '--enable-source-maps --stack-trace-limit=1000',
     },
-    lambdaHashingVersion: '20201221',
   },
   // import the function via paths
   functions: { hello },
+  package: { individually: true },
+  custom: {
+    esbuild: {
+      bundle: true,
+      minify: false,
+      sourcemap: true,
+      exclude: ['aws-sdk'],
+      target: 'node14',
+      define: { 'require.resolve': undefined },
+      platform: 'node',
+      concurrency: 10,
+    },
+  },
 };
 
 module.exports = serverlessConfiguration;
diff --git a/lib/plugins/create/templates/aws-nodejs-typescript/src/functions/hello/handler.ts b/lib/plugins/create/templates/aws-nodejs-typescript/src/functions/hello/handler.ts
index 3b2c81cda68..1236d25bd8d 100644
--- a/lib/plugins/create/templates/aws-nodejs-typescript/src/functions/hello/handler.ts
+++ b/lib/plugins/create/templates/aws-nodejs-typescript/src/functions/hello/handler.ts
@@ -1,7 +1,5 @@
-import 'source-map-support/register';
-
-import type { ValidatedEventAPIGatewayProxyEvent } from '@libs/apiGateway';
-import { formatJSONResponse } from '@libs/apiGateway';
+import type { ValidatedEventAPIGatewayProxyEvent } from '@libs/api-gateway';
+import { formatJSONResponse } from '@libs/api-gateway';
 import { middyfy } from '@libs/lambda';
 
 import schema from './schema';
@@ -11,6 +9,6 @@ const hello: ValidatedEventAPIGatewayProxyEvent<typeof schema> = async (event) =
     message: `Hello ${event.body.name}, welcome to the exciting Serverless world!`,
     event,
   });
-}
+};
 
 export const main = middyfy(hello);
diff --git a/lib/plugins/create/templates/aws-nodejs-typescript/src/functions/hello/index.ts b/lib/plugins/create/templates/aws-nodejs-typescript/src/functions/hello/index.ts
index 78a673877c5..d9f4d47c4c9 100644
--- a/lib/plugins/create/templates/aws-nodejs-typescript/src/functions/hello/index.ts
+++ b/lib/plugins/create/templates/aws-nodejs-typescript/src/functions/hello/index.ts
@@ -1,5 +1,5 @@
 import schema from './schema';
-import { handlerPath } from '@libs/handlerResolver';
+import { handlerPath } from '@libs/handler-resolver';
 
 export default {
   handler: `${handlerPath(__dirname)}/handler.main`,
@@ -9,11 +9,11 @@ export default {
         method: 'post',
         path: 'hello',
         request: {
-          schema: {
-            'application/json': schema
-          }
-        }
-      }
-    }
-  ]
-}
+          schemas: {
+            'application/json': schema,
+          },
+        },
+      },
+    },
+  ],
+};
diff --git a/lib/plugins/create/templates/aws-nodejs-typescript/src/libs/apiGateway.ts b/lib/plugins/create/templates/aws-nodejs-typescript/src/libs/api-gateway.ts
similarity index 100%
rename from lib/plugins/create/templates/aws-nodejs-typescript/src/libs/apiGateway.ts
rename to lib/plugins/create/templates/aws-nodejs-typescript/src/libs/api-gateway.ts
diff --git a/lib/plugins/create/templates/aws-nodejs-typescript/src/libs/handlerResolver.ts b/lib/plugins/create/templates/aws-nodejs-typescript/src/libs/handler-resolver.ts
similarity index 100%
rename from lib/plugins/create/templates/aws-nodejs-typescript/src/libs/handlerResolver.ts
rename to lib/plugins/create/templates/aws-nodejs-typescript/src/libs/handler-resolver.ts
diff --git a/lib/plugins/create/templates/aws-nodejs/serverless.yml b/lib/plugins/create/templates/aws-nodejs/serverless.yml
index b522ed1b2a8..984423a12e3 100644
--- a/lib/plugins/create/templates/aws-nodejs/serverless.yml
+++ b/lib/plugins/create/templates/aws-nodejs/serverless.yml
@@ -18,32 +18,33 @@ service: aws-nodejs # NOTE: update this with your service name
 
 # You can pin your service to only deploy with a specific Serverless version
 # Check out our docs for more details
-frameworkVersion: '2'
+frameworkVersion: '3'
 
 provider:
   name: aws
   runtime: nodejs12.x
-  lambdaHashingVersion: 20201221
 
 # you can overwrite defaults here
 #  stage: dev
 #  region: us-east-1
 
 # you can add statements to the Lambda function's IAM Role here
-#  iamRoleStatements:
-#    - Effect: "Allow"
-#      Action:
-#        - "s3:ListBucket"
-#      Resource: { "Fn::Join" : ["", ["arn:aws:s3:::", { "Ref" : "ServerlessDeploymentBucket" } ] ]  }
-#    - Effect: "Allow"
-#      Action:
-#        - "s3:PutObject"
-#      Resource:
-#        Fn::Join:
-#          - ""
-#          - - "arn:aws:s3:::"
-#            - "Ref" : "ServerlessDeploymentBucket"
-#            - "/*"
+#  iam:
+#    role:
+#      statements:
+#        - Effect: "Allow"
+#          Action:
+#            - "s3:ListBucket"
+#          Resource: { "Fn::Join" : ["", ["arn:aws:s3:::", { "Ref" : "ServerlessDeploymentBucket" } ] ]  }
+#        - Effect: "Allow"
+#          Action:
+#            - "s3:PutObject"
+#          Resource:
+#            Fn::Join:
+#              - ""
+#              - - "arn:aws:s3:::"
+#                - "Ref" : "ServerlessDeploymentBucket"
+#                - "/*"
 
 # you can define service wide environment variables here
 #  environment:
diff --git a/lib/plugins/create/templates/aws-provided/serverless.yml b/lib/plugins/create/templates/aws-provided/serverless.yml
index cc1ba743ec7..a90016897af 100644
--- a/lib/plugins/create/templates/aws-provided/serverless.yml
+++ b/lib/plugins/create/templates/aws-provided/serverless.yml
@@ -18,32 +18,33 @@ service: aws-provided # NOTE: update this with your service name
 
 # You can pin your service to only deploy with a specific Serverless version
 # Check out our docs for more details
-frameworkVersion: '2'
+frameworkVersion: '3'
 
 provider:
   name: aws
   runtime: provided
-  lambdaHashingVersion: 20201221
 
 # you can overwrite defaults here
 #  stage: dev
 #  region: us-east-1
 
 # you can add statements to the Lambda function's IAM Role here
-#  iamRoleStatements:
-#    - Effect: "Allow"
-#      Action:
-#        - "s3:ListBucket"
-#      Resource: { "Fn::Join" : ["", ["arn:aws:s3:::", { "Ref" : "ServerlessDeploymentBucket" } ] ]  }
-#    - Effect: "Allow"
-#      Action:
-#        - "s3:PutObject"
-#      Resource:
-#        Fn::Join:
-#          - ""
-#          - - "arn:aws:s3:::"
-#            - "Ref" : "ServerlessDeploymentBucket"
-#            - "/*"
+#  iam:
+#    role:
+#      statements:
+#        - Effect: "Allow"
+#          Action:
+#            - "s3:ListBucket"
+#          Resource: { "Fn::Join" : ["", ["arn:aws:s3:::", { "Ref" : "ServerlessDeploymentBucket" } ] ]  }
+#        - Effect: "Allow"
+#          Action:
+#            - "s3:PutObject"
+#          Resource:
+#            Fn::Join:
+#              - ""
+#              - - "arn:aws:s3:::"
+#                - "Ref" : "ServerlessDeploymentBucket"
+#                - "/*"
 
 # you can define service wide environment variables here
 #  environment:
diff --git a/lib/plugins/create/templates/aws-python-docker/serverless.yml b/lib/plugins/create/templates/aws-python-docker/serverless.yml
index aee3ca48315..d58f5e7a451 100644
--- a/lib/plugins/create/templates/aws-python-docker/serverless.yml
+++ b/lib/plugins/create/templates/aws-python-docker/serverless.yml
@@ -18,11 +18,10 @@ service: test-aws-python-docker # NOTE: update this with your service name
 
 # You can pin your service to only deploy with a specific Serverless version
 # Check out our docs for more details
-frameworkVersion: '2'
+frameworkVersion: '3'
 
 provider:
   name: aws
-  lambdaHashingVersion: 20201221
   ecr:
     # In this section you can define images that will be built locally and uploaded to ECR
     images:
@@ -34,20 +33,22 @@ provider:
 #  region: us-east-1
 
 # you can add statements to the Lambda function's IAM Role here
-#  iamRoleStatements:
-#    - Effect: "Allow"
-#      Action:
-#        - "s3:ListBucket"
-#      Resource: { "Fn::Join" : ["", ["arn:aws:s3:::", { "Ref" : "ServerlessDeploymentBucket" } ] ]  }
-#    - Effect: "Allow"
-#      Action:
-#        - "s3:PutObject"
-#      Resource:
-#        Fn::Join:
-#          - ""
-#          - - "arn:aws:s3:::"
-#            - "Ref" : "ServerlessDeploymentBucket"
-#            - "/*"
+#  iam:
+#    role:
+#      statements:
+#        - Effect: "Allow"
+#          Action:
+#            - "s3:ListBucket"
+#          Resource: { "Fn::Join" : ["", ["arn:aws:s3:::", { "Ref" : "ServerlessDeploymentBucket" } ] ]  }
+#        - Effect: "Allow"
+#          Action:
+#            - "s3:PutObject"
+#          Resource:
+#            Fn::Join:
+#              - ""
+#              - - "arn:aws:s3:::"
+#                - "Ref" : "ServerlessDeploymentBucket"
+#                - "/*"
 
 # you can define service wide environment variables here
 #  environment:
diff --git a/lib/plugins/create/templates/aws-python/serverless.yml b/lib/plugins/create/templates/aws-python/serverless.yml
index 3283a23c63e..2ae4d3e81bb 100644
--- a/lib/plugins/create/templates/aws-python/serverless.yml
+++ b/lib/plugins/create/templates/aws-python/serverless.yml
@@ -18,32 +18,33 @@ service: aws-python # NOTE: update this with your service name
 
 # You can pin your service to only deploy with a specific Serverless version
 # Check out our docs for more details
-frameworkVersion: '2'
+frameworkVersion: '3'
 
 provider:
   name: aws
   runtime: python2.7
-  lambdaHashingVersion: 20201221
 
 # you can overwrite defaults here
 #  stage: dev
 #  region: us-east-1
 
 # you can add statements to the Lambda function's IAM Role here
-#  iamRoleStatements:
-#    - Effect: "Allow"
-#      Action:
-#        - "s3:ListBucket"
-#      Resource: { "Fn::Join" : ["", ["arn:aws:s3:::", { "Ref" : "ServerlessDeploymentBucket" } ] ]  }
-#    - Effect: "Allow"
-#      Action:
-#        - "s3:PutObject"
-#      Resource:
-#        Fn::Join:
-#          - ""
-#          - - "arn:aws:s3:::"
-#            - "Ref" : "ServerlessDeploymentBucket"
-#            - "/*"
+#  iam:
+#    role:
+#      statements:
+#        - Effect: "Allow"
+#          Action:
+#            - "s3:ListBucket"
+#          Resource: { "Fn::Join" : ["", ["arn:aws:s3:::", { "Ref" : "ServerlessDeploymentBucket" } ] ]  }
+#        - Effect: "Allow"
+#          Action:
+#            - "s3:PutObject"
+#          Resource:
+#            Fn::Join:
+#              - ""
+#              - - "arn:aws:s3:::"
+#                - "Ref" : "ServerlessDeploymentBucket"
+#                - "/*"
 
 # you can define service wide environment variables here
 #  environment:
diff --git a/lib/plugins/create/templates/aws-python3/serverless.yml b/lib/plugins/create/templates/aws-python3/serverless.yml
index fdfe474b384..3d517792839 100644
--- a/lib/plugins/create/templates/aws-python3/serverless.yml
+++ b/lib/plugins/create/templates/aws-python3/serverless.yml
@@ -18,32 +18,33 @@ service: aws-python3 # NOTE: update this with your service name
 
 # You can pin your service to only deploy with a specific Serverless version
 # Check out our docs for more details
-frameworkVersion: '2'
+frameworkVersion: '3'
 
 provider:
   name: aws
   runtime: python3.8
-  lambdaHashingVersion: 20201221
 
 # you can overwrite defaults here
 #  stage: dev
 #  region: us-east-1
 
 # you can add statements to the Lambda function's IAM Role here
-#  iamRoleStatements:
-#    - Effect: "Allow"
-#      Action:
-#        - "s3:ListBucket"
-#      Resource: { "Fn::Join" : ["", ["arn:aws:s3:::", { "Ref" : "ServerlessDeploymentBucket" } ] ]  }
-#    - Effect: "Allow"
-#      Action:
-#        - "s3:PutObject"
-#      Resource:
-#        Fn::Join:
-#          - ""
-#          - - "arn:aws:s3:::"
-#            - "Ref" : "ServerlessDeploymentBucket"
-#            - "/*"
+#  iam:
+#    role:
+#      statements:
+#        - Effect: "Allow"
+#          Action:
+#            - "s3:ListBucket"
+#          Resource: { "Fn::Join" : ["", ["arn:aws:s3:::", { "Ref" : "ServerlessDeploymentBucket" } ] ]  }
+#        - Effect: "Allow"
+#          Action:
+#            - "s3:PutObject"
+#          Resource:
+#            Fn::Join:
+#              - ""
+#              - - "arn:aws:s3:::"
+#                - "Ref" : "ServerlessDeploymentBucket"
+#                - "/*"
 
 # you can define service wide environment variables here
 #  environment:
diff --git a/lib/plugins/create/templates/aws-ruby/serverless.yml b/lib/plugins/create/templates/aws-ruby/serverless.yml
index 3c43ea2d7fe..cad58cbc693 100644
--- a/lib/plugins/create/templates/aws-ruby/serverless.yml
+++ b/lib/plugins/create/templates/aws-ruby/serverless.yml
@@ -18,32 +18,33 @@ service: aws-ruby # NOTE: update this with your service name
 
 # You can pin your service to only deploy with a specific Serverless version
 # Check out our docs for more details
-frameworkVersion: '2'
+frameworkVersion: '3'
 
 provider:
   name: aws
   runtime: ruby2.7
-  lambdaHashingVersion: 20201221
 
 # you can overwrite defaults here
 #  stage: dev
 #  region: us-east-1
 
 # you can add statements to the Lambda function's IAM Role here
-#  iamRoleStatements:
-#    - Effect: "Allow"
-#      Action:
-#        - "s3:ListBucket"
-#      Resource: { "Fn::Join" : ["", ["arn:aws:s3:::", { "Ref" : "ServerlessDeploymentBucket" } ] ]  }
-#    - Effect: "Allow"
-#      Action:
-#        - "s3:PutObject"
-#      Resource:
-#        Fn::Join:
-#          - ""
-#          - - "arn:aws:s3:::"
-#            - "Ref" : "ServerlessDeploymentBucket"
-#            - "/*"
+#  iam:
+#    role:
+#      statements:
+#        - Effect: "Allow"
+#          Action:
+#            - "s3:ListBucket"
+#          Resource: { "Fn::Join" : ["", ["arn:aws:s3:::", { "Ref" : "ServerlessDeploymentBucket" } ] ]  }
+#        - Effect: "Allow"
+#          Action:
+#            - "s3:PutObject"
+#          Resource:
+#            Fn::Join:
+#              - ""
+#              - - "arn:aws:s3:::"
+#                - "Ref" : "ServerlessDeploymentBucket"
+#                - "/*"
 
 # you can define service wide environment variables here
 #  environment:
diff --git a/lib/plugins/create/templates/aws-scala-sbt/build.sbt b/lib/plugins/create/templates/aws-scala-sbt/build.sbt
index d53e7357f61..8f8e5bf6e9f 100644
--- a/lib/plugins/create/templates/aws-scala-sbt/build.sbt
+++ b/lib/plugins/create/templates/aws-scala-sbt/build.sbt
@@ -12,8 +12,8 @@ assemblyJarName in assembly := "hello.jar"
 
 libraryDependencies ++= Seq(
   "com.amazonaws" % "aws-lambda-java-events" % "2.2.7",
-  "com.amazonaws" % "aws-lambda-java-core" % "1.2.0",
-  "com.amazonaws" % "aws-lambda-java-log4j2" % "1.1.0"
+  "com.amazonaws" % "aws-lambda-java-core" % "1.2.1",
+  "com.amazonaws" % "aws-lambda-java-log4j2" % "1.5.1"
 )
 
 scalacOptions ++= Seq(
diff --git a/lib/plugins/create/templates/aws-scala-sbt/serverless.yml b/lib/plugins/create/templates/aws-scala-sbt/serverless.yml
index 14b2d702387..82baf5a44a0 100644
--- a/lib/plugins/create/templates/aws-scala-sbt/serverless.yml
+++ b/lib/plugins/create/templates/aws-scala-sbt/serverless.yml
@@ -18,32 +18,33 @@ service: aws-scala-sbt # NOTE: update this with your service name
 
 # You can pin your service to only deploy with a specific Serverless version
 # Check out our docs for more details
-frameworkVersion: '2'
+frameworkVersion: '3'
 
 provider:
   name: aws
   runtime: java8
-  lambdaHashingVersion: 20201221
 
 # you can overwrite defaults here
 #  stage: dev
 #  region: us-east-1
 
 # you can add statements to the Lambda function's IAM Role here
-#  iamRoleStatements:
-#    - Effect: "Allow"
-#      Action:
-#        - "s3:ListBucket"
-#      Resource: { "Fn::Join" : ["", ["arn:aws:s3:::", { "Ref" : "ServerlessDeploymentBucket" } ] ]  }
-#    - Effect: "Allow"
-#      Action:
-#        - "s3:PutObject"
-#      Resource:
-#        Fn::Join:
-#          - ""
-#          - - "arn:aws:s3:::"
-#            - "Ref" : "ServerlessDeploymentBucket"
-#            - "/*"
+#  iam:
+#    role:
+#      statements:
+#        - Effect: "Allow"
+#          Action:
+#            - "s3:ListBucket"
+#          Resource: { "Fn::Join" : ["", ["arn:aws:s3:::", { "Ref" : "ServerlessDeploymentBucket" } ] ]  }
+#        - Effect: "Allow"
+#          Action:
+#            - "s3:PutObject"
+#          Resource:
+#            Fn::Join:
+#              - ""
+#              - - "arn:aws:s3:::"
+#                - "Ref" : "ServerlessDeploymentBucket"
+#                - "/*"
 
 # you can define service wide environment variables here
 #  environment:
diff --git a/lib/plugins/create/templates/azure-csharp/serverless.yml b/lib/plugins/create/templates/azure-csharp/serverless.yml
index 992b59110ba..98227293224 100644
--- a/lib/plugins/create/templates/azure-csharp/serverless.yml
+++ b/lib/plugins/create/templates/azure-csharp/serverless.yml
@@ -15,7 +15,7 @@ service: azure-dotnet # NOTE: update this with your service name
 
 # You can pin your service to only deploy with a specific Serverless version
 # Check out our docs for more details
-frameworkVersion: '2'
+frameworkVersion: '3'
 
 provider:
   name: azure
diff --git a/lib/plugins/create/templates/azure-nodejs-typescript/package.json b/lib/plugins/create/templates/azure-nodejs-typescript/package.json
index 38f54eb901f..f6d2577abc6 100644
--- a/lib/plugins/create/templates/azure-nodejs-typescript/package.json
+++ b/lib/plugins/create/templates/azure-nodejs-typescript/package.json
@@ -15,7 +15,7 @@
     "@azure/functions": "^1.0.3",
     "@types/node": "^13.1.8",
     "fork-ts-checker-webpack-plugin": "^3.0.1",
-    "serverless-azure-functions": "^1.0.0",
+    "serverless-azure-functions": "^2.1.1",
     "serverless-webpack": "^5.3.1",
     "ts-loader": "^6.2.1",
     "typescript": "^3.7.5",
diff --git a/lib/plugins/create/templates/azure-nodejs-typescript/serverless.yml b/lib/plugins/create/templates/azure-nodejs-typescript/serverless.yml
index 3d551ae68b8..8bc88e436f9 100644
--- a/lib/plugins/create/templates/azure-nodejs-typescript/serverless.yml
+++ b/lib/plugins/create/templates/azure-nodejs-typescript/serverless.yml
@@ -15,7 +15,7 @@ service: azure-nodejs-typescript # NOTE: update this with your service name
 
 # You can pin your service to only deploy with a specific Serverless version
 # Check out our docs for more details
-frameworkVersion: '2'
+frameworkVersion: '3'
 
 custom:
   webpack:
diff --git a/lib/plugins/create/templates/azure-nodejs/serverless.yml b/lib/plugins/create/templates/azure-nodejs/serverless.yml
index 733d86ab345..73ad9b7ad7a 100644
--- a/lib/plugins/create/templates/azure-nodejs/serverless.yml
+++ b/lib/plugins/create/templates/azure-nodejs/serverless.yml
@@ -15,7 +15,7 @@ service: azure-nodejs # NOTE: update this with your service name
 
 # You can pin your service to only deploy with a specific Serverless version
 # Check out our docs for more details
-frameworkVersion: '2'
+frameworkVersion: '3'
 
 provider:
   name: azure
diff --git a/lib/plugins/create/templates/azure-python/serverless.yml b/lib/plugins/create/templates/azure-python/serverless.yml
index 16ca718f32b..c438a088a29 100644
--- a/lib/plugins/create/templates/azure-python/serverless.yml
+++ b/lib/plugins/create/templates/azure-python/serverless.yml
@@ -15,7 +15,7 @@ service: azure-python # NOTE: update this with your service name
 
 # You can pin your service to only deploy with a specific Serverless version
 # Check out our docs for more details
-frameworkVersion: '2'
+frameworkVersion: '3'
 
 provider:
   name: azure
diff --git a/lib/plugins/create/templates/cloudflare-workers-enterprise/package.json b/lib/plugins/create/templates/cloudflare-workers-enterprise/package.json
index e8490dae4b8..c76d334292d 100644
--- a/lib/plugins/create/templates/cloudflare-workers-enterprise/package.json
+++ b/lib/plugins/create/templates/cloudflare-workers-enterprise/package.json
@@ -9,6 +9,6 @@
   "author": "cloudflare",
   "license": "MIT",
   "devDependencies": {
-    "serverless-cloudflare-workers": "1.0.5"
+    "serverless-cloudflare-workers": "1.2.0"
   }
 }
diff --git a/lib/plugins/create/templates/cloudflare-workers-enterprise/serverless.yml b/lib/plugins/create/templates/cloudflare-workers-enterprise/serverless.yml
index 9023cbca4b8..8c6e80e91d0 100644
--- a/lib/plugins/create/templates/cloudflare-workers-enterprise/serverless.yml
+++ b/lib/plugins/create/templates/cloudflare-workers-enterprise/serverless.yml
@@ -1,6 +1,6 @@
 service: hello-world # NOTE: update this with your service name
 
-frameworkVersion: '2'
+frameworkVersion: '3'
 
 provider:
   name: cloudflare
diff --git a/lib/plugins/create/templates/cloudflare-workers-rust/serverless.yml b/lib/plugins/create/templates/cloudflare-workers-rust/serverless.yml
index 2e99fc83f6d..7d58ebdca75 100644
--- a/lib/plugins/create/templates/cloudflare-workers-rust/serverless.yml
+++ b/lib/plugins/create/templates/cloudflare-workers-rust/serverless.yml
@@ -1,6 +1,6 @@
 service: hello-world # NOTE: update this with your service name
 
-frameworkVersion: '2'
+frameworkVersion: '3'
 
 provider:
   name: cloudflare
diff --git a/lib/plugins/create/templates/cloudflare-workers/package.json b/lib/plugins/create/templates/cloudflare-workers/package.json
index cff6760a3ca..da5289f9552 100644
--- a/lib/plugins/create/templates/cloudflare-workers/package.json
+++ b/lib/plugins/create/templates/cloudflare-workers/package.json
@@ -9,6 +9,6 @@
   "author": "cloudflare",
   "license": "MIT",
   "devDependencies": {
-    "serverless-cloudflare-workers": "1.0.5"
+    "serverless-cloudflare-workers": "1.2.0"
   }
 }
diff --git a/lib/plugins/create/templates/cloudflare-workers/serverless.yml b/lib/plugins/create/templates/cloudflare-workers/serverless.yml
index d5ed93c7107..59986de8c6f 100644
--- a/lib/plugins/create/templates/cloudflare-workers/serverless.yml
+++ b/lib/plugins/create/templates/cloudflare-workers/serverless.yml
@@ -1,6 +1,6 @@
 service: hello-world # NOTE: update this with your service name
 
-frameworkVersion: '2'
+frameworkVersion: '3'
 
 provider:
   name: cloudflare
diff --git a/lib/plugins/create/templates/fn-go/serverless.yml b/lib/plugins/create/templates/fn-go/serverless.yml
index cf46dfb403e..6f393ec5e3e 100644
--- a/lib/plugins/create/templates/fn-go/serverless.yml
+++ b/lib/plugins/create/templates/fn-go/serverless.yml
@@ -7,7 +7,7 @@
 # The `service` block is the name of the service
 service: hello-world # NOTE: update this with your service name
 
-frameworkVersion: '2'
+frameworkVersion: '3'
 
 # The `provider` block defines where your service will be deployed
 provider:
diff --git a/lib/plugins/create/templates/fn-nodejs/serverless.yml b/lib/plugins/create/templates/fn-nodejs/serverless.yml
index f5e3780bbbf..f9780f0257d 100644
--- a/lib/plugins/create/templates/fn-nodejs/serverless.yml
+++ b/lib/plugins/create/templates/fn-nodejs/serverless.yml
@@ -7,7 +7,7 @@
 # The `service` block is the name of the service
 service: hello-world # NOTE: update this with your service name
 
-frameworkVersion: '2'
+frameworkVersion: '3'
 
 # The `provider` block defines where your service will be deployed
 provider:
diff --git a/lib/plugins/create/templates/google-go/serverless.yml b/lib/plugins/create/templates/google-go/serverless.yml
index f1165bd8e9c..871857b4243 100644
--- a/lib/plugins/create/templates/google-go/serverless.yml
+++ b/lib/plugins/create/templates/google-go/serverless.yml
@@ -10,7 +10,7 @@ provider:
   # the path to the credentials file needs to be absolute
   credentials: ~/.gcloud/keyfile.json
 
-frameworkVersion: '2'
+frameworkVersion: '3'
 
 plugins:
   - serverless-google-cloudfunctions
diff --git a/lib/plugins/create/templates/google-nodejs-typescript/.gitignore b/lib/plugins/create/templates/google-nodejs-typescript/.gitignore
new file mode 100644
index 00000000000..4ff723def61
--- /dev/null
+++ b/lib/plugins/create/templates/google-nodejs-typescript/.gitignore
@@ -0,0 +1,11 @@
+# package directories
+node_modules
+
+# Serverless directories
+.serverless
+
+# Webpack directories
+.webpack
+
+# Typescript output dir
+dist
diff --git a/lib/plugins/create/templates/google-nodejs-typescript/.nvmrc b/lib/plugins/create/templates/google-nodejs-typescript/.nvmrc
new file mode 100644
index 00000000000..518633e1687
--- /dev/null
+++ b/lib/plugins/create/templates/google-nodejs-typescript/.nvmrc
@@ -0,0 +1 @@
+lts/fermium
diff --git a/lib/plugins/create/templates/google-nodejs-typescript/README.md b/lib/plugins/create/templates/google-nodejs-typescript/README.md
new file mode 100644
index 00000000000..298760c6cc1
--- /dev/null
+++ b/lib/plugins/create/templates/google-nodejs-typescript/README.md
@@ -0,0 +1,51 @@
+# Serverless - Google Node.js Typescript
+
+This project has been generated using the `google-nodejs-typescript` template from the [Serverless framework](https://www.serverless.com/).
+
+For detailed instructions, please refer to the [documentation](https://www.serverless.com/framework/docs/providers/google/).
+
+## Installation/deployment instructions
+
+Depending on your preferred package manager, follow the instructions below to deploy your project.
+
+> **Requirements**: NodeJS `lts/fermium (v.14.15.0)`. If you're using [nvm](https://github.com/nvm-sh/nvm), run `nvm use` to ensure you're using the same Node version in local and in your cloud function's runtime.
+
+### Setup your google project
+
+1. Go to the [API dashboard](https://console.cloud.google.com/apis/dashboard), select your project and enable the following APIs (if not already enabled):
+
+   - Cloud Functions API
+   - Cloud Deployment Manager V2 API
+   - Cloud Build API
+   - Cloud Storage
+   - Cloud Logging API
+
+2. Replace `<your-gcp-project-id>` with your project id in `serverles.ts`
+
+### Authenticate
+
+Follow [the authentication doc](https://www.serverless.com/framework/docs/providers/google/guide/credentials/).
+
+**TL;DR**
+
+```shell
+gcloud auth application-default login
+```
+
+### Install the dependencies
+
+```shell
+# with npm
+npm i
+# or yarn
+yarn
+```
+
+### Deploy
+
+```shell
+# with npm
+npm run deploy
+# or yarn
+yarn deploy
+```
diff --git a/lib/plugins/create/templates/google-nodejs-typescript/index.ts b/lib/plugins/create/templates/google-nodejs-typescript/index.ts
new file mode 100644
index 00000000000..6337c4c6436
--- /dev/null
+++ b/lib/plugins/create/templates/google-nodejs-typescript/index.ts
@@ -0,0 +1,2 @@
+export { eventHello } from '@functions/event-hello/handler';
+export { httpHello } from '@functions/http-hello/handler';
diff --git a/lib/plugins/create/templates/google-nodejs-typescript/package.json b/lib/plugins/create/templates/google-nodejs-typescript/package.json
new file mode 100644
index 00000000000..cc58fca496d
--- /dev/null
+++ b/lib/plugins/create/templates/google-nodejs-typescript/package.json
@@ -0,0 +1,31 @@
+{
+  "name": "google-nodejs-typescript",
+  "version": "1.0.0",
+  "description": "Serverless google-nodejs-typescript template",
+  "main": "serverless.ts",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1",
+    "deploy": "sls deploy"
+  },
+  "engines": {
+    "node": ">=14.15.0"
+  },
+  "devDependencies": {
+    "@serverless/typescript": "^2.23.0",
+    "@types/express": "^4.17.11",
+    "@types/node": "^14.14.25",
+    "express": "^4.17.1",
+    "serverless": "^2.23.0",
+    "serverless-google-cloudfunctions": "^4.0.0",
+    "serverless-webpack": "^5.3.5",
+    "ts-loader": "^8.0.15",
+    "ts-node": "^9.1.1",
+    "tsconfig-paths": "^3.9.0",
+    "tsconfig-paths-webpack-plugin": "^3.3.0",
+    "typescript": "^4.1.3",
+    "webpack": "^5.20.2",
+    "webpack-node-externals": "^2.5.2"
+  },
+  "author": "Corentin Doué",
+  "license": "MIT"
+}
diff --git a/lib/plugins/create/templates/google-nodejs-typescript/serverless.ts b/lib/plugins/create/templates/google-nodejs-typescript/serverless.ts
new file mode 100644
index 00000000000..4d7e53d8617
--- /dev/null
+++ b/lib/plugins/create/templates/google-nodejs-typescript/serverless.ts
@@ -0,0 +1,22 @@
+import { functions } from '@functions/config';
+
+const serverlessConfiguration = {
+  service: 'gcf-nodejs-typescript-template', // NOTE: Don't put the word "google" in here
+  frameworkVersion: '3',
+  custom: {
+    webpack: {
+      webpackConfig: './webpack.config.js',
+      includeModules: true,
+    },
+  },
+  plugins: ['serverless-google-cloudfunctions', 'serverless-webpack'],
+  provider: {
+    name: 'google',
+    runtime: 'nodejs14',
+    region: 'europe-west1',
+    project: '<your-gcp-project-id>',
+  },
+  functions,
+};
+
+module.exports = serverlessConfiguration;
diff --git a/lib/plugins/create/templates/google-nodejs-typescript/src/functions/config.ts b/lib/plugins/create/templates/google-nodejs-typescript/src/functions/config.ts
new file mode 100644
index 00000000000..5e9561e86a7
--- /dev/null
+++ b/lib/plugins/create/templates/google-nodejs-typescript/src/functions/config.ts
@@ -0,0 +1,7 @@
+// import { eventHello } from './event-hello/config';
+import { httpHello } from './http-hello/config';
+
+export const functions = {
+  // eventHello, // cf ./event-hello/config.ts
+  httpHello,
+};
diff --git a/lib/plugins/create/templates/google-nodejs-typescript/src/functions/event-hello/config.ts b/lib/plugins/create/templates/google-nodejs-typescript/src/functions/event-hello/config.ts
new file mode 100644
index 00000000000..bf2bbf49dd0
--- /dev/null
+++ b/lib/plugins/create/templates/google-nodejs-typescript/src/functions/event-hello/config.ts
@@ -0,0 +1,16 @@
+// This function is not deployed by default because the topic does not exist
+// 1. Create a Topic
+// 2. Replace events[0].event.resource with the topic name
+// 3. Uncomment the eventHello import and declaration in src/functions/config.ts
+
+export const eventHello = {
+  handler: 'event-hello',
+  events: [
+    {
+      event: {
+        eventType: 'providers/cloud.pubsub/eventTypes/topic.publish',
+        resource: 'projects/<your-gcp-project-id>/topics/<your-topic-name>', // This is the name of the topic
+      },
+    },
+  ],
+};
diff --git a/lib/plugins/create/templates/google-nodejs-typescript/src/functions/event-hello/handler.ts b/lib/plugins/create/templates/google-nodejs-typescript/src/functions/event-hello/handler.ts
new file mode 100644
index 00000000000..96a3539b931
--- /dev/null
+++ b/lib/plugins/create/templates/google-nodejs-typescript/src/functions/event-hello/handler.ts
@@ -0,0 +1,11 @@
+import { logger } from '@libs/logs';
+import { eventErrorHandler } from '@libs/error-handler';
+
+type Event = {
+  message: string;
+};
+
+export const eventHello = eventErrorHandler(async (event: Event): Promise<void> => {
+  const { message } = event;
+  logger.log({ message });
+});
diff --git a/lib/plugins/create/templates/google-nodejs-typescript/src/functions/http-hello/config.ts b/lib/plugins/create/templates/google-nodejs-typescript/src/functions/http-hello/config.ts
new file mode 100644
index 00000000000..7f9e13f84a7
--- /dev/null
+++ b/lib/plugins/create/templates/google-nodejs-typescript/src/functions/http-hello/config.ts
@@ -0,0 +1,8 @@
+export const httpHello = {
+  handler: 'http-hello',
+  events: [
+    {
+      http: 'hello',
+    },
+  ],
+};
diff --git a/lib/plugins/create/templates/google-nodejs-typescript/src/functions/http-hello/handler.ts b/lib/plugins/create/templates/google-nodejs-typescript/src/functions/http-hello/handler.ts
new file mode 100644
index 00000000000..1b33124b567
--- /dev/null
+++ b/lib/plugins/create/templates/google-nodejs-typescript/src/functions/http-hello/handler.ts
@@ -0,0 +1,17 @@
+import type { Request as ExpressRequest, Response } from 'express';
+import { logger } from '@libs/logs';
+import { httpErrorHandler } from '@libs/error-handler';
+
+type Body = {
+  message: string;
+};
+type Request = ExpressRequest<Record<string, string>, void, Body>;
+
+export const httpHello = httpErrorHandler(async (req: Request, res: Response): Promise<void> => {
+  const {
+    body: { message },
+  } = req;
+  logger.log({ message });
+
+  res.status(200).send();
+});
diff --git a/lib/plugins/create/templates/google-nodejs-typescript/src/libs/error-handler.ts b/lib/plugins/create/templates/google-nodejs-typescript/src/libs/error-handler.ts
new file mode 100644
index 00000000000..df732fc82dc
--- /dev/null
+++ b/lib/plugins/create/templates/google-nodejs-typescript/src/libs/error-handler.ts
@@ -0,0 +1,30 @@
+import type { Request, Response } from 'express';
+import { logger } from '@libs/logs';
+
+type HttpHandler = (req: Request, res: Response) => unknown | Promise<unknown>;
+export const httpErrorHandler = (handler: HttpHandler) => async (
+  req: Request,
+  res: Response
+): Promise<void> => {
+  logger.init(req);
+  try {
+    await handler(req, res);
+  } catch (error) {
+    logger.error(error);
+    res.status(500).send();
+  }
+};
+
+type EventHandler<E> = (event: E) => void | Promise<void>;
+
+export const HANDLER_ERROR_MESSAGE = 'An error occurred during the handle of the event';
+export const eventErrorHandler = <E>(handler: EventHandler<E>) => async (
+  event: E
+): Promise<void> => {
+  try {
+    await handler(event);
+  } catch (error) {
+    logger.error(error);
+    throw new Error(HANDLER_ERROR_MESSAGE);
+  }
+};
diff --git a/lib/plugins/create/templates/google-nodejs-typescript/src/libs/logs.ts b/lib/plugins/create/templates/google-nodejs-typescript/src/libs/logs.ts
new file mode 100644
index 00000000000..f8e450dd74a
--- /dev/null
+++ b/lib/plugins/create/templates/google-nodejs-typescript/src/libs/logs.ts
@@ -0,0 +1,72 @@
+import type { Request } from 'express';
+
+export enum GCPLogEntrySeverity {
+  DEFAULT = 'DEFAULT', // (0) The log entry has no assigned severity level.
+  DEBUG = 'DEBUG', // (100) Debug or trace information.
+  INFO = 'INFO', // (200) Routine information, such as ongoing status or performance.
+  NOTICE = 'NOTICE', // (300) Normal but significant events, such as start up, shut down, or a configuration change.
+  WARNING = 'WARNING', // (400) Warning events might cause problems.
+  ERROR = 'ERROR', // (500) Error events are likely to cause problems.
+  CRITICAL = 'CRITICAL', // (600) Critical events cause more severe problems or outages.
+  ALERT = 'ALERT', // (700) A person must take an action immediately.
+  EMERGENCY = 'EMERGENCY', // (800) One or more systems are unusable.
+}
+type JSONPayload = {
+  message?: string;
+  [key: string]: Record<string, unknown> | string | undefined;
+};
+type Payload = string | JSONPayload;
+export const JSON_PAYLOAD_MESSAGE =
+  'This log contains a JSON payload, use GCP log explorer to see it';
+
+class Logger {
+  req: Request | undefined;
+
+  init = (req: Request) => {
+    this.req = req;
+  };
+
+  log = (payload: Payload): void => {
+    const entry = this.logEntry();
+    let message: string;
+    let jsonPayload: JSONPayload | undefined;
+    if (typeof payload === 'object') {
+      message = payload.message ?? JSON_PAYLOAD_MESSAGE;
+      jsonPayload = payload;
+    } else {
+      message = payload;
+    }
+    console.log(JSON.stringify(entry(GCPLogEntrySeverity.INFO, message, jsonPayload)));
+  };
+
+  error = (error: Error): void => {
+    const entry = this.logEntry();
+    const { message, stack } = error;
+
+    console.log(JSON.stringify(entry(GCPLogEntrySeverity.ERROR, message, { stack })));
+  };
+
+  logEntry = () => (
+    severity: GCPLogEntrySeverity,
+    message: string,
+    jsonPayload: JSONPayload = {}
+  ): Record<string, unknown> => ({
+    severity,
+    message,
+    ...jsonPayload,
+    ...this.getCloudTrace(),
+  });
+
+  getCloudTrace = (): Record<string, string> => {
+    const project = process.env.GCP_PROJECT; // GCP_PROJECT is always set by the runner of the cloud function
+
+    const traceHeader = this.req?.header('X-Cloud-Trace-Context');
+    if (traceHeader !== undefined && project !== undefined) {
+      const [trace] = traceHeader.split('/');
+      return { 'logging.googleapis.com/trace': `projects/${project}/traces/${trace}` };
+    }
+    return {};
+  };
+}
+
+export const logger = new Logger();
diff --git a/lib/plugins/create/templates/google-nodejs-typescript/tsconfig.json b/lib/plugins/create/templates/google-nodejs-typescript/tsconfig.json
new file mode 100644
index 00000000000..7f99a3452f8
--- /dev/null
+++ b/lib/plugins/create/templates/google-nodejs-typescript/tsconfig.json
@@ -0,0 +1,18 @@
+{
+  "extends": "./tsconfig.paths.json",
+  "compilerOptions": {
+    "lib": ["ESNext"],
+    "moduleResolution": "node",
+    "noUnusedLocals": true,
+    "noUnusedParameters": true,
+    "removeComments": true,
+    "sourceMap": true,
+    "target": "ES2020",
+    "outDir": "dist"
+  },
+  "include": ["**/*.ts", "serverless.ts"],
+  "exclude": ["node_modules/**/*", ".serverless/**/*", ".webpack/**/*", ".vscode/**/*"],
+  "ts-node": {
+    "require": ["tsconfig-paths/register"]
+  }
+}
diff --git a/lib/plugins/create/templates/google-nodejs-typescript/tsconfig.paths.json b/lib/plugins/create/templates/google-nodejs-typescript/tsconfig.paths.json
new file mode 100644
index 00000000000..2e664635932
--- /dev/null
+++ b/lib/plugins/create/templates/google-nodejs-typescript/tsconfig.paths.json
@@ -0,0 +1,9 @@
+{
+  "compilerOptions": {
+    "baseUrl": ".",
+    "paths": {
+      "@functions/*": ["src/functions/*"],
+      "@libs/*": ["src/libs/*"]
+    }
+  }
+}
diff --git a/lib/plugins/create/templates/aws-nodejs-typescript/webpack.config.js b/lib/plugins/create/templates/google-nodejs-typescript/webpack.config.js
similarity index 87%
rename from lib/plugins/create/templates/aws-nodejs-typescript/webpack.config.js
rename to lib/plugins/create/templates/google-nodejs-typescript/webpack.config.js
index 0c9129252a2..928e7d76b4d 100644
--- a/lib/plugins/create/templates/aws-nodejs-typescript/webpack.config.js
+++ b/lib/plugins/create/templates/google-nodejs-typescript/webpack.config.js
@@ -3,15 +3,10 @@ const slsw = require('serverless-webpack');
 const nodeExternals = require('webpack-node-externals');
 const TsconfigPathsPlugin = require('tsconfig-paths-webpack-plugin');
 
-/*
-This line is only required if you are specifying `TS_NODE_PROJECT` for whatever reason.
- */
-// delete process.env.TS_NODE_PROJECT;
-
 module.exports = {
   context: __dirname,
   mode: slsw.lib.webpack.isLocal ? 'development' : 'production',
-  entry: slsw.lib.entries,
+  entry: 'index.ts',
   devtool: slsw.lib.webpack.isLocal ? 'eval-cheap-module-source-map' : 'source-map',
   resolve: {
     extensions: ['.mjs', '.json', '.ts'],
@@ -26,7 +21,7 @@ module.exports = {
   output: {
     libraryTarget: 'commonjs',
     path: path.join(__dirname, '.webpack'),
-    filename: '[name].js',
+    filename: 'index.js',
   },
   optimization: {
     concatenateModules: false,
diff --git a/lib/plugins/create/templates/google-nodejs/serverless.yml b/lib/plugins/create/templates/google-nodejs/serverless.yml
index ed58e9b4d82..b66bbccf32b 100644
--- a/lib/plugins/create/templates/google-nodejs/serverless.yml
+++ b/lib/plugins/create/templates/google-nodejs/serverless.yml
@@ -12,7 +12,7 @@ provider:
   # the path to the credentials file needs to be absolute
   credentials: ~/.gcloud/keyfile.json
 
-frameworkVersion: '2'
+frameworkVersion: '3'
 
 plugins:
   - serverless-google-cloudfunctions
diff --git a/lib/plugins/create/templates/google-python/serverless.yml b/lib/plugins/create/templates/google-python/serverless.yml
index 8d76f944f3e..0eec58449e4 100644
--- a/lib/plugins/create/templates/google-python/serverless.yml
+++ b/lib/plugins/create/templates/google-python/serverless.yml
@@ -12,7 +12,7 @@ provider:
   # the path to the credentials file needs to be absolute
   credentials: ~/.gcloud/keyfile.json
 
-frameworkVersion: '2'
+frameworkVersion: '3'
 plugins:
   - serverless-google-cloudfunctions
 
diff --git a/lib/plugins/create/templates/hello-world/serverless.yml b/lib/plugins/create/templates/hello-world/serverless.yml
index 572e28eb625..48623f3dd87 100644
--- a/lib/plugins/create/templates/hello-world/serverless.yml
+++ b/lib/plugins/create/templates/hello-world/serverless.yml
@@ -7,7 +7,7 @@
 # The `service` block is the name of the service
 service: serverless-hello-world
 
-frameworkVersion: '2'
+frameworkVersion: '3'
 
 # The `provider` block defines where your service will be deployed
 provider:
diff --git a/lib/plugins/create/templates/knative-docker/serverless.yml b/lib/plugins/create/templates/knative-docker/serverless.yml
index c07627325d3..ca6d58cdc52 100644
--- a/lib/plugins/create/templates/knative-docker/serverless.yml
+++ b/lib/plugins/create/templates/knative-docker/serverless.yml
@@ -1,6 +1,6 @@
 service: knative
 
-frameworkVersion: '2'
+frameworkVersion: '3'
 
 provider:
   name: knative
diff --git a/lib/plugins/create/templates/kubeless-nodejs/serverless.yml b/lib/plugins/create/templates/kubeless-nodejs/serverless.yml
index bbfec9a816b..5835e563bd1 100644
--- a/lib/plugins/create/templates/kubeless-nodejs/serverless.yml
+++ b/lib/plugins/create/templates/kubeless-nodejs/serverless.yml
@@ -9,7 +9,7 @@
 # Update the service name below with your own service name
 service: capitalize
 
-frameworkVersion: '2'
+frameworkVersion: '3'
 
 # Please ensure the serverless-kubeless provider plugin is installed globally.
 # $ npm install -g serverless-kubeless
diff --git a/lib/plugins/create/templates/openwhisk-python/serverless.yml b/lib/plugins/create/templates/openwhisk-python/serverless.yml
index 6124ffba322..8432a4e6b9f 100644
--- a/lib/plugins/create/templates/openwhisk-python/serverless.yml
+++ b/lib/plugins/create/templates/openwhisk-python/serverless.yml
@@ -17,7 +17,7 @@ service: openwhisk-python # NOTE: update this with your service name
 # $ npm install
 provider:
   name: openwhisk
-  runtime: python
+  runtime: python:3
 
 functions:
   hello:
diff --git a/lib/plugins/create/templates/tencent-go/index.go b/lib/plugins/create/templates/tencent-go/index.go
index 1a4c75207e6..b05db7d3f44 100644
--- a/lib/plugins/create/templates/tencent-go/index.go
+++ b/lib/plugins/create/templates/tencent-go/index.go
@@ -14,7 +14,7 @@ type DefineEvent struct {
 func hello(ctx context.Context, event DefineEvent) (string, error) {
 	fmt.Println("key1:", event.Key1)
 	fmt.Println("key2:", event.Key2)
-	return fmt.Sprintf("Hello World"), nil
+	return "Hello World", nil
 }
 
 func main() {
diff --git a/lib/plugins/deploy.js b/lib/plugins/deploy.js
index b676b7f7f1d..d1b3ce35cf9 100644
--- a/lib/plugins/deploy.js
+++ b/lib/plugins/deploy.js
@@ -33,16 +33,7 @@ class Deploy {
         const provider = this.serverless.service.provider.name;
         if (!this.serverless.getProvider(provider)) {
           const errorMessage = `The specified provider "${provider}" does not exist.`;
-          throw new ServerlessError(errorMessage);
-        }
-        if (this.options.function) {
-          // If the user has given a function parameter, spawn a function deploy
-          // and terminate execution right afterwards. We did not enter the
-          // deploy lifecycle yet, so nothing has to be cleaned up.
-          await this.serverless.pluginManager.spawn('deploy:function', {
-            terminateLifecycleAfterExecution: true,
-          });
-          return;
+          throw new ServerlessError(errorMessage, 'INVALID_PROVIDER');
         }
 
         if (!this.options.package && !this.serverless.service.package.path) {
diff --git a/lib/plugins/index.js b/lib/plugins/index.js
index 244c1dc1e15..cef445cb550 100644
--- a/lib/plugins/index.js
+++ b/lib/plugins/index.js
@@ -1,7 +1,6 @@
 'use strict';
 
 module.exports = [
-  require('./interactiveCli'),
   require('./config.js'),
   require('./create/create.js'),
   require('./install.js'),
@@ -16,11 +15,9 @@ module.exports = [
   require('./rollback.js'),
   require('./slstats.js'),
   require('./plugin/plugin.js'),
-  require('./plugin/install.js'),
-  require('./plugin/uninstall.js'),
   require('./plugin/list.js'),
   require('./plugin/search.js'),
-  require('./aws/configCredentials.js'),
+  require('./aws/config-credentials.js'),
   require('./aws/provider.js'),
   require('./aws/common/index.js'),
   require('./aws/package/index.js'),
@@ -31,31 +28,33 @@ module.exports = [
   require('./aws/metrics.js'),
   require('./aws/remove/index.js'),
   require('./aws/rollback.js'),
-  require('./aws/rollbackFunction.js'),
+  require('./aws/rollback-function.js'),
   require('./aws/package/compile/layers.js'),
   require('./aws/package/compile/functions.js'),
   require('./aws/package/compile/events/schedule.js'),
   require('./aws/package/compile/events/s3/index.js'),
-  require('./aws/package/compile/events/apiGateway/index.js'),
+  require('./aws/package/compile/events/api-gateway/index.js'),
   require('./aws/package/compile/events/websockets/index.js'),
   require('./aws/package/compile/events/sns.js'),
   require('./aws/package/compile/events/stream.js'),
   require('./aws/package/compile/events/kafka.js'),
+  require('./aws/package/compile/events/activemq.js'),
+  require('./aws/package/compile/events/rabbitmq.js'),
   require('./aws/package/compile/events/msk/index.js'),
   require('./aws/package/compile/events/alb/index.js'),
-  require('./aws/package/compile/events/alexaSkill.js'),
-  require('./aws/package/compile/events/alexaSmartHome.js'),
+  require('./aws/package/compile/events/alexa-skill.js'),
+  require('./aws/package/compile/events/alexa-smart-home.js'),
   require('./aws/package/compile/events/iot.js'),
-  require('./aws/package/compile/events/iotFleetProvisioning.js'),
-  require('./aws/package/compile/events/cloudWatchEvent.js'),
-  require('./aws/package/compile/events/cloudWatchLog.js'),
-  require('./aws/package/compile/events/cognitoUserPool.js'),
-  require('./aws/package/compile/events/eventBridge/index.js'),
+  require('./aws/package/compile/events/iot-fleet-provisioning.js'),
+  require('./aws/package/compile/events/cloud-watch-event.js'),
+  require('./aws/package/compile/events/cloud-watch-log.js'),
+  require('./aws/package/compile/events/cognito-user-pool.js'),
+  require('./aws/package/compile/events/event-bridge/index.js'),
   require('./aws/package/compile/events/sqs.js'),
-  require('./aws/package/compile/events/cloudFront.js'),
-  require('./aws/package/compile/events/httpApi'),
-  require('./aws/deployFunction.js'),
-  require('./aws/deployList.js'),
-  require('./aws/invokeLocal/index.js'),
+  require('./aws/package/compile/events/cloud-front.js'),
+  require('./aws/package/compile/events/http-api'),
+  require('./aws/deploy-function.js'),
+  require('./aws/deploy-list.js'),
+  require('./aws/invoke-local/index.js'),
   require('./standalone'),
 ];
diff --git a/lib/plugins/install.js b/lib/plugins/install.js
index 394fcaa2c5e..c2a35837331 100644
--- a/lib/plugins/install.js
+++ b/lib/plugins/install.js
@@ -3,7 +3,8 @@
 const BbPromise = require('bluebird');
 
 const cliCommandsSchema = require('../cli/commands-schema');
-const download = require('../utils/downloadTemplateFromRepo');
+const download = require('../utils/download-template-from-repo');
+const { log, progress, style } = require('@serverless/utils/log');
 
 class Install {
   constructor(serverless, options) {
@@ -22,20 +23,23 @@ class Install {
   }
 
   async install() {
-    return download
-      .downloadTemplateFromRepo(this.options.url, this.options.name)
-      .then((serviceName) => {
-        const message = [
-          `Successfully installed "${serviceName}" `,
-          `${
-            this.options.name && this.options.name !== serviceName
-              ? `as "${this.options.name}"`
-              : ''
-          }`,
-        ].join('');
-
-        this.serverless.cli.log(message);
-      });
+    const commandRunStartTime = Date.now();
+    progress.get('main').notice(`Downloading service from provided url: ${this.options.url}`);
+    const serviceName = await download.downloadTemplateFromRepo(
+      this.options.url,
+      this.options.name
+    );
+    const message = [
+      `Successfully installed "${serviceName}" `,
+      `${
+        this.options.name && this.options.name !== serviceName ? `as "${this.options.name}"` : ''
+      }`,
+    ].join('');
+
+    log.notice();
+    log.notice.success(
+      `${message} ${style.aside(`(${Math.floor((Date.now() - commandRunStartTime) / 1000)}s)`)}`
+    );
   }
 }
 
diff --git a/lib/plugins/interactiveCli/autoUpdate.js b/lib/plugins/interactiveCli/autoUpdate.js
deleted file mode 100644
index a4de55c8301..00000000000
--- a/lib/plugins/interactiveCli/autoUpdate.js
+++ /dev/null
@@ -1,38 +0,0 @@
-'use strict';
-
-const chalk = require('chalk');
-const configUtils = require('@serverless/utils/config');
-const isNpmPackageWritable = require('../../utils/npmPackage/isWritable');
-const isNpmGlobalPackage = require('../../utils/npmPackage/isGlobal');
-const { confirm } = require('./utils');
-
-module.exports = {
-  async check(serverless) {
-    if (serverless.isLocallyInstalled) return false;
-    if (!serverless.isStandaloneExecutable) {
-      if (!(await isNpmGlobalPackage())) return false;
-      if (!(await isNpmPackageWritable(serverless))) return false;
-    }
-    const autoUpdateConfig = configUtils.get('autoUpdate');
-    if (!autoUpdateConfig) return true;
-    if (autoUpdateConfig.enabled) return false;
-    return !autoUpdateConfig.isInteractiveSetupPromptDisabled;
-  },
-  async run() {
-    const isConfirmed = await confirm('Would you like the Framework to update automatically?', {
-      name: 'shouldSetupAutoUpdate',
-    });
-    if (!isConfirmed) {
-      configUtils.set('autoUpdate.isInteractiveSetupPromptDisabled', true);
-      return;
-    }
-    configUtils.set('autoUpdate.enabled', true);
-
-    process.stdout.write(
-      `\n${chalk.green(
-        'Auto updates were succesfully turned on.\n' +
-          'You may turn off at any time with "serverless config --no-autoupdate"'
-      )}\n`
-    );
-  },
-};
diff --git a/lib/plugins/interactiveCli/index.js b/lib/plugins/interactiveCli/index.js
deleted file mode 100644
index fa4b1320269..00000000000
--- a/lib/plugins/interactiveCli/index.js
+++ /dev/null
@@ -1,93 +0,0 @@
-'use strict';
-
-const inquirer = require('@serverless/utils/inquirer');
-const cliCommandsSchema = require('../../cli/commands-schema');
-const initializeService = require('./initializeService');
-const setupAws = require('./setupAws');
-const tabCompletion = require('./tabCompletion');
-const autoUpdate = require('./autoUpdate');
-
-module.exports = class InteractiveCli {
-  constructor(serverless) {
-    this.serverless = serverless;
-
-    this.commands = {
-      interactiveCli: {
-        ...cliCommandsSchema.get(''),
-        isHidden: true,
-      },
-    };
-
-    this.hooks = {
-      'initialize': () => {
-        if (!this.serverless.interactiveCli) return;
-        const { processedInput } = this.serverless;
-        // After `sls.init()`, if any external plugins are loaded, commands are re-resolved
-        // (in `scripts/serverless.js`) and that reverts patch applied in asyncInit() below.
-        // Bring it back
-        if (!processedInput.commands.length) processedInput.commands.push('interactiveCli');
-      },
-      'interactiveCli:initializeService': () => {
-        if (!initializeService.check(serverless)) return null;
-        process.stdout.write('\n');
-        return initializeService.run(serverless);
-      },
-      'interactiveCli:setupAws': () => {
-        return setupAws.check(serverless).then((isApplicable) => {
-          if (!isApplicable) return null;
-          process.stdout.write('\n');
-          return setupAws.run(serverless);
-        });
-      },
-      'interactiveCli:autoUpdate': async () => {
-        if (!(await autoUpdate.check(serverless))) return;
-        process.stdout.write('\n');
-        await autoUpdate.run(serverless);
-      },
-      'interactiveCli:tabCompletion': () => {
-        return tabCompletion.check(serverless).then((isApplicable) => {
-          if (!isApplicable) return null;
-          process.stdout.write('\n');
-          return tabCompletion.run(serverless);
-        });
-      },
-    };
-  }
-  asyncInit() {
-    /*
-     * The majority of setup is done here to allow other plugins to modify
-     * this.commands.interactiveCli.options before deciding if the CLI
-     * is in interactive mode or not.
-     */
-
-    if (!process.stdin.isTTY) return;
-
-    const { processedInput } = this.serverless;
-    if (processedInput.commands.length) return;
-    const usedOptions = new Set(Object.keys(processedInput.options));
-    const supportedOptions = new Set(Object.keys(this.commands.interactiveCli.options));
-    // --help-interactive should trigger help which is not handled from scope of this command
-    supportedOptions.delete('help-interactive');
-    // --help should trigger general help, and this command should not be considered
-    supportedOptions.delete('help');
-    // Normally this option is handled by main CLI script, still if locally installed Framework
-    // is invokved by old version which does not have such handling yet, we need below to prevent
-    // interactive CLI to jump in
-    supportedOptions.delete('version');
-
-    for (const opt of supportedOptions) usedOptions.delete(opt);
-
-    if (usedOptions.size) return;
-
-    // Enforce interactive CLI
-    processedInput.commands.push('interactiveCli');
-
-    // Expose customized inquirer, and setupAws configuration for other plugins
-    // setupAws is further customized by dashboard plugin
-    this.serverless.interactiveCli = {
-      inquirer,
-      awsSetupConfiguration: setupAws,
-      initializeServiceConfiguration: initializeService,
-    };
-  }
-};
diff --git a/lib/plugins/interactiveCli/initializeService.js b/lib/plugins/interactiveCli/initializeService.js
deleted file mode 100644
index 03a92eef1ce..00000000000
--- a/lib/plugins/interactiveCli/initializeService.js
+++ /dev/null
@@ -1,96 +0,0 @@
-'use strict';
-
-const { join } = require('path');
-const chalk = require('chalk');
-const fs = require('fs');
-const inquirer = require('@serverless/utils/inquirer');
-const resolveConfigurationPath = require('../../../lib/cli/resolve-configuration-path');
-const readConfiguration = require('../../../lib/configuration/read');
-const createFromTemplate = require('../../utils/createFromTemplate');
-const { confirm } = require('./utils');
-
-const isValidServiceName = RegExp.prototype.test.bind(/^[a-zA-Z][a-zA-Z0-9-]{0,100}$/);
-
-const initializeProjectChoices = [
-  { name: 'AWS Node.js', value: 'aws-nodejs' },
-  { name: 'AWS Python', value: 'aws-python3' },
-  { name: 'Other', value: 'other' },
-];
-
-const projectTypeChoice = async () =>
-  (
-    await inquirer.prompt({
-      message: 'What do you want to make?',
-      type: 'list',
-      name: 'projectType',
-      choices: module.exports.initializeProjectChoices,
-    })
-  ).projectType;
-
-const projectNameInput = async (workingDir) =>
-  (
-    await inquirer.prompt({
-      message: 'What do you want to call this project?',
-      type: 'input',
-      name: 'projectName',
-      validate: async (input) => {
-        input = input.trim();
-        if (!isValidServiceName(input)) {
-          return (
-            'Project name is not valid.\n' +
-            '   - It should only contain alphanumeric and hyphens.\n' +
-            '   - It should start with an alphabetic character.\n' +
-            "   - Shouldn't exceed 128 characters"
-          );
-        }
-
-        try {
-          await fs.promises.access(join(workingDir, input));
-          return `Path ${input} is already taken`;
-        } catch {
-          return true;
-        }
-      },
-    })
-  ).projectName.trim();
-
-module.exports = {
-  initializeProjectChoices,
-  check(serverless) {
-    return !serverless.serviceDir;
-  },
-  async run(serverless) {
-    const workingDir = process.cwd();
-    const isConfirmed = await confirm('No project detected. Do you want to create a new one?', {
-      name: 'shouldCreateNewProject',
-    });
-    if (!isConfirmed) return;
-    const projectType = await projectTypeChoice();
-    if (projectType === 'other') {
-      process.stdout.write(
-        '\nRun “serverless create --help” to view available templates and create a new project ' +
-          'from one of those templates.\n'
-      );
-      return;
-    }
-    const projectName = await projectNameInput(workingDir);
-    const projectDir = join(workingDir, projectName);
-    await createFromTemplate(projectType, projectDir);
-    process.stdout.write(
-      `\n${chalk.green(`Project successfully created in '${projectName}' folder.`)}\n`
-    );
-
-    process.chdir(projectDir);
-    const configurationPath = await resolveConfigurationPath();
-    serverless.serviceDir = serverless.serviceDir = projectDir;
-    serverless.configurationFilename = configurationPath.slice(serverless.serviceDir.length + 1);
-    serverless.configurationInput = await readConfiguration(configurationPath);
-    await serverless.service.load();
-    await serverless.variables.populateService();
-    serverless.service.mergeArrays();
-    serverless.service.setFunctionNames();
-    // TODO: Temporary workaround for https://github.com/serverless/serverless/issues/8257
-    serverless.service.configValidationMode = 'off';
-    await serverless.service.validate();
-  },
-};
diff --git a/lib/plugins/interactiveCli/setupAws.js b/lib/plugins/interactiveCli/setupAws.js
deleted file mode 100644
index a1dd0af421f..00000000000
--- a/lib/plugins/interactiveCli/setupAws.js
+++ /dev/null
@@ -1,123 +0,0 @@
-'use strict';
-
-const BbPromise = require('bluebird');
-const chalk = require('chalk');
-const inquirer = require('@serverless/utils/inquirer');
-const awsCredentials = require('../aws/utils/credentials');
-const { confirm } = require('./utils');
-const openBrowser = require('../../utils/openBrowser');
-
-const isValidAwsAccessKeyId = RegExp.prototype.test.bind(/^[A-Z0-9]{10,}$/);
-const isValidAwsSecretAccessKey = RegExp.prototype.test.bind(/^[a-zA-Z0-9/+]{10,}$/);
-
-const awsAccessKeyIdInput = () =>
-  inquirer
-    .prompt({
-      message: 'AWS Access Key Id:',
-      type: 'input',
-      name: 'accessKeyId',
-      validate: (input) => {
-        if (isValidAwsAccessKeyId(input.trim())) return true;
-        return 'AWS Access Key Id seems not valid.\n   Expected something like AKIAIOSFODNN7EXAMPLE';
-      },
-    })
-    .then(({ accessKeyId }) => accessKeyId.trim());
-
-const awsSecretAccessKeyInput = () =>
-  inquirer
-    .prompt({
-      message: 'AWS Secret Access Key:',
-      type: 'input',
-      name: 'secretAccessKey',
-      validate: (input) => {
-        if (isValidAwsSecretAccessKey(input.trim())) return true;
-        return (
-          'AWS Secret Access Key seems not valid.\n' +
-          '   Expected something like wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY'
-        );
-      },
-    })
-    .then(({ secretAccessKey }) => secretAccessKey.trim());
-
-const steps = {
-  writeOnSetupSkip: () =>
-    process.stdout.write(`\nYou can setup your AWS account later. More details available here:
-
-  http://slss.io/aws-creds-setup\n`),
-  shouldSetupAwsCredentials: () =>
-    confirm('Do you want to set them up now?', { name: 'shouldSetupAwsCredentials' }).then(
-      (isConfirmed) => {
-        if (!isConfirmed) steps.writeOnSetupSkip();
-        return isConfirmed;
-      }
-    ),
-  ensureAwsAccount: () =>
-    confirm('Do you have an AWS account?', { name: 'hasAwsAccount' }).then((hasAccount) => {
-      if (!hasAccount) {
-        openBrowser('https://portal.aws.amazon.com/billing/signup');
-        return inquirer.prompt({
-          message: 'Press Enter to continue after creating an AWS account',
-          name: 'createAwsAccountPrompt',
-        });
-      }
-      return null;
-    }),
-  ensureAwsCredentials: (serverless) => {
-    const region = serverless.getProvider('aws').getRegion();
-    openBrowser(
-      `https://console.aws.amazon.com/iam/home?region=${region}#/users$new?step=final&accessKey&userNames=serverless&permissionType=policies&policies=arn:aws:iam::aws:policy%2FAdministratorAccess`
-    );
-    return inquirer.prompt({
-      message: 'Press Enter to continue after creating an AWS user with access keys',
-      name: 'generateAwsCredsPrompt',
-    });
-  },
-  inputAwsCredentials: () => {
-    return awsAccessKeyIdInput().then((accessKeyId) =>
-      awsSecretAccessKeyInput().then((secretAccessKey) =>
-        awsCredentials
-          .saveFileProfiles(new Map([['default', { accessKeyId, secretAccessKey }]]))
-          .then(() =>
-            process.stdout.write(
-              `\n${chalk.green(
-                `AWS credentials saved on your machine at ${chalk.bold(
-                  process.platform === 'win32'
-                    ? '%userprofile%\\.aws\\credentials'
-                    : '~/.aws/credentials'
-                )}. Go there to change them at any time.`
-              )}\n`
-            )
-          )
-      )
-    );
-  },
-};
-
-module.exports = {
-  check(serverless) {
-    return BbPromise.try(() => {
-      if (serverless.service.provider.name !== 'aws') return false;
-      if (serverless.getProvider('aws').cachedCredentials) return false;
-      return BbPromise.all([
-        awsCredentials.resolveFileProfiles(),
-        awsCredentials.resolveEnvCredentials(),
-      ]).then(([fileProfiles, envCredentials]) => !fileProfiles.size && !envCredentials);
-    });
-  },
-  run(serverless) {
-    process.stdout.write(
-      'No AWS credentials were found on your computer, ' +
-        'you need these to host your application.\n\n'
-    );
-    return module.exports.runSteps(serverless);
-  },
-  steps,
-  runSteps: (serverless) =>
-    steps.shouldSetupAwsCredentials().then((isConfirmed) => {
-      if (!isConfirmed) return null;
-      return steps
-        .ensureAwsAccount()
-        .then(() => steps.ensureAwsCredentials(serverless))
-        .then(steps.inputAwsCredentials);
-    }),
-};
diff --git a/lib/plugins/interactiveCli/tabCompletion.js b/lib/plugins/interactiveCli/tabCompletion.js
deleted file mode 100644
index 8d35c3e2bba..00000000000
--- a/lib/plugins/interactiveCli/tabCompletion.js
+++ /dev/null
@@ -1,78 +0,0 @@
-'use strict';
-
-const path = require('path');
-const os = require('os');
-const fs = require('fs');
-const chalk = require('chalk');
-const BbPromise = require('bluebird');
-const requireUncached = require('ncjsm/require-uncached');
-const resolve = require('ncjsm/resolve/sync');
-const configUtils = require('@serverless/utils/config');
-const muteConsoleLog = require('../../utils/log/muteConsoleLog');
-const isTabTabCompletionSupported = require('../../utils/tabCompletion/isSupported');
-const tabtabOptions = require('../../utils/tabCompletion/tabtabOptions');
-const promptDisabledConfigPropertyName = require('../../utils/tabCompletion/promptDisabledConfigPropertyName');
-const inquirer = require('@serverless/utils/inquirer');
-const { confirm } = require('./utils');
-
-BbPromise.promisifyAll(fs);
-
-module.exports = {
-  check() {
-    return BbPromise.try(() => {
-      if (!isTabTabCompletionSupported) return false;
-
-      const shellExtension = require('tabtab/lib/utils/systemShell')();
-      return fs
-        .statAsync(path.resolve(os.homedir(), `.config/tabtab/serverless.${shellExtension}`))
-        .then(
-          () => false,
-          (error) => {
-            if (error.code !== 'ENOENT') throw error;
-            return !configUtils.get(promptDisabledConfigPropertyName);
-          }
-        );
-    });
-  },
-  run() {
-    return BbPromise.try(() => {
-      return confirm('Would you like to setup a command line <tab> completion?', {
-        name: 'shouldSetupTabCompletion',
-      }).then((isConfirmed) => {
-        if (!isConfirmed) {
-          configUtils.set(promptDisabledConfigPropertyName, true);
-          return null;
-        }
-
-        const promptPath = require.resolve('tabtab/lib/prompt');
-        const tabtabsInquirerPath = resolve(path.dirname(promptPath), 'inquirer').realPath;
-
-        // Hack tabtabs prompt to use our inquirer customization
-        const prompt = requireUncached([promptPath, tabtabsInquirerPath], () => {
-          require(tabtabsInquirerPath);
-          require.cache[tabtabsInquirerPath].exports = inquirer;
-          return require(promptPath);
-        });
-        const { install } = require('tabtab/lib/installer');
-        return prompt().then(({ location }) =>
-          muteConsoleLog(() =>
-            tabtabOptions.reduce(
-              (previousOperation, options) =>
-                previousOperation.then(() => install(Object.assign({ location }, options))),
-              BbPromise.resolve()
-            )
-          ).then(() =>
-            process.stdout.write(
-              `\n${chalk.green(
-                `Command line <tab> completion was successfully setup. ${chalk.bold(
-                  'Make sure to reload your SHELL'
-                )}.\n` +
-                  'You may uninstall it by running: serverless config tabcompletion uninstall'
-              )}\n`
-            )
-          )
-        );
-      });
-    });
-  },
-};
diff --git a/lib/plugins/interactiveCli/utils.js b/lib/plugins/interactiveCli/utils.js
deleted file mode 100644
index b29b060bb9c..00000000000
--- a/lib/plugins/interactiveCli/utils.js
+++ /dev/null
@@ -1,16 +0,0 @@
-'use strict';
-
-const inquirer = require('@serverless/utils/inquirer');
-
-module.exports = {
-  confirm: (message, options = {}) => {
-    const name = options.name || 'isConfirmed';
-    return inquirer
-      .prompt({
-        message,
-        type: 'confirm',
-        name,
-      })
-      .then((result) => result[name]);
-  },
-};
diff --git a/lib/plugins/invoke.js b/lib/plugins/invoke.js
index 9b39c8872d7..a9254a52cff 100644
--- a/lib/plugins/invoke.js
+++ b/lib/plugins/invoke.js
@@ -21,6 +21,9 @@ class Invoke {
     };
 
     this.hooks = {
+      'initialize': () => {
+        this.options = this.serverless.processedInput.options;
+      },
       'invoke:local:loadEnvVars': async () => BbPromise.bind(this).then(this.loadEnvVarsForLocal),
       'after:invoke:invoke': async () => BbPromise.bind(this).then(this.trackInvoke),
       'after:invoke:local:invoke': async () => BbPromise.bind(this).then(this.trackInvokeLocal),
diff --git a/lib/plugins/package/lib/packageService.js b/lib/plugins/package/lib/package-service.js
similarity index 82%
rename from lib/plugins/package/lib/packageService.js
rename to lib/plugins/package/lib/package-service.js
index 66ed9f1154f..6f5fa5512ac 100644
--- a/lib/plugins/package/lib/packageService.js
+++ b/lib/plugins/package/lib/package-service.js
@@ -1,10 +1,13 @@
 'use strict';
 
 const path = require('path');
+const fsp = require('fs').promises;
 const globby = require('globby');
 const _ = require('lodash');
 const micromatch = require('micromatch');
 const ServerlessError = require('../../../serverless-error');
+const parseS3URI = require('../../aws/utils/parse-s3-uri');
+const { log } = require('@serverless/utils/log');
 
 module.exports = {
   defaultExcludes: [
@@ -36,7 +39,10 @@ module.exports = {
     const pluginsLocalPath = this.serverless.pluginManager.parsePluginsObject(
       this.serverless.service.plugins
     ).localPath;
-    const localPathExcludes = pluginsLocalPath ? [pluginsLocalPath] : [];
+    const localPathExcludes = [];
+    if (pluginsLocalPath) {
+      localPathExcludes.push(pluginsLocalPath);
+    }
     // add layer paths
     const layerExcludes = excludeLayers
       ? this.serverless.service
@@ -64,7 +70,6 @@ module.exports = {
   },
 
   async packageService() {
-    this.serverless.cli.log('Packaging service...');
     let shouldPackageService = false;
     const allFunctions = this.serverless.service.getAllFunctions();
     let packagePromises = allFunctions.map(async (functionName) => {
@@ -72,10 +77,24 @@ module.exports = {
       if (functionObject.image) return;
       functionObject.package = functionObject.package || {};
       if (functionObject.package.disable) {
-        this.serverless.cli.log(`Packaging disabled for function: "${functionName}"`);
+        log.info(`Packaging disabled for function: "${functionName}"`);
         return;
       }
-      if (functionObject.package.artifact) return;
+      if (functionObject.package.artifact) {
+        if (parseS3URI(functionObject.package.artifact)) return;
+        try {
+          await fsp.access(
+            path.resolve(this.serverless.serviceDir, functionObject.package.artifact)
+          );
+          return;
+        } catch (error) {
+          throw new ServerlessError(
+            'Cannot access package artifact at ' +
+              `"${functionObject.package.artifact}" (for "${functionName}"): ${error.message}`,
+            'INVALID_PACKAGE_ARTIFACT_PATH'
+          );
+        }
+      }
       if (functionObject.package.individually || this.serverless.service.package.individually) {
         await this.packageFunction(functionName);
         return;
@@ -93,10 +112,27 @@ module.exports = {
     );
 
     await Promise.all(packagePromises);
-    if (shouldPackageService && !this.serverless.service.package.artifact) await this.packageAll();
+    if (shouldPackageService) {
+      if (this.serverless.service.package.artifact) {
+        if (parseS3URI(this.serverless.service.package.artifact)) return;
+        try {
+          await fsp.access(
+            path.resolve(this.serverless.serviceDir, this.serverless.service.package.artifact)
+          );
+          return;
+        } catch (error) {
+          throw new ServerlessError(
+            'Cannot access package artifact at ' +
+              `"${this.serverless.service.package.artifact}": ${error.message}`,
+            'INVALID_PACKAGE_ARTIFACT_PATH'
+          );
+        }
+      }
+      await this.packageAll();
+    }
   },
 
-  packageAll() {
+  async packageAll() {
     const zipFileName = `${this.serverless.service.service}.zip`;
 
     return this.resolveFilePathsAll().then((filePaths) =>
@@ -145,7 +181,7 @@ module.exports = {
     return artifactPath;
   },
 
-  packageLayer(layerName) {
+  async packageLayer(layerName) {
     const layerObject = this.serverless.service.getLayer(layerName);
 
     const zipFileName = `${layerName}.zip`;
@@ -169,6 +205,7 @@ module.exports = {
       await this.excludeDevDependencies({
         exclude: this.getExcludes([], true),
         include: this.getIncludes(),
+        contextName: 'service package',
       })
     );
   },
@@ -184,6 +221,7 @@ module.exports = {
           ...(funcPackageConfig.include || []),
           ...(funcPackageConfig.patterns || []),
         ]),
+        contextName: `function "${functionName}"`,
       })
     );
   },
@@ -199,12 +237,13 @@ module.exports = {
           ...(layerPackageConfig.include || []),
           ...(layerPackageConfig.patterns || []),
         ]),
+        contextName: `layer "${layerName}"`,
       }),
       layerObject.path
     );
   },
 
-  resolveFilePathsFromPatterns(params, prefix) {
+  async resolveFilePathsFromPatterns(params, prefix) {
     const patterns = [];
     const devDependencyExcludeSet = params.devDependencyExcludeSet || new Set();
 
@@ -260,7 +299,7 @@ module.exports = {
         .filter((r) => r[1] === true)
         .map((r) => r[0]);
       if (filePaths.length !== 0) return filePaths;
-      throw new ServerlessError('No file matches include / exclude patterns');
+      throw new ServerlessError('No file matches include / exclude patterns', 'NO_MATCHED_FILES');
     });
   },
 };
diff --git a/lib/plugins/package/lib/zipService.js b/lib/plugins/package/lib/zip-service.js
similarity index 93%
rename from lib/plugins/package/lib/zipService.js
rename to lib/plugins/package/lib/zip-service.js
index 8271ab45f68..94ecfa8c85c 100644
--- a/lib/plugins/package/lib/zipService.js
+++ b/lib/plugins/package/lib/zip-service.js
@@ -10,6 +10,7 @@ const childProcess = BbPromise.promisifyAll(require('child_process'));
 const globby = require('globby');
 const _ = require('lodash');
 const ServerlessError = require('../../../serverless-error');
+const { log } = require('@serverless/utils/log');
 
 const excludeNodeDevDependenciesMemoized = _.memoize(excludeNodeDevDependencies);
 
@@ -32,7 +33,11 @@ module.exports = {
     }
 
     if (excludeDevDependencies) {
-      this.serverless.cli.log('Excluding development dependencies...');
+      if (params.contextName) {
+        log.info(`Excluding development dependencies for ${params.contextName}`);
+      } else {
+        log.info('Excluding development dependencies');
+      }
 
       const exAndInNode = await excludeNodeDevDependenciesMemoized(serviceDir);
       params.exclude = _.union(params.exclude, exAndInNode.exclude);
@@ -44,7 +49,7 @@ module.exports = {
     return params;
   },
 
-  zip(params) {
+  async zip(params) {
     return this.resolveFilePathsFromPatterns(params).then((filePaths) =>
       this.zipFiles(filePaths, params.zipFileName)
     );
@@ -56,9 +61,9 @@ module.exports = {
    * @param zipFiles - the filename to save the zip at
    * @param prefix - a prefix to strip from the file names. use for layers support
    */
-  zipFiles(files, zipFileName, prefix) {
+  async zipFiles(files, zipFileName, prefix) {
     if (files.length === 0) {
-      const error = new ServerlessError('No files to package');
+      const error = new ServerlessError('No files to package', 'NO_FILES_TO_PACKAGE');
       return BbPromise.reject(error);
     }
 
@@ -103,7 +108,7 @@ module.exports = {
     });
   },
 
-  getFileContentAndStat(filePath) {
+  async getFileContentAndStat(filePath) {
     const fullPath = path.resolve(this.serverless.serviceDir, filePath);
 
     return BbPromise.all([
@@ -117,7 +122,10 @@ module.exports = {
         filePath,
       }),
       (error) => {
-        throw new ServerlessError(`Cannot read file ${filePath} due to: ${error.message}`);
+        throw new ServerlessError(
+          `Cannot read file ${filePath} due to: ${error.message}`,
+          'CANNOT_READ_FILE'
+        );
       }
     );
   },
@@ -128,7 +136,7 @@ module.exports = {
   },
 };
 
-function excludeNodeDevDependencies(serviceDir) {
+async function excludeNodeDevDependencies(serviceDir) {
   const exAndIn = {
     include: [],
     exclude: [],
diff --git a/lib/plugins/package/package.js b/lib/plugins/package/package.js
index 18d525478f8..ca14258cc5d 100644
--- a/lib/plugins/package/package.js
+++ b/lib/plugins/package/package.js
@@ -2,9 +2,10 @@
 
 const BbPromise = require('bluebird');
 const path = require('path');
+const ServerlessError = require('../../serverless-error');
 const cliCommandsSchema = require('../../cli/commands-schema');
-const zipService = require('./lib/zipService');
-const packageService = require('./lib/packageService');
+const zipService = require('./lib/zip-service');
+const packageService = require('./lib/package-service');
 
 class Package {
   constructor(serverless, options) {
@@ -32,32 +33,35 @@ class Package {
 
     this.hooks = {
       'initialize': () => {
-        const useIncludeExclude = (packageConfig = {}) =>
+        const usesIncludeOrExclude = (packageConfig = {}) =>
           packageConfig.include || packageConfig.exclude;
-        const servicePackage = this.serverless.service.package || {};
+
         if (
-          useIncludeExclude(servicePackage) ||
+          usesIncludeOrExclude(this.serverless.service.package || {}) ||
           Object.values(this.serverless.service.functions).some((func) =>
-            useIncludeExclude(func.package)
+            usesIncludeOrExclude(func.package)
           ) ||
           Object.values(this.serverless.service.layers || {}).some((func) =>
-            useIncludeExclude(func.package)
+            usesIncludeOrExclude(func.package)
           )
         ) {
           this.serverless._logDeprecation(
-            'NEW_PACKAGE_PATTERNS',
-            'Support for "package.include" and "package.exclude" will be removed with next major release. Please use "package.patterns" instead'
+            'PACKAGE_PATTERNS',
+            'Support for "package.include" and "package.exclude" will be removed in the next' +
+              ' major release. Please use "package.patterns" instead'
           );
         }
       },
-      'package:createDeploymentArtifacts': () => BbPromise.bind(this).then(this.packageService),
+      'package:createDeploymentArtifacts': async () =>
+        BbPromise.bind(this).then(this.packageService),
 
-      'package:function:package': () => {
+      'package:function:package': async () => {
         if (this.options.function) {
-          this.serverless.cli.log(`Packaging function: ${this.options.function}...`);
           return BbPromise.resolve(this.packageFunction(this.options.function));
         }
-        return BbPromise.reject(new Error('Function name must be set'));
+        return BbPromise.reject(
+          new ServerlessError('Function name must be set', 'PACKAGE_MISSING_FUNCTION_OPTION')
+        );
       },
     };
   }
diff --git a/lib/plugins/plugin/install.js b/lib/plugins/plugin/install.js
deleted file mode 100644
index cdabafd8a50..00000000000
--- a/lib/plugins/plugin/install.js
+++ /dev/null
@@ -1,171 +0,0 @@
-'use strict';
-
-const BbPromise = require('bluebird');
-const childProcess = BbPromise.promisifyAll(require('child_process'));
-const fse = require('fs-extra');
-const path = require('path');
-const _ = require('lodash');
-const cliCommandsSchema = require('../../cli/commands-schema');
-const yamlAstParser = require('../../utils/yamlAstParser');
-const fileExists = require('../../utils/fs/fileExists');
-const pluginUtils = require('./lib/utils');
-const npmCommandDeferred = require('../../utils/npm-command-deferred');
-
-class PluginInstall {
-  constructor(serverless, options) {
-    this.serverless = serverless;
-    this.options = options;
-
-    Object.assign(this, pluginUtils);
-
-    this.commands = {
-      plugin: {
-        commands: {
-          install: {
-            ...cliCommandsSchema.get('plugin install'),
-          },
-        },
-      },
-    };
-    this.hooks = {
-      'plugin:install:install': () => BbPromise.bind(this).then(this.install),
-    };
-  }
-
-  install() {
-    const pluginInfo = pluginUtils.getPluginInfo(this.options.name);
-    this.options.pluginName = pluginInfo[0];
-    this.options.pluginVersion = pluginInfo[1] || 'latest';
-
-    return BbPromise.bind(this)
-      .then(this.validate)
-      .then(this.getPlugins)
-      .then((plugins) => {
-        const plugin = plugins.find((item) => item.name === this.options.pluginName);
-        if (!plugin) {
-          this.serverless.cli.log('Plugin not found in serverless registry, continuing to install');
-        }
-        return BbPromise.bind(this)
-          .then(this.pluginInstall)
-          .then(this.addPluginToServerlessFile)
-          .then(this.installPeerDependencies)
-          .then(() => {
-            const message = [
-              'Successfully installed',
-              ` "${this.options.pluginName}@${this.options.pluginVersion}"`,
-            ].join('');
-            this.serverless.cli.log(message);
-          });
-      });
-  }
-
-  pluginInstall() {
-    const serviceDir = this.serverless.serviceDir;
-    const packageJsonFilePath = path.join(serviceDir, 'package.json');
-
-    return fileExists(packageJsonFilePath)
-      .then((exists) => {
-        // check if package.json is already present. Otherwise create one
-        if (!exists) {
-          this.serverless.cli.log('Creating an empty package.json file in your service directory');
-
-          const packageJsonFileContent = {
-            name: this.serverless.service.service,
-            description: '',
-            version: '0.1.0',
-            dependencies: {},
-            devDependencies: {},
-          };
-          return fse.writeJson(packageJsonFilePath, packageJsonFileContent);
-        }
-        return BbPromise.resolve();
-      })
-      .then(() => {
-        // install the package through npm
-        const pluginFullName = `${this.options.pluginName}@${this.options.pluginVersion}`;
-        const message = [
-          `Installing plugin "${pluginFullName}"`,
-          ' (this might take a few seconds...)',
-        ].join('');
-        this.serverless.cli.log(message);
-        return this.npmInstall(pluginFullName);
-      });
-  }
-
-  async addPluginToServerlessFile() {
-    const serverlessFilePath = this.getServerlessFilePath();
-    const fileExtension = path.extname(serverlessFilePath);
-    if (fileExtension === '.js' || fileExtension === '.ts') {
-      this.serverless.cli.log(`
-          Can't automatically add plugin into "${path.basename(serverlessFilePath)}" file.
-          Please make it manually.
-        `);
-      return;
-    }
-
-    const checkIsArrayPluginsObject = (pluginsObject) =>
-      pluginsObject == null || Array.isArray(pluginsObject);
-    // pluginsObject type determined based on the value loaded during the serverless init.
-    if (_.last(serverlessFilePath.split('.')) === 'json') {
-      const serverlessFileObj = await fse.readJson(serverlessFilePath);
-      const newServerlessFileObj = serverlessFileObj;
-      const isArrayPluginsObject = checkIsArrayPluginsObject(newServerlessFileObj.plugins);
-      // null modules property is not supported
-      let plugins = isArrayPluginsObject
-        ? newServerlessFileObj.plugins || []
-        : newServerlessFileObj.plugins.modules;
-
-      if (plugins == null) {
-        throw new Error('plugins modules property must be present');
-      }
-
-      plugins.push(this.options.pluginName);
-      plugins = _.sortedUniq(plugins);
-
-      if (isArrayPluginsObject) {
-        newServerlessFileObj.plugins = plugins;
-      } else {
-        newServerlessFileObj.plugins.modules = plugins;
-      }
-
-      await fse.writeJson(serverlessFilePath, newServerlessFileObj);
-      return;
-    }
-
-    const serverlessFileObj = await this.serverless.yamlParser.parse(serverlessFilePath);
-    await yamlAstParser.addNewArrayItem(
-      serverlessFilePath,
-      checkIsArrayPluginsObject(serverlessFileObj.plugins) ? 'plugins' : 'plugins.modules',
-      this.options.pluginName
-    );
-  }
-
-  installPeerDependencies() {
-    const pluginPackageJsonFilePath = path.join(
-      this.serverless.serviceDir,
-      'node_modules',
-      this.options.pluginName,
-      'package.json'
-    );
-    return fse.readJson(pluginPackageJsonFilePath).then((pluginPackageJson) => {
-      if (pluginPackageJson.peerDependencies) {
-        const pluginsArray = [];
-        Object.entries(pluginPackageJson.peerDependencies).forEach(([k, v]) => {
-          pluginsArray.push(`${k}@"${v}"`);
-        });
-        return BbPromise.map(pluginsArray, this.npmInstall);
-      }
-      return BbPromise.resolve();
-    });
-  }
-
-  npmInstall(name) {
-    return npmCommandDeferred.then((npmCommand) =>
-      childProcess.execAsync(`${npmCommand} install --save-dev ${name}`, {
-        stdio: 'ignore',
-      })
-    );
-  }
-}
-
-module.exports = PluginInstall;
diff --git a/lib/plugins/plugin/lib/utils.js b/lib/plugins/plugin/lib/utils.js
index 1b86613029c..ee8d00d5430 100644
--- a/lib/plugins/plugin/lib/utils.js
+++ b/lib/plugins/plugin/lib/utils.js
@@ -1,31 +1,14 @@
 'use strict';
 
-const path = require('path');
 const fetch = require('node-fetch');
 const BbPromise = require('bluebird');
 const HttpsProxyAgent = require('https-proxy-agent');
 const url = require('url');
-const chalk = require('chalk');
 const _ = require('lodash');
-const ServerlessError = require('../../../serverless-error');
+const { log, writeText, style } = require('@serverless/utils/log');
 
 module.exports = {
-  validate() {
-    if (!this.serverless.serviceDir) {
-      throw new ServerlessError('This command can only be run inside a service directory');
-    }
-
-    return BbPromise.resolve();
-  },
-
-  getServerlessFilePath() {
-    if (this.serverless.configurationFilename) {
-      return path.resolve(this.serverless.serviceDir, this.serverless.configurationFilename);
-    }
-    throw new ServerlessError('Could not find any serverless service definition file.');
-  },
-
-  getPlugins() {
+  async getPlugins() {
     const endpoint = 'https://raw.githubusercontent.com/serverless/plugins/master/plugins.json';
 
     // Use HTTPS Proxy (Optional)
@@ -49,37 +32,24 @@ module.exports = {
       .then((json) => json);
   },
 
-  getPluginInfo(name) {
-    let pluginInfo;
-    if (name.startsWith('@')) {
-      pluginInfo = name.slice(1).split('@', 2);
-      pluginInfo[0] = `@${pluginInfo[0]}`;
-    } else {
-      pluginInfo = name.split('@', 2);
-    }
-    return pluginInfo;
-  },
-
-  display(plugins) {
-    let message = '';
+  async display(plugins) {
     if (plugins && plugins.length) {
       // order plugins by name
       const orderedPlugins = _.orderBy(plugins, ['name'], ['asc']);
       orderedPlugins.forEach((plugin) => {
-        message += `${chalk.yellow.underline(plugin.name)} - ${plugin.description}\n`;
+        writeText(`${style.title(plugin.name)} ${style.aside(plugin.description)}`);
       });
-      // remove last two newlines for a prettier output
-      message = message.slice(0, -2);
-      this.serverless.cli.consoleLog(message);
-      this.serverless.cli.consoleLog(`
-To install a plugin run 'serverless plugin install --name plugin-name-here'
-
-It will be automatically downloaded and added to your package.json and serverless.yml file
-      `);
+      writeText(
+        null,
+        'Install a plugin by running:',
+        '  serverless plugin install --name ...',
+        null,
+        'It will be automatically downloaded and added to package.json and serverless.yml'
+      );
     } else {
-      message = 'There are no plugins available to display';
-      this.serverless.cli.consoleLog(message);
+      log.notice.skip('There are no plugins available to display');
     }
-    return BbPromise.resolve(message);
+
+    return BbPromise.resolve();
   },
 };
diff --git a/lib/plugins/plugin/list.js b/lib/plugins/plugin/list.js
index a311aa9a2d7..6a342b98490 100644
--- a/lib/plugins/plugin/list.js
+++ b/lib/plugins/plugin/list.js
@@ -22,11 +22,11 @@ class PluginList {
     };
 
     this.hooks = {
-      'plugin:list:list': () => BbPromise.bind(this).then(this.list),
+      'plugin:list:list': async () => BbPromise.bind(this).then(this.list),
     };
   }
 
-  list() {
+  async list() {
     return BbPromise.bind(this)
       .then(this.getPlugins)
       .then((plugins) => this.display(plugins));
diff --git a/lib/plugins/plugin/search.js b/lib/plugins/plugin/search.js
index d69b2f466f9..46bff0910fe 100644
--- a/lib/plugins/plugin/search.js
+++ b/lib/plugins/plugin/search.js
@@ -1,7 +1,7 @@
 'use strict';
 
 const BbPromise = require('bluebird');
-const chalk = require('chalk');
+const { log } = require('@serverless/utils/log');
 const cliCommandsSchema = require('../../cli/commands-schema');
 const pluginUtils = require('./lib/utils');
 
@@ -23,11 +23,11 @@ class PluginSearch {
     };
 
     this.hooks = {
-      'plugin:search:search': () => BbPromise.bind(this).then(this.search),
+      'plugin:search:search': async () => BbPromise.bind(this).then(this.search),
     };
   }
 
-  search() {
+  async search() {
     return BbPromise.bind(this)
       .then(this.getPlugins)
       .then((plugins) => {
@@ -41,8 +41,8 @@ class PluginSearch {
         // print a message with the search result
         const pluginCount = filteredPlugins.length;
         const query = this.options.query;
-        const message = `${pluginCount} plugin(s) found for your search query "${query}"\n`;
-        this.serverless.cli.consoleLog(chalk.yellow(message));
+        log.notice(`${pluginCount} plugin(s) found matching "${query}":`);
+        log.notice();
 
         return filteredPlugins;
       })
diff --git a/lib/plugins/plugin/uninstall.js b/lib/plugins/plugin/uninstall.js
deleted file mode 100644
index 64e9a6efb40..00000000000
--- a/lib/plugins/plugin/uninstall.js
+++ /dev/null
@@ -1,135 +0,0 @@
-'use strict';
-
-const BbPromise = require('bluebird');
-const childProcess = BbPromise.promisifyAll(require('child_process'));
-const fse = require('fs-extra');
-const path = require('path');
-const _ = require('lodash');
-const cliCommandsSchema = require('../../cli/commands-schema');
-const yamlAstParser = require('../../utils/yamlAstParser');
-const pluginUtils = require('./lib/utils');
-
-class PluginUninstall {
-  constructor(serverless, options) {
-    this.serverless = serverless;
-    this.options = options;
-
-    Object.assign(this, pluginUtils);
-
-    this.commands = {
-      plugin: {
-        commands: {
-          uninstall: {
-            ...cliCommandsSchema.get('plugin uninstall'),
-          },
-        },
-      },
-    };
-
-    this.hooks = {
-      'plugin:uninstall:uninstall': () => BbPromise.bind(this).then(this.uninstall),
-    };
-  }
-
-  uninstall() {
-    const pluginInfo = pluginUtils.getPluginInfo(this.options.name);
-    this.options.pluginName = pluginInfo[0];
-
-    return BbPromise.bind(this)
-      .then(this.validate)
-      .then(this.getPlugins)
-      .then((plugins) => {
-        const plugin = plugins.find((item) => item.name === this.options.pluginName);
-        if (!plugin) {
-          this.serverless.cli.log(
-            'Plugin not found in serverless registry, continuing to uninstall'
-          );
-        }
-        return BbPromise.bind(this)
-          .then(this.uninstallPeerDependencies)
-          .then(this.pluginUninstall)
-          .then(this.removePluginFromServerlessFile)
-          .then(() => {
-            this.serverless.cli.log(`Successfully uninstalled "${this.options.pluginName}"`);
-            return BbPromise.resolve();
-          });
-      });
-  }
-
-  pluginUninstall() {
-    this.serverless.cli.log(
-      `Uninstalling plugin "${this.options.pluginName}" (this might take a few seconds...)`
-    );
-    return this.npmUninstall(this.options.pluginName);
-  }
-
-  async removePluginFromServerlessFile() {
-    const serverlessFilePath = this.getServerlessFilePath();
-    const fileExtension = path.extname(serverlessFilePath);
-    if (fileExtension === '.js' || fileExtension === '.ts') {
-      this.serverless.cli.log(`
-          Can't automatically remove plugin from "serverless.js" file.
-          Please make it manually.
-        `);
-      return;
-    }
-
-    if (_.last(serverlessFilePath.split('.')) === 'json') {
-      const serverlessFileObj = await fse.readJson(serverlessFilePath);
-      const isArrayPluginsObject = Array.isArray(serverlessFileObj.plugins);
-      const plugins = isArrayPluginsObject
-        ? serverlessFileObj.plugins
-        : serverlessFileObj.plugins && serverlessFileObj.plugins.modules;
-
-      if (plugins) {
-        _.pull(plugins, this.options.pluginName);
-        if (!plugins.length) {
-          if (isArrayPluginsObject) {
-            delete serverlessFileObj.plugins;
-          } else {
-            delete serverlessFileObj.plugins.modules;
-          }
-        }
-        await fse.writeJson(serverlessFilePath, serverlessFileObj);
-      }
-      return;
-    }
-
-    const serverlessFileObj = await this.serverless.yamlParser.parse(serverlessFilePath);
-    await yamlAstParser.removeExistingArrayItem(
-      serverlessFilePath,
-      Array.isArray(serverlessFileObj.plugins) ? 'plugins' : 'plugins.modules',
-      this.options.pluginName
-    );
-  }
-
-  uninstallPeerDependencies() {
-    const pluginPackageJsonFilePath = path.join(
-      this.serverless.serviceDir,
-      'node_modules',
-      this.options.pluginName,
-      'package.json'
-    );
-    return fse
-      .readJson(pluginPackageJsonFilePath)
-      .then((pluginPackageJson) => {
-        if (pluginPackageJson.peerDependencies) {
-          const pluginsArray = [];
-          Object.keys(pluginPackageJson.peerDependencies).forEach((k) => {
-            pluginsArray.push(k);
-          });
-          return BbPromise.map(pluginsArray, this.npmUninstall);
-        }
-        return BbPromise.resolve();
-      })
-      .catch(() => BbPromise.resolve());
-  }
-
-  npmUninstall(name) {
-    return childProcess.execAsync(`npm uninstall --save-dev ${name}`, {
-      stdio: 'ignore',
-    });
-  }
-}
-
-module.exports = PluginUninstall;
diff --git a/lib/plugins/print.js b/lib/plugins/print.js
index 0761fed4167..3d30338a435 100644
--- a/lib/plugins/print.js
+++ b/lib/plugins/print.js
@@ -6,6 +6,7 @@ const jc = require('json-cycle');
 const yaml = require('js-yaml');
 const ServerlessError = require('../serverless-error');
 const cliCommandsSchema = require('../cli/commands-schema');
+const { writeText } = require('@serverless/utils/log');
 
 class Print {
   constructor(serverless, options) {
@@ -23,75 +24,8 @@ class Print {
     };
   }
 
-  adorn(serviceConfig) {
-    // service object treatment
-    this.cache.serviceService = serviceConfig.service;
-    if (_.isObject(this.cache.serviceService)) {
-      serviceConfig.service = serviceConfig.service.name;
-      serviceConfig.serviceObject = this.cache.serviceService;
-    }
-    // provider treatment and defaults
-    this.cache.serviceProvider = serviceConfig.provider;
-    if (typeof this.cache.serviceProvider === 'string') {
-      serviceConfig.provider = { name: this.cache.serviceProvider };
-    }
-    const serviceProvider = this.serverless.service.provider;
-    serviceConfig.provider = _.merge(
-      {
-        stage: serviceProvider.stage,
-        region: serviceProvider.region,
-        variableSyntax: serviceProvider.variableSyntax,
-      },
-      serviceConfig.provider
-    );
-  }
-  strip(serviceConfig) {
-    if (_.isObject(this.cache.serviceService)) {
-      serviceConfig.service = this.cache.serviceService;
-      delete serviceConfig.serviceObject;
-    }
-    if (typeof this.cache.serviceProvider === 'string') {
-      serviceConfig.provider = this.cache.serviceProvider;
-    } else {
-      // is object
-      if (!this.cache.serviceProvider.stage) {
-        delete serviceConfig.provider.stage;
-      }
-      if (!this.cache.serviceProvider.region) {
-        delete serviceConfig.provider.region;
-      }
-      if (this.cache.serviceProvider.variableSyntax) {
-        serviceConfig.provider.variableSyntax = this.cache.serviceProvider.variableSyntax;
-      }
-    }
-  }
   async print() {
-    // #####################################################################
-    // ## KEEP SYNCHRONIZED WITH EQUIVALENT IN ~/lib/classes/Variables.js ##
-    // ##   there, see `populateService`                                  ##
-    // ##   here, see below                                               ##
-    // #####################################################################
-    // ###################################################################
-    // ## KEEP SYNCHRONIZED WITH EQUIVALENT IN ~/lib/classes/Service.js ##
-    // ##   there, see `constructor` and `loadServiceFileParam`         ##
-    // ##   here, see `strip` and `adorn`                               ##
-    // ###################################################################
-    // The *already loaded* Service (i.e. serverless.yml) is adorned with extras for use by the
-    // framework and throughout its codebase.  We could try using the populated service but that
-    // would require playing whack-a-mole on issues as changes are made to the service anywhere in
-    // the codebase.  Avoiding that, this method must read the serverless.yml file itself, adorn it
-    // as the Service class would and then populate it, reversing the adornments thereafter in
-    // preparation for printing the service for the user.
-    const svc = this.serverless.configurationInput;
-    const service = svc;
-    this.adorn(service);
-    // Need to delete variableSyntax to avoid self-matching errors
-    this.serverless.variables.loadVariableSyntax();
-    delete service.provider.variableSyntax; // cached by adorn, restored by strip
-    this.serverless.variables.service = service;
-    const populated = await this.serverless.variables.populateObject(service);
-    let conf = populated;
-    this.strip(conf);
+    let conf = this.serverless.configurationInput;
 
     // dig into the object
     if (this.options.path) {
@@ -100,7 +34,10 @@ class Print {
         conf = conf[step];
 
         if (!conf) {
-          throw new ServerlessError(`Path "${this.options.path}" not found`);
+          throw new ServerlessError(
+            `Path "${this.options.path}" not found`,
+            'INVALID_PATH_ARGUMENT'
+          );
         }
       }
     }
@@ -110,7 +47,7 @@ class Print {
       if (this.options.transform === 'keys') {
         conf = Object.keys(conf);
       } else {
-        throw new ServerlessError('Transform can only be "keys"');
+        throw new ServerlessError('Transform can only be "keys"', 'INVALID_TRANSFORM');
       }
     }
 
@@ -123,7 +60,10 @@ class Print {
         out = conf.join(os.EOL);
       } else {
         if (_.isObject(conf)) {
-          throw new ServerlessError('Cannot print an object as "text"');
+          throw new ServerlessError(
+            'Cannot print an object as "text"',
+            'PRINT_INVALID_OBJECT_AS_TEXT'
+          );
         }
 
         out = String(conf);
@@ -133,10 +73,10 @@ class Print {
     } else if (format === 'yaml') {
       out = yaml.dump(JSON.parse(jc.stringify(conf)), { noRefs: true });
     } else {
-      throw new ServerlessError('Format must be "yaml", "json" or "text"');
+      throw new ServerlessError('Format must be "yaml", "json" or "text"', 'PRINT_INVALID_FORMAT');
     }
 
-    this.serverless.cli.consoleLog(out);
+    writeText(out);
   }
 }
 
diff --git a/lib/plugins/slstats.js b/lib/plugins/slstats.js
index 1cb0120a599..b7447447185 100644
--- a/lib/plugins/slstats.js
+++ b/lib/plugins/slstats.js
@@ -2,6 +2,7 @@
 
 const config = require('@serverless/utils/config');
 const cliCommandsSchema = require('../cli/commands-schema');
+const { log } = require('@serverless/utils/log');
 
 class SlStats {
   constructor(serverless, options) {
@@ -23,23 +24,13 @@ class SlStats {
     const enableStats = this.options.enable && !this.options.disable;
     const disabledStats = this.options.disable && !this.options.enable;
     if (enableStats) {
-      try {
-        // set .serverlessrc config
-        config.set('trackingDisabled', false);
-        this.serverless.cli.log('Stats successfully enabled');
-      } catch (error) {
-        const message = error;
-        throw new Error(`Enabling / Disabling of statistics failed: ${message}`);
-      }
+      // set .serverlessrc config
+      config.set('trackingDisabled', false);
+      log.notice.success('Stats successfully enabled');
     } else if (disabledStats) {
-      try {
-        // set .serverlessrc config
-        config.set('trackingDisabled', true);
-        this.serverless.cli.log('Stats successfully disabled');
-      } catch (error) {
-        const message = error;
-        throw new Error(`Enabling / Disabling of statistics failed: ${message}`);
-      }
+      // set .serverlessrc config
+      config.set('trackingDisabled', true);
+      log.notice.success('Stats successfully disabled');
     }
   }
 }
diff --git a/lib/plugins/standalone.js b/lib/plugins/standalone.js
index edd9bfbde0d..7da77899d84 100644
--- a/lib/plugins/standalone.js
+++ b/lib/plugins/standalone.js
@@ -1,12 +1,14 @@
 'use strict';
 
 const fs = require('fs');
+const fsp = require('fs').promises;
 const os = require('os');
 const path = require('path');
 const stream = require('stream');
 const { promisify } = require('util');
 const fse = require('fs-extra');
 const fetch = require('node-fetch');
+const { log, progress, style } = require('@serverless/utils/log');
 const currentVersion = require('../../package').version;
 const ServerlessError = require('../serverless-error');
 const standaloneUtils = require('../utils/standalone');
@@ -17,6 +19,7 @@ const pipeline = promisify(stream.pipeline);
 const BINARY_TMP_PATH = path.resolve(os.tmpdir(), 'serverless-binary-tmp');
 
 const BINARY_PATH = standaloneUtils.path;
+const mainProgress = progress.get('main');
 
 module.exports = class Standalone {
   constructor(serverless, cliOptions) {
@@ -39,10 +42,18 @@ module.exports = class Standalone {
   }
 
   async upgrade() {
+    mainProgress.notice('Resolving latest standalone version', { isMainEvent: true });
     const tagName = await standaloneUtils.resolveLatestTag();
     const latestVersion = tagName.slice(1);
     if (latestVersion === currentVersion) {
-      this.serverless.cli.log('Already at latest version');
+      log.notice();
+      log.notice.skip(
+        `Already at latest version ${style.aside(
+          `(${Math.floor(
+            (Date.now() - this.serverless.pluginManager.commandRunStartTime) / 1000
+          )}s)`
+        )}`
+      );
       return;
     }
     const currentMajor = Number(currentVersion.split('.')[0]);
@@ -57,27 +68,40 @@ module.exports = class Standalone {
           'Note: Service is safe to upgrade if no deprecations are logged during its deployment.',
           `      Check https://github.com/serverless/serverless/releases/tag/v${latestMajor}.0.0 ` +
             'for list of all breaking changes',
-        ].join('\n')
+        ].join('\n'),
+        'CANNOT_UPGRADE_MAJOR'
       );
     }
-    this.serverless.cli.log('Downloading new version...');
+    mainProgress.notice('Downloading latest standalone version', { isMainEvent: true });
     const executableUrl = standaloneUtils.resolveUrl(tagName);
     const standaloneResponse = await fetch(executableUrl);
     if (!standaloneResponse.ok) {
       throw new ServerlessError(
         'Sorry unable to `upgrade` at this point ' +
-          `(server rejected request with ${standaloneResponse.status})`
+          `(server rejected request with ${standaloneResponse.status})`,
+        'UPGRADE_ERROR'
       );
     }
     await fse.remove(BINARY_TMP_PATH);
     await pipeline(standaloneResponse.body, fs.createWriteStream(BINARY_TMP_PATH));
-    await fse.rename(BINARY_TMP_PATH, BINARY_PATH);
-    await fse.chmod(BINARY_PATH, 0o755);
-    this.serverless.cli.log(`Successfully upgraded to ${tagName}`);
+    await fsp.rename(BINARY_TMP_PATH, BINARY_PATH);
+    await fsp.chmod(BINARY_PATH, 0o755);
+    log.notice();
+    log.notice.success(
+      `Successfully upgraded to ${tagName} ${style.aside(
+        `(${Math.floor((Date.now() - this.serverless.pluginManager.commandRunStartTime) / 1000)}s)`
+      )}`
+    );
   }
 
   async uninstall() {
+    mainProgress.notice('Uninstalling standalone binary', { isMainEvent: true });
     await fse.remove(path.dirname(BINARY_PATH));
-    this.serverless.cli.log('Uninstalled');
+    log.notice();
+    log.notice.success(
+      `Standalone binary uninstalled ${style.aside(
+        `(${Math.floor((Date.now() - this.serverless.pluginManager.commandRunStartTime) / 1000)}s)`
+      )}`
+    );
   }
 };
diff --git a/lib/serverless-error.js b/lib/serverless-error.js
index 4ec68c686e9..ec2db0f36d7 100644
--- a/lib/serverless-error.js
+++ b/lib/serverless-error.js
@@ -1,9 +1,10 @@
 'use strict';
 
 class ServerlessError extends Error {
-  constructor(message, code) {
+  constructor(message, code, options = {}) {
     super(message);
     this.code = code;
+    this.decoratedMessage = options.decoratedMessage;
   }
 }
 
diff --git a/lib/serverless.js b/lib/serverless.js
new file mode 100644
index 00000000000..09f1522883f
--- /dev/null
+++ b/lib/serverless.js
@@ -0,0 +1,212 @@
+'use strict';
+
+const path = require('path');
+const os = require('os');
+const ensureString = require('type/string/ensure');
+const ensureValue = require('type/value/ensure');
+const ensureArray = require('type/array/ensure');
+const ensureIterable = require('type/iterable/ensure');
+const isPlainObject = require('type/plain-object/is');
+const ensurePlainObject = require('type/plain-object/ensure');
+const CLI = require('./classes/cli');
+const Config = require('./classes/config');
+const YamlParser = require('./classes/yaml-parser');
+const PluginManager = require('./classes/plugin-manager');
+const Utils = require('./classes/utils');
+const Service = require('./classes/service');
+const ConfigSchemaHandler = require('./classes/config-schema-handler');
+const ServerlessError = require('./serverless-error');
+const version = require('./../package.json').version;
+const isStandaloneExecutable = require('./utils/is-standalone-executable');
+const logDeprecation = require('./utils/log-deprecation');
+const eventuallyUpdate = require('./utils/eventually-update');
+const commmandsSchema = require('./cli/commands-schema');
+const resolveCliInput = require('./cli/resolve-input');
+
+// Old local fallback is triggered in older versions by Serverless constructor directly
+const isStackFromOldLocalFallback = RegExp.prototype.test.bind(
+  /lib[\\/]Serverless.js:\d+[^]+lib[\\/]Serverless.js:\d+/i
+);
+
+class Serverless {
+  constructor(config = {}) {
+    if (!isPlainObject(config)) config = {};
+
+    if (isStackFromOldLocalFallback(new Error().stack)) {
+      // Prevent old local fallback, as it's not compatible with this version of the Framework
+      const chalk = require('chalk');
+      throw new ServerlessError(
+        [
+          'Cannot run local installation of the Serverless Framework by the outdated global version.',
+          'Please upgrade via:',
+          '',
+          chalk.bold(
+            isStandaloneExecutable ? 'serverless upgrade --major' : 'npm install -g serverless'
+          ),
+          chalk.grey(
+            'Note: Latest release can run any version of the locally installed Serverless Framework.'
+          ),
+          '',
+          'Alternatively run locally installed version directly via:',
+          '',
+          chalk.bold('npx serverless <command> <options>'),
+        ].join('\n'),
+        'UNSUPPORTED_LOCAL_FALLBACK'
+      );
+    }
+
+    this.serviceDir = ensureString(config.serviceDir, {
+      name: 'options.serviceDir',
+      Error: ServerlessError,
+      errorCode: 'INVALID_NON_STRING_SERVICE_DIR',
+      isOptional: true,
+    });
+    if (this.serviceDir != null) {
+      this.serviceDir = path.resolve(this.serviceDir);
+      this.configurationFilename = ensureString(config.configurationFilename, {
+        name: 'config.configurationFilename',
+        Error: ServerlessError,
+        errorCode: 'INVALID_NON_STRING_CONFIGURATION_FILENAME',
+      });
+      if (path.isAbsolute(this.configurationFilename)) {
+        throw new ServerlessError(
+          `"config.configurationFilename" cannot be absolute path. Received: ${config.configurationFilename}`,
+          'INVALID_ABSOLUTE_PATH_CONFIGURATION_FILENAME'
+        );
+      }
+      this.configurationInput = ensurePlainObject(config.configuration, {
+        name: 'config.configuration',
+        Error: ServerlessError,
+        errorCode: 'INVALID_NON_OBJECT_CONFIGURATION',
+      });
+    }
+
+    const commands = ensureArray(config.commands);
+    // Ensure that original `options` are not mutated, can be removed after addressing:
+    // https://github.com/serverless/serverless/issues/2582
+    const cliOptions = { ...ensurePlainObject(config.options) };
+    this.processedInput = { commands, options: cliOptions };
+
+    this.providers = {};
+
+    this.version = version;
+
+    this.yamlParser = new YamlParser(this);
+    this.utils = new Utils(this);
+    this.service = new Service(this);
+
+    // Old variables resolver is dropped, yet some plugins access service properties through
+    // `variables` class. Below patch ensures those plugins won't get broken
+    this.variables = { service: this.service };
+    this.pluginManager = new PluginManager(this);
+    this.configSchemaHandler = new ConfigSchemaHandler(this);
+
+    this.config = new Config(this, { serviceDir: config.serviceDir });
+
+    this.classes = {};
+    this.classes.CLI = CLI;
+    this.classes.YamlParser = YamlParser;
+    this.classes.Utils = Utils;
+    this.classes.Service = Service;
+    this.classes.Error = ServerlessError;
+    this.classes.PluginManager = PluginManager;
+    this.classes.ConfigSchemaHandler = ConfigSchemaHandler;
+
+    this.serverlessDirPath = path.join(os.homedir(), '.serverless');
+    this.isStandaloneExecutable = isStandaloneExecutable;
+    this.triggeredDeprecations = logDeprecation.triggeredDeprecations;
+
+    // TODO: Remove once "@serverless/dashboard-plugin" is integrated into this repository
+    this._commandsSchema = commmandsSchema;
+  }
+
+  async init() {
+    // create an instanceId (can be e.g. used when a predictable random value is needed)
+    this.instanceId = new Date().getTime().toString();
+
+    // create a new CLI instance
+    this.cli = new this.classes.CLI(this);
+
+    eventuallyUpdate(this);
+    // set the options and commands which were processed by the CLI
+    this.pluginManager.setCliOptions(this.processedInput.options);
+    this.pluginManager.setCliCommands(this.processedInput.commands);
+
+    await this.service.load(this.processedInput.options);
+    // load all plugins
+    await this.pluginManager.loadAllPlugins(this.service.plugins);
+    // give the CLI the plugins and commands so that it can print out
+    // information such as options when the user enters --help
+    this.cli.setLoadedPlugins(this.pluginManager.getPlugins());
+    this.cli.setLoadedCommands(this.pluginManager.getCommands());
+  }
+  async run() {
+    if (this.configurationInput) this.service.reloadServiceFileParam();
+
+    // make sure the command exists before doing anything else
+    this.pluginManager.validateCommand(this.processedInput.commands);
+
+    // Some plugins acccess `options` through `this.variables`
+    this.variables.options = this.pluginManager.cliOptions;
+
+    if (resolveCliInput().commands[0] !== 'plugin') {
+      // merge arrays after variables have been populated
+      // (https://github.com/serverless/serverless/issues/3511)
+      this.service.mergeArrays();
+
+      // populate function names after variables are loaded in case functions were externalized
+      // (https://github.com/serverless/serverless/issues/2997)
+      this.service.setFunctionNames(this.processedInput.options);
+
+      // If in context of service, validate the service configuration
+      if (this.serviceDir) await this.service.validate();
+    }
+
+    this.serviceOutputs = new Map();
+    this.servicePluginOutputs = new Map();
+
+    // trigger the plugin lifecycle when there's something which should be processed
+    await this.pluginManager.run(this.processedInput.commands);
+  }
+
+  addServiceOutputSection(sectionName, content) {
+    sectionName = ensureString(sectionName, { name: 'sectionName' });
+    if (typeof ensureValue(content, { name: 'content' }) !== 'string') {
+      content = ensureIterable(content, {
+        name: 'content',
+        denyEmpty: true,
+        ensureItem: ensureString,
+      });
+    } else if (!content) {
+      throw new TypeError('Section content cannot be empty string');
+    }
+    if (this.serviceOutputs.has(sectionName) || this.servicePluginOutputs.has(sectionName)) {
+      throw new TypeError(`Section content for "${sectionName}" was already set`);
+    }
+    this.servicePluginOutputs.set(sectionName, content);
+  }
+
+  setProvider(name, provider) {
+    this.providers[name] = provider;
+  }
+
+  getProvider(name) {
+    return this.providers[name] ? this.providers[name] : false;
+  }
+
+  getVersion() {
+    return this.version;
+  }
+
+  // Only for internal use
+  _logDeprecation(code, message) {
+    return logDeprecation(code, message, { serviceConfig: this.configurationInput });
+  }
+
+  // To be used by external plugins
+  logDeprecation(code, message) {
+    return this._logDeprecation(`EXT_${ensureString(code)}`, ensureString(message));
+  }
+}
+
+module.exports = Serverless;
diff --git a/lib/templates/recommended-list/index.js b/lib/templates/recommended-list/index.js
index 2c4d924ad06..8b4e535ab26 100644
--- a/lib/templates/recommended-list/index.js
+++ b/lib/templates/recommended-list/index.js
@@ -40,6 +40,7 @@ module.exports = [
   'fn-nodejs',
   'fn-go',
   'google-nodejs',
+  'google-nodejs-typescript',
   'google-python',
   'google-go',
   'kubeless-python',
diff --git a/lib/utils/autocomplete.js b/lib/utils/autocomplete.js
deleted file mode 100644
index 744255ef5f8..00000000000
--- a/lib/utils/autocomplete.js
+++ /dev/null
@@ -1,60 +0,0 @@
-'use strict';
-
-const Serverless = require('../Serverless');
-const crypto = require('crypto');
-
-const resolveConfigurationPath = require('../../lib/cli/resolve-configuration-path');
-const readConfiguration = require('../../lib/configuration/read');
-const getCacheFile = require('./getCacheFile');
-
-const getSuggestions = (commands, env) => {
-  if (!env.complete) return;
-  const tokens = env.line.split(/\s+/);
-  const { log } = require('tabtab');
-  switch (tokens.length) {
-    case 1:
-    case 2:
-      log(Object.keys(commands).filter((commandName) => !commands[commandName].isHidden));
-      return;
-    case 3:
-      if (commands[env.prev]) log(commands[env.prev]);
-      return;
-    default:
-      return;
-  }
-};
-
-const cacheFileValid = (configurationInput, validationHash) => {
-  const serverlessConfigFileHash = crypto
-    .createHash('sha256')
-    .update(JSON.stringify(configurationInput))
-    .digest('hex');
-
-  return validationHash === serverlessConfigFileHash;
-};
-
-const autocomplete = async () => {
-  const configurationPath = await resolveConfigurationPath();
-  const serviceDir = process.cwd();
-  const configurationInput = configurationPath
-    ? await (async () => {
-        try {
-          return await readConfiguration(configurationPath);
-        } catch (error) {
-          return null;
-        }
-      })()
-    : null;
-  let cacheFile = await getCacheFile(serviceDir);
-  if (!cacheFile || !cacheFileValid(configurationInput, cacheFile.validationHash)) {
-    const serverless = new Serverless();
-    await serverless.init();
-    cacheFile = await getCacheFile(serviceDir);
-  }
-  if (!cacheFile || !cacheFileValid(configurationInput, cacheFile.validationHash)) {
-    return null;
-  }
-  return getSuggestions(cacheFile.commands, require('tabtab').parseEnv(process.env));
-};
-
-module.exports = autocomplete;
diff --git a/lib/utils/aws-schema-get-cf-value.js b/lib/utils/aws-schema-get-cf-value.js
new file mode 100644
index 00000000000..d66cdc2d3fb
--- /dev/null
+++ b/lib/utils/aws-schema-get-cf-value.js
@@ -0,0 +1,7 @@
+'use strict';
+
+module.exports.cfValue = (value) => {
+  return {
+    anyOf: [value, { $ref: '#/definitions/awsCfFunction' }, { $ref: '#/definitions/awsCfIf' }],
+  };
+};
diff --git a/lib/utils/awsSdkPatch.js b/lib/utils/aws-sdk-patch.js
similarity index 100%
rename from lib/utils/awsSdkPatch.js
rename to lib/utils/aws-sdk-patch.js
diff --git a/lib/utils/create-from-local-template.js b/lib/utils/create-from-local-template.js
new file mode 100644
index 00000000000..e931b931551
--- /dev/null
+++ b/lib/utils/create-from-local-template.js
@@ -0,0 +1,35 @@
+'use strict';
+
+const untildify = require('untildify');
+const fsp = require('fs').promises;
+const fse = require('fs-extra');
+const { renameService } = require('./rename-service');
+
+const ServerlessError = require('../serverless-error');
+
+module.exports = async ({ templatePath, projectDir, projectName }) => {
+  const sourcePath = untildify(templatePath);
+
+  try {
+    await fse.copy(sourcePath, projectDir, {
+      dereference: true,
+      filter: async (src) => {
+        const stats = await fsp.lstat(src);
+        return !stats.isSymbolicLink();
+      },
+    });
+  } catch (err) {
+    if (err.code === 'ENOENT') {
+      throw new ServerlessError(
+        `Could not find a template under provider path: ${sourcePath}`,
+        'INVALID_TEMPLATE_PATH'
+      );
+    }
+
+    throw new ServerlessError(`Cannot copy template: ${err.message}`, 'COPY_LOCAL_TEMPLATE_ERROR');
+  }
+
+  if (projectName) {
+    renameService(projectName, projectDir);
+  }
+};
diff --git a/lib/utils/createFromTemplate.js b/lib/utils/create-from-template.js
similarity index 91%
rename from lib/utils/createFromTemplate.js
rename to lib/utils/create-from-template.js
index b4e1a4d16fb..0142806493b 100644
--- a/lib/utils/createFromTemplate.js
+++ b/lib/utils/create-from-template.js
@@ -3,7 +3,7 @@
 const { basename, join } = require('path');
 const BbPromise = require('bluebird');
 const { copy, readFile } = require('fs-extra');
-const { renameService } = require('./renameService');
+const { renameService } = require('./rename-service');
 
 const serverlessPath = join(__dirname, '../../');
 
@@ -15,7 +15,7 @@ const resolveServiceName = (path) => {
   return serviceName;
 };
 
-module.exports = (templateName, destPath, options = {}) =>
+module.exports = async (templateName, destPath, options = {}) =>
   new BbPromise((resolve, reject) => {
     if (!options) options = {};
     const templateSrcDir = join(serverlessPath, 'lib/plugins/create/templates', templateName);
diff --git a/lib/utils/deepSortObjectByKey.js b/lib/utils/deep-sort-object-by-key.js
similarity index 100%
rename from lib/utils/deepSortObjectByKey.js
rename to lib/utils/deep-sort-object-by-key.js
diff --git a/lib/utils/downloadTemplateFromRepo.js b/lib/utils/download-template-from-repo.js
similarity index 86%
rename from lib/utils/downloadTemplateFromRepo.js
rename to lib/utils/download-template-from-repo.js
index e82fb55eb74..67353b198be 100644
--- a/lib/utils/downloadTemplateFromRepo.js
+++ b/lib/utils/download-template-from-repo.js
@@ -3,17 +3,16 @@
 const path = require('path');
 const os = require('os');
 const URL = require('url');
-const download = require('download');
+const download = require('@serverless/utils/download');
 const BbPromise = require('bluebird');
 const fse = require('fs-extra');
 const qs = require('querystring');
 const fetch = require('node-fetch');
 const spawn = require('child-process-ext/spawn');
-const renameService = require('./renameService').renameService;
+const renameService = require('./rename-service').renameService;
 const ServerlessError = require('../serverless-error');
-const copyDirContentsSync = require('./fs/copyDirContentsSync');
-const dirExistsSync = require('./fs/dirExistsSync');
-const log = require('./log/serverlessLog');
+const copyDirContentsSync = require('./fs/copy-dir-contents-sync');
+const dirExistsSync = require('./fs/dir-exists-sync');
 
 /**
  * Returns directory path
@@ -40,7 +39,7 @@ function validateUrl({ url, hostname, service, owner, repo }) {
   // validate if given url is a valid url
   if (url.hostname !== hostname || !owner || !repo) {
     const errorMessage = `The URL must be a valid ${service} URL in the following format: https://${hostname}/serverless/serverless`;
-    throw new ServerlessError(errorMessage);
+    throw new ServerlessError(errorMessage, 'INVALID_TEMPLATE_URL');
   }
 }
 
@@ -81,7 +80,8 @@ function parseGitHubURL(url) {
     downloadUrl,
     isSubdirectory,
     pathToDirectory: getPathDirectory(pathLength + 1, parts),
-    auth: url.auth || '',
+    username: url.username || '',
+    password: url.password || '',
   };
 }
 
@@ -111,7 +111,8 @@ function parseBitbucketURL(url) {
     downloadUrl,
     isSubdirectory,
     pathToDirectory: getPathDirectory(pathLength + 1, parts),
-    auth: '',
+    username: url.username || '',
+    password: url.password || '',
   };
 }
 
@@ -134,7 +135,8 @@ function parseBitbucketServerURL(url) {
     downloadUrl,
     isSubdirectory,
     pathToDirectory: getPathDirectory(pathLength + 1, parts),
-    auth: url.auth || '',
+    username: url.username || '',
+    password: url.password || '',
   };
 }
 
@@ -143,7 +145,7 @@ function parseBitbucketServerURL(url) {
  * @param {Object} url
  * @returns {Boolean}
  */
-function retrieveBitbucketServerInfo(url) {
+async function retrieveBitbucketServerInfo(url) {
   const versionInfoPath = `${url.protocol}//${url.hostname}/rest/api/1.0/application-properties`;
 
   return fetch(versionInfoPath)
@@ -176,7 +178,8 @@ function parseGitlabURL(url) {
     downloadUrl,
     isSubdirectory,
     pathToDirectory: getPathDirectory(pathLength + 1, parts),
-    auth: '',
+    username: url.username || '',
+    password: url.password || '',
   };
 }
 
@@ -197,7 +200,8 @@ function parsePlainGitURL(url) {
     branch,
     downloadUrl,
     isSubdirectory,
-    auth: url.auth || '',
+    username: url.username || '',
+    password: url.password || '',
   };
 }
 
@@ -208,17 +212,22 @@ function parsePlainGitURL(url) {
  * @throws {ServerlessError}
  * @returns {Promise}
  */
-function parseRepoURL(inputUrl) {
+async function parseRepoURL(inputUrl) {
   return new BbPromise((resolve, reject) => {
     if (!inputUrl) {
-      return reject(new ServerlessError('URL is required'));
+      return reject(new ServerlessError('URL is required', 'MISSING_TEMPLATE_URL'));
     }
 
     const url = URL.parse(inputUrl.replace(/\/$/, ''));
+    if (url.auth) {
+      const [username, password] = url.auth.split(':');
+      url.username = username;
+      url.password = password;
+    }
 
     // check if url parameter is a valid url
     if (!url.host && !url.href.startsWith('git@')) {
-      return reject(new ServerlessError('The URL you passed is not valid'));
+      return reject(new ServerlessError('The URL you passed is not valid', 'INVALID_TEMPLATE_URL'));
     }
 
     if (isPlainGitURL(url.href)) {
@@ -233,7 +242,7 @@ function parseRepoURL(inputUrl) {
 
     const msg =
       'The URL you passed is not one of the valid providers: "GitHub", "GitHub Entreprise", "Bitbucket", "Bitbucket Server" or "GitLab".';
-    const err = new ServerlessError(msg);
+    const err = new ServerlessError(msg, 'INVALID_TEMPLATE_PROVIDER');
     // test if it's a private bitbucket server
     return retrieveBitbucketServerInfo(url)
       .then((isBitbucket) => {
@@ -254,12 +263,12 @@ function parseRepoURL(inputUrl) {
  * @param {string} [path]
  * @returns {Promise}
  */
-function downloadTemplateFromRepo(inputUrl, templateName, downloadPath) {
+async function downloadTemplateFromRepo(inputUrl, templateName, downloadPath) {
   return parseRepoURL(inputUrl).then((repoInformation) => {
     let serviceName;
     let dirName;
     let downloadServicePath;
-    const { auth } = repoInformation;
+    const { username, password } = repoInformation;
 
     if (repoInformation.isSubdirectory) {
       const folderName = repoInformation.pathToDirectory.split('/').splice(-1)[0];
@@ -277,11 +286,9 @@ function downloadTemplateFromRepo(inputUrl, templateName, downloadPath) {
 
     if (dirExistsSync(path.join(process.cwd(), dirName))) {
       const errorMessage = `A folder named "${dirName}" already exists.`;
-      throw new ServerlessError(errorMessage);
+      throw new ServerlessError(errorMessage, 'TARGET_FOLDER_ALREADY_EXISTS');
     }
 
-    log(`Downloading and installing "${serviceName}"...`);
-
     if (isPlainGitURL(inputUrl)) {
       return spawn('git', ['clone', inputUrl, downloadServicePath]).then(() => {
         if (renamed) renameService(dirName, serviceDir);
@@ -294,7 +301,8 @@ function downloadTemplateFromRepo(inputUrl, templateName, downloadPath) {
       extract: true,
       strip: 1,
       mode: '755',
-      auth,
+      username,
+      password,
     };
     // download service
     return download(repoInformation.downloadUrl, downloadServicePath, downloadOptions)
diff --git a/lib/utils/ensureArtifact.js b/lib/utils/ensure-artifact.js
similarity index 89%
rename from lib/utils/ensureArtifact.js
rename to lib/utils/ensure-artifact.js
index f8f2bfe2887..f73686bf85c 100644
--- a/lib/utils/ensureArtifact.js
+++ b/lib/utils/ensure-artifact.js
@@ -2,7 +2,7 @@
 
 const memoizee = require('memoizee');
 const { version } = require('../../package');
-const ensureExists = require('./ensureExists');
+const ensureExists = require('./ensure-exists');
 const path = require('path');
 const os = require('os');
 
diff --git a/lib/utils/ensureExists.js b/lib/utils/ensure-exists.js
similarity index 81%
rename from lib/utils/ensureExists.js
rename to lib/utils/ensure-exists.js
index 6da1522b8a2..b724b8aa95e 100644
--- a/lib/utils/ensureExists.js
+++ b/lib/utils/ensure-exists.js
@@ -1,13 +1,13 @@
 'use strict';
 
 const fse = require('fs-extra');
-const fs = require('fs');
+const fsp = require('fs').promises;
 const path = require('path');
 
 module.exports = async (filename, generate) => {
   const cacheDir = path.dirname(filename);
   try {
-    const stats = await fs.promises.lstat(filename);
+    const stats = await fsp.lstat(filename);
     if (stats.isFile()) {
       return;
     }
diff --git a/lib/utils/eventuallyUpdate.js b/lib/utils/eventually-update.js
similarity index 75%
rename from lib/utils/eventuallyUpdate.js
rename to lib/utils/eventually-update.js
index e087af0f377..12dcb196e27 100644
--- a/lib/utils/eventuallyUpdate.js
+++ b/lib/utils/eventually-update.js
@@ -1,12 +1,13 @@
 'use strict';
 
 const _ = require('lodash');
-const { format } = require('util');
 const path = require('path');
 const os = require('os');
 const stream = require('stream');
 const { promisify } = require('util');
 const fse = require('fs-extra');
+const fs = require('fs');
+const fsp = require('fs').promises;
 const spawn = require('child-process-ext/spawn');
 const got = require('got');
 const tar = require('tar');
@@ -14,27 +15,23 @@ const semver = require('semver');
 const userConfig = require('@serverless/utils/config');
 const currentVersion = require('../../package.json').version;
 const standaloneUtils = require('./standalone');
-const isNpmGlobalPackage = require('./npmPackage/isGlobal');
-const isNpmPackageWritable = require('./npmPackage/isWritable');
+const isNpmGlobalPackage = require('./npm-package/is-global');
+const isNpmPackageWritable = require('./npm-package/is-writable');
+const isLocallyInstalled = require('../cli/is-locally-installed');
 
 const pipeline = promisify(stream.pipeline);
 
 const npmInstallationDir = path.resolve(__dirname, '../../');
 const serverlessTmpDir = path.resolve(os.tmpdir(), 'tmpdirs-serverless');
+const { log, style } = require('@serverless/utils/log');
 
 const CHECK_INTERVAL = 1000 * 60 * 30; // 30 minutes
 
 const npmUpdate = async (serverless, { newVersion, tarballUrl, abortHandler }) => {
-  const npmPackageRoot = await isNpmPackageWritable(serverless);
+  const npmPackageRoot = await isNpmPackageWritable();
 
   if (!npmPackageRoot) {
-    serverless.cli.log(
-      `Auto update error: No write access to ${npmInstallationDir}`,
-      'Serverless',
-      {
-        color: 'orange',
-      }
-    );
+    log.warning(`Auto update error: No write access to ${npmInstallationDir}`);
     return null;
   }
   const tempInstallationDir = path.resolve(serverlessTmpDir, `npm-update-${newVersion}`);
@@ -53,13 +50,13 @@ const npmUpdate = async (serverless, { newVersion, tarballUrl, abortHandler }) =
     const tempOldInstallationDir = path.resolve(serverlessTmpDir, 'npm-old-installation');
     await fse.remove(tempOldInstallationDir);
     return async () => {
-      await fse.rename(npmInstallationDir, tempOldInstallationDir);
-      await fse.rename(tempInstallationDir, npmInstallationDir);
+      await fsp.rename(npmInstallationDir, tempOldInstallationDir);
+      await fsp.rename(tempInstallationDir, npmInstallationDir);
       await fse.remove(tempOldInstallationDir);
     };
   } catch (error) {
-    if (!abortHandler.isAborted && process.env.SLS_DEBUG) {
-      serverless.cli.log(format('Auto update: Could not update npm installation: %O', error));
+    if (!abortHandler.isAborted) {
+      log.info('Auto update: Could not update npm installation: %O', error);
     }
     return null;
   }
@@ -72,12 +69,12 @@ const standaloneUpdate = async (serverless, { newVersion, abortHandler }) => {
     await fse.remove(tempStandalonePath);
     const downloadStream = got.stream(executableUrl);
     abortHandler.task = () => downloadStream.destroy();
-    await pipeline(downloadStream, fse.createWriteStream(tempStandalonePath));
-    await fse.chmod(tempStandalonePath, 0o755);
-    return () => fse.rename(tempStandalonePath, standaloneUtils.path);
+    await pipeline(downloadStream, fs.createWriteStream(tempStandalonePath));
+    await fsp.chmod(tempStandalonePath, 0o755);
+    return () => fsp.rename(tempStandalonePath, standaloneUtils.path);
   } catch (error) {
-    if (!abortHandler.isAborted && process.env.SLS_DEBUG) {
-      serverless.cli.log(format('Auto update: Could not update npm installation: %O', error));
+    if (!abortHandler.isAborted) {
+      log.info('Auto update: Could not update npm installation: %O', error);
     }
     return null;
   }
@@ -85,10 +82,10 @@ const standaloneUpdate = async (serverless, { newVersion, abortHandler }) => {
 
 module.exports = async (serverless) => {
   if (!serverless.onExitPromise) return; // Not intended for programmatic Serverless instances
-  if (serverless.isLocallyInstalled) return;
+  if (isLocallyInstalled) return;
   if (serverless.isStandaloneExecutable) {
     if (process.platform === 'win32') return;
-  } else if (!(await isNpmGlobalPackage())) {
+  } else if (!isNpmGlobalPackage()) {
     return;
   }
   const currentVersionData = semver.parse(currentVersion);
@@ -113,19 +110,15 @@ module.exports = async (serverless) => {
     try {
       versionRequest = await versionsRequest;
     } catch (error) {
-      if (!abortHandler.isAborted && process.env.SLS_DEBUG) {
-        serverless.cli.log(
-          format('Auto update: Could not resolve version info from npm: %O', error)
-        );
+      if (!abortHandler.isAborted) {
+        log.debug('Auto update: Could not resolve version info from npm: %O', error);
       }
       return null;
     }
     try {
       return JSON.parse(versionRequest.body);
     } catch (error) {
-      serverless.cli.log(
-        format('Auto update: Unexpected response from npm: %s', versionRequest.body)
-      );
+      log.debug('Auto update: Unexpected response from npm: %s', versionRequest.body);
       return null;
     }
   })();
@@ -160,7 +153,7 @@ module.exports = async (serverless) => {
     if (!updateTask) return;
     serverless.onExitPromise.then(async () => {
       await updateTask();
-      serverless.cli.log(`Sucessfully updated to v${latestVersion}`);
+      log.notice(style.aside(`Successfully updated to v${latestVersion}`));
     });
   }
   autoUpdateConfig.lastChecked = Date.now();
diff --git a/lib/utils/filesize.js b/lib/utils/filesize.js
new file mode 100644
index 00000000000..753417a8a57
--- /dev/null
+++ b/lib/utils/filesize.js
@@ -0,0 +1,13 @@
+'use strict';
+
+const ensureNaturalNumber = require('type/natural-number/ensure');
+const filesize = require('filesize');
+
+const resolveSignificant = (size) => {
+  return size >= 1000 ? resolveSignificant(Math.floor(size / 1000)) : size;
+};
+
+module.exports = (size) =>
+  filesize(size, {
+    round: resolveSignificant(ensureNaturalNumber(size, { name: 'size' })) >= 9 ? 0 : 1,
+  });
diff --git a/lib/utils/fs/copyDirContentsSync.js b/lib/utils/fs/copy-dir-contents-sync.js
similarity index 100%
rename from lib/utils/fs/copyDirContentsSync.js
rename to lib/utils/fs/copy-dir-contents-sync.js
diff --git a/lib/utils/fs/createZipFile.js b/lib/utils/fs/create-zip-file.js
similarity index 89%
rename from lib/utils/fs/createZipFile.js
rename to lib/utils/fs/create-zip-file.js
index 73e48939837..aeb466526da 100644
--- a/lib/utils/fs/createZipFile.js
+++ b/lib/utils/fs/create-zip-file.js
@@ -4,9 +4,9 @@ const fs = require('fs');
 const path = require('path');
 const archiver = require('archiver');
 const BbPromise = require('bluebird');
-const walkDirSync = require('../fs/walkDirSync');
+const walkDirSync = require('./walk-dir-sync');
 
-function createZipFile(srcDirPath, outputFilePath) {
+async function createZipFile(srcDirPath, outputFilePath) {
   const files = walkDirSync(srcDirPath).map((file) => ({
     input: file,
     output: file.replace(path.join(srcDirPath, path.sep), ''),
diff --git a/lib/utils/fs/dirExistsSync.js b/lib/utils/fs/dir-exists-sync.js
similarity index 100%
rename from lib/utils/fs/dirExistsSync.js
rename to lib/utils/fs/dir-exists-sync.js
diff --git a/lib/utils/fs/dirExists.js b/lib/utils/fs/dir-exists.js
similarity index 66%
rename from lib/utils/fs/dirExists.js
rename to lib/utils/fs/dir-exists.js
index 38902056059..0df0ed777a7 100644
--- a/lib/utils/fs/dirExists.js
+++ b/lib/utils/fs/dir-exists.js
@@ -1,9 +1,9 @@
 'use strict';
 
-const fse = require('fs-extra');
+const fsp = require('fs').promises;
 
-function dirExists(path) {
-  return fse.lstat(path).then(
+async function dirExists(path) {
+  return fsp.lstat(path).then(
     (stats) => stats.isDirectory(),
     (error) => {
       if (error.code === 'ENOENT') {
diff --git a/lib/utils/fs/fileExistsSync.js b/lib/utils/fs/file-exists-sync.js
similarity index 100%
rename from lib/utils/fs/fileExistsSync.js
rename to lib/utils/fs/file-exists-sync.js
diff --git a/lib/utils/fs/fileExists.js b/lib/utils/fs/file-exists.js
similarity index 60%
rename from lib/utils/fs/fileExists.js
rename to lib/utils/fs/file-exists.js
index 9de09bf01aa..ed849f66e5a 100644
--- a/lib/utils/fs/fileExists.js
+++ b/lib/utils/fs/file-exists.js
@@ -1,9 +1,9 @@
 'use strict';
 
-const fse = require('fs-extra');
+const fsp = require('fs').promises;
 
-function fileExists(filePath) {
-  return fse
+async function fileExists(filePath) {
+  return fsp
     .lstat(filePath)
     .then((stats) => stats.isFile())
     .catch(() => false);
diff --git a/lib/utils/fs/getTmpDirPath.js b/lib/utils/fs/get-tmp-dir-path.js
similarity index 100%
rename from lib/utils/fs/getTmpDirPath.js
rename to lib/utils/fs/get-tmp-dir-path.js
diff --git a/lib/utils/fs/readFileSync.js b/lib/utils/fs/read-file-sync.js
similarity index 100%
rename from lib/utils/fs/readFileSync.js
rename to lib/utils/fs/read-file-sync.js
diff --git a/lib/utils/fs/read-file.js b/lib/utils/fs/read-file.js
new file mode 100644
index 00000000000..b690b0643d4
--- /dev/null
+++ b/lib/utils/fs/read-file.js
@@ -0,0 +1,10 @@
+'use strict';
+
+const fsp = require('fs').promises;
+const parse = require('./parse');
+
+async function readFile(filePath) {
+  return fsp.readFile(filePath, 'utf8').then((contents) => parse(filePath, contents));
+}
+
+module.exports = readFile;
diff --git a/lib/utils/fs/readFile.js b/lib/utils/fs/readFile.js
deleted file mode 100644
index 3276a9afeb6..00000000000
--- a/lib/utils/fs/readFile.js
+++ /dev/null
@@ -1,10 +0,0 @@
-'use strict';
-
-const fse = require('fs-extra');
-const parse = require('./parse');
-
-function readFile(filePath) {
-  return fse.readFile(filePath, 'utf8').then((contents) => parse(filePath, contents));
-}
-
-module.exports = readFile;
diff --git a/lib/utils/fs/safe-move-file.js b/lib/utils/fs/safe-move-file.js
new file mode 100644
index 00000000000..1c0b66854b6
--- /dev/null
+++ b/lib/utils/fs/safe-move-file.js
@@ -0,0 +1,57 @@
+'use strict';
+
+const fsp = require('fs').promises;
+const crypto = require('crypto');
+const path = require('path');
+
+/**
+ * Given a path that designates a location of a file on another device,
+ * will return a path to file in the same folder, but with a unique name
+ * to avoid collisions.
+ *
+ * @param {*} destPath the path to the final location of the file being moved
+ * @returns a unique path to a file on the same device as the file being moved
+ */
+const generateTemporaryPathOnDestinationDevice = (destPath) => {
+  const dirName = path.dirname(destPath);
+  // Generate a unique destination file name to get the file onto the destination filesystem
+  const tempName = path.basename(destPath) + crypto.randomBytes(8).toString('hex');
+  return path.join(dirName, tempName);
+};
+
+/**
+ * Allows a file to be moved (renamed) even across filesystem boundaries.
+ *
+ * If the rename fails because the file is getting renamed across file system boundaries,
+ * the file is first copied to the destination file system under a temporary name,
+ * and then renamed from there.
+ *
+ * This is done because rename is atomic but copy is not, and can leave partially copied files.
+ *
+ * @param {*} oldPath the original file that should be moved
+ * @param {*} newPath the path to move the file to
+ */
+async function safeMoveFile(oldPath, newPath) {
+  try {
+    // Golden path, we simply rename the file in an atomic operation
+    await fsp.rename(oldPath, newPath);
+  } catch (err) {
+    // The EXDEV error indicates that the rename failed because the rename was across filesystem boundaries
+    // This might occur if a distro uses tmpfs for temporary directories
+    if (err.code === 'EXDEV') {
+      // Generate a unique destination file name to get the file onto the destination filesystem
+      const tempPath = generateTemporaryPathOnDestinationDevice(newPath);
+
+      // Copy onto the destination filesystem (not guaranteed to be atomic)
+      await fsp.copyFile(oldPath, tempPath);
+      // Atomically move the file onto the destination path, overwriting it
+      await fsp.rename(tempPath, newPath);
+      // Delete the old file once both the above operations succeed
+      await fsp.unlink(oldPath);
+    } else {
+      throw err;
+    }
+  }
+}
+
+module.exports = safeMoveFile;
diff --git a/lib/utils/fs/walkDirSync.js b/lib/utils/fs/walk-dir-sync.js
similarity index 100%
rename from lib/utils/fs/walkDirSync.js
rename to lib/utils/fs/walk-dir-sync.js
diff --git a/lib/utils/fs/writeFileSync.js b/lib/utils/fs/write-file-sync.js
similarity index 100%
rename from lib/utils/fs/writeFileSync.js
rename to lib/utils/fs/write-file-sync.js
diff --git a/lib/utils/fs/writeFile.js b/lib/utils/fs/write-file.js
similarity index 84%
rename from lib/utils/fs/writeFile.js
rename to lib/utils/fs/write-file.js
index f13129d4784..00bc18f7b01 100644
--- a/lib/utils/fs/writeFile.js
+++ b/lib/utils/fs/write-file.js
@@ -1,11 +1,12 @@
 'use strict';
 
+const fsp = require('fs').promises;
 const fse = require('fs-extra');
 const path = require('path');
 const jc = require('json-cycle');
 const yaml = require('js-yaml');
 
-function writeFile(filePath, conts, cycles) {
+async function writeFile(filePath, conts, cycles) {
   let contents = conts || '';
 
   return fse.mkdirs(path.dirname(filePath)).then(() => {
@@ -24,7 +25,7 @@ function writeFile(filePath, conts, cycles) {
       contents = yaml.dump(contents);
     }
 
-    return fse.writeFile(filePath, contents);
+    return fsp.writeFile(filePath, contents);
   });
 }
 
diff --git a/lib/utils/getFrameworkId.js b/lib/utils/get-framework-id.js
similarity index 100%
rename from lib/utils/getFrameworkId.js
rename to lib/utils/get-framework-id.js
diff --git a/lib/utils/get-require.js b/lib/utils/get-require.js
new file mode 100644
index 00000000000..0ccc87879aa
--- /dev/null
+++ b/lib/utils/get-require.js
@@ -0,0 +1,9 @@
+'use strict';
+
+const path = require('path');
+const { createRequire } = require('module');
+const memoize = require('memoizee');
+
+module.exports = memoize((dirname) => createRequire(path.resolve(dirname, 'require-resolver')), {
+  primitive: true,
+});
diff --git a/lib/utils/getServerlessDir.js b/lib/utils/get-serverless-dir.js
similarity index 100%
rename from lib/utils/getServerlessDir.js
rename to lib/utils/get-serverless-dir.js
diff --git a/lib/utils/getCacheFile.js b/lib/utils/getCacheFile.js
deleted file mode 100644
index 214386f85dd..00000000000
--- a/lib/utils/getCacheFile.js
+++ /dev/null
@@ -1,17 +0,0 @@
-'use strict';
-
-const fileExists = require('./fs/fileExists');
-const readFile = require('./fs/readFile');
-const getCacheFilePath = require('./getCacheFilePath');
-
-const getCacheFile = function (serviceDir) {
-  const cacheFilePath = getCacheFilePath(serviceDir);
-  return fileExists(cacheFilePath).then((exists) => {
-    if (!exists) {
-      return false;
-    }
-    return readFile(cacheFilePath);
-  });
-};
-
-module.exports = getCacheFile;
diff --git a/lib/utils/getCacheFilePath.js b/lib/utils/getCacheFilePath.js
deleted file mode 100644
index f87a6d7926e..00000000000
--- a/lib/utils/getCacheFilePath.js
+++ /dev/null
@@ -1,13 +0,0 @@
-'use strict';
-
-const homedir = require('os').homedir();
-const path = require('path');
-const crypto = require('crypto');
-
-const getCacheFilePath = function (srvcPath) {
-  const serviceDir = srvcPath || process.cwd();
-  const serviceDirHash = crypto.createHash('sha256').update(serviceDir).digest('hex');
-  return path.join(homedir, '.serverless', 'cache', serviceDirHash, 'autocomplete.json');
-};
-
-module.exports = getCacheFilePath;
diff --git a/lib/utils/getCommandSuggestion.js b/lib/utils/getCommandSuggestion.js
deleted file mode 100644
index 67c3af8b660..00000000000
--- a/lib/utils/getCommandSuggestion.js
+++ /dev/null
@@ -1,37 +0,0 @@
-'use strict';
-
-const _ = require('lodash');
-const { distance: getDistance } = require('fastest-levenshtein');
-
-const getCollectCommandWords = (commandObject, commandWordsArray) => {
-  let wordsArray =
-    Array.isArray(commandWordsArray) && commandWordsArray.length ? commandWordsArray : [];
-  Object.entries(commandObject).forEach(([commandChildName, commandChildObject]) => {
-    wordsArray.push(commandChildName);
-    if (commandChildObject.commands) {
-      wordsArray = getCollectCommandWords(commandChildObject.commands, wordsArray);
-    }
-  });
-  return _.uniq(wordsArray);
-};
-
-const getCommandSuggestion = (inputCommand, allCommandsObject) => {
-  let suggestion;
-  const commandWordsArray = getCollectCommandWords(allCommandsObject);
-  let minValue = 0;
-  commandWordsArray.forEach((correctCommand) => {
-    const distance = getDistance(inputCommand, correctCommand);
-    if (minValue === 0) {
-      suggestion = correctCommand;
-      minValue = distance;
-    }
-
-    if (minValue > distance) {
-      suggestion = correctCommand;
-      minValue = distance;
-    }
-  });
-  return suggestion;
-};
-
-module.exports = getCommandSuggestion;
diff --git a/lib/utils/health-status-filename.js b/lib/utils/health-status-filename.js
new file mode 100644
index 00000000000..d3491cb80e8
--- /dev/null
+++ b/lib/utils/health-status-filename.js
@@ -0,0 +1,6 @@
+'use strict';
+
+const path = require('path');
+const os = require('os');
+
+module.exports = path.resolve(os.homedir(), '.serverless/last-command-health-status');
diff --git a/lib/utils/is-standalone-executable.js b/lib/utils/is-standalone-executable.js
new file mode 100644
index 00000000000..252983da4f6
--- /dev/null
+++ b/lib/utils/is-standalone-executable.js
@@ -0,0 +1,3 @@
+'use strict';
+
+module.exports = Boolean(process.pkg && /^(?:\/snapshot\/|[A-Z]+:\\snapshot\\)/.test(__dirname));
diff --git a/lib/utils/isStandaloneExecutable.js b/lib/utils/isStandaloneExecutable.js
deleted file mode 100644
index 0fc389acbc3..00000000000
--- a/lib/utils/isStandaloneExecutable.js
+++ /dev/null
@@ -1,3 +0,0 @@
-'use strict';
-
-module.exports = Boolean(process.pkg);
diff --git a/lib/utils/log-deprecation.js b/lib/utils/log-deprecation.js
new file mode 100644
index 00000000000..3551682946d
--- /dev/null
+++ b/lib/utils/log-deprecation.js
@@ -0,0 +1,151 @@
+'use strict';
+
+const path = require('path');
+const fse = require('fs-extra');
+const fsp = require('fs').promises;
+const weakMemoizee = require('memoizee/weak');
+const _ = require('lodash');
+const resolveTmpdir = require('process-utils/tmpdir');
+const ServerlessError = require('../serverless-error');
+const safeMoveFile = require('./fs/safe-move-file');
+const { style, log } = require('@serverless/utils/log');
+const healthStatusFilename = require('./health-status-filename');
+
+const disabledDeprecationCodesByEnv = extractCodes(process.env.SLS_DEPRECATION_DISABLE);
+
+const notificationModeByEnv = process.env.SLS_DEPRECATION_NOTIFICATION_MODE;
+
+const triggeredDeprecations = new Set();
+const bufferedDeprecations = [];
+
+const deprecationLogger = log.get('deprecation');
+
+function extractCodes(codesStr) {
+  if (!codesStr) {
+    return new Set();
+  }
+  return new Set(codesStr.split(','));
+}
+
+const resolveDisabledDeprecationsByService = weakMemoizee((serviceConfig) => {
+  let disabledDeprecations = [];
+  if (typeof serviceConfig.disabledDeprecations === 'string') {
+    disabledDeprecations = [serviceConfig.disabledDeprecations];
+  } else {
+    disabledDeprecations = Array.from(serviceConfig.disabledDeprecations || []);
+  }
+  return new Set(disabledDeprecations);
+});
+
+const resolveMode = (serviceConfig) => {
+  switch (notificationModeByEnv) {
+    case 'error':
+    case 'warn':
+      return notificationModeByEnv;
+    default:
+  }
+  const modeByConfig = _.get(serviceConfig, 'deprecationNotificationMode');
+  switch (modeByConfig) {
+    case 'error':
+    case 'warn':
+      return modeByConfig;
+    default:
+      return module.exports.defaultMode;
+  }
+};
+
+function writeDeprecation(code, message) {
+  const messageLines = message.split('\n');
+  if (!code.startsWith('EXT_')) {
+    messageLines.push(`More Info: https://www.serverless.com/framework/docs/deprecations/#${code}`);
+  }
+  log.warning(messageLines.join('\n'));
+}
+
+module.exports = (code, message, { serviceConfig } = {}) => {
+  try {
+    if (
+      triggeredDeprecations.has(code) ||
+      disabledDeprecationCodesByEnv.has(code) ||
+      disabledDeprecationCodesByEnv.has('*')
+    ) {
+      return;
+    }
+
+    if (serviceConfig) {
+      const serviceDisabledCodes = resolveDisabledDeprecationsByService(serviceConfig);
+      if (serviceDisabledCodes.has(code) || serviceDisabledCodes.has('*')) {
+        return;
+      }
+    }
+
+    switch (resolveMode(serviceConfig)) {
+      case 'error':
+        throw new ServerlessError(
+          `${message}\n  More Info: https://www.serverless.com/framework/docs/deprecations/#${code}`,
+          `REJECTED_DEPRECATION_${code}`
+        );
+      case 'warn':
+        writeDeprecation(code, message);
+        return;
+      default:
+        bufferedDeprecations.push({ message, code });
+    }
+  } finally {
+    triggeredDeprecations.add(code);
+  }
+};
+
+module.exports.triggeredDeprecations = triggeredDeprecations;
+module.exports.defaultMode = 'warn:summary';
+
+module.exports.printSummary = async () => {
+  if (!bufferedDeprecations.length) {
+    try {
+      await fsp.unlink(healthStatusFilename);
+    } catch {
+      // ignore
+    }
+    return;
+  }
+
+  try {
+    const healthStatus = [];
+
+    deprecationLogger.warning();
+
+    if (bufferedDeprecations.length === 1) {
+      healthStatus.push('1 deprecation triggered in the last command:', '');
+      deprecationLogger.warning(
+        style.aside("1 deprecation found: run 'serverless doctor' for more details")
+      );
+    } else {
+      healthStatus.push(
+        `${bufferedDeprecations.length} deprecations triggered in the last command:`,
+        ''
+      );
+      deprecationLogger.warning(
+        style.aside(
+          `${bufferedDeprecations.length} deprecations found: run 'serverless doctor' for more details`
+        )
+      );
+    }
+    for (const { code, message } of bufferedDeprecations) {
+      healthStatus.push(message);
+      if (!code.startsWith('EXT_')) {
+        healthStatus.push(
+          style.aside(`More info: https://serverless.com/framework/docs/deprecations/#${code}`)
+        );
+      }
+    }
+
+    const tmpHealthStatusFilename = path.resolve(await resolveTmpdir(), 'health-status');
+    await Promise.all([
+      fse.ensureDir(path.dirname(healthStatusFilename)),
+      fsp.writeFile(tmpHealthStatusFilename, healthStatus.join('\n')),
+    ]);
+    await safeMoveFile(tmpHealthStatusFilename, healthStatusFilename);
+  } finally {
+    bufferedDeprecations.length = 0;
+  }
+};
diff --git a/lib/utils/log/consoleLog.js b/lib/utils/log/consoleLog.js
deleted file mode 100644
index 4bbe9966199..00000000000
--- a/lib/utils/log/consoleLog.js
+++ /dev/null
@@ -1,7 +0,0 @@
-'use strict';
-
-const consoleLog = function (...args) {
-  console.log(args); // eslint-disable-line no-console
-};
-
-module.exports = consoleLog;
diff --git a/lib/utils/log/fileLog.js b/lib/utils/log/fileLog.js
deleted file mode 100644
index 4b7e5f0f640..00000000000
--- a/lib/utils/log/fileLog.js
+++ /dev/null
@@ -1,12 +0,0 @@
-'use strict';
-
-const fs = require('fs');
-const path = require('path');
-
-const fileLog = function (...args) {
-  // TODO BRN: This does not guarantee order, is not multi process safe,
-  // TODO BRN: and is not guaranteed to complete before exit.
-  fs.appendFileSync(path.join(process.cwd(), 'sls.log'), `${args.join()}\n`);
-};
-
-module.exports = fileLog;
diff --git a/lib/utils/log/log.js b/lib/utils/log/log.js
deleted file mode 100644
index 81e7d2233e3..00000000000
--- a/lib/utils/log/log.js
+++ /dev/null
@@ -1,14 +0,0 @@
-'use strict';
-
-const fileLog = require('./fileLog');
-
-const loggers = [
-  // consoleLog,
-  fileLog,
-];
-
-const log = function (...args) {
-  loggers.forEach((logger) => logger(...args));
-};
-
-module.exports = log;
diff --git a/lib/utils/log/muteConsoleLog.js b/lib/utils/log/muteConsoleLog.js
deleted file mode 100644
index a076b1a7dd9..00000000000
--- a/lib/utils/log/muteConsoleLog.js
+++ /dev/null
@@ -1,33 +0,0 @@
-/* eslint no-console: 0 */
-
-// Created to workaround a limitation of tabtab package:
-// https://github.com/mklabs/tabtab/issues/51
-
-'use strict';
-
-module.exports = (callback) => {
-  const original = console.log;
-  console.log = () => {};
-  const restore = () => (console.log = original);
-  let result;
-  try {
-    result = callback();
-  } catch (error) {
-    restore();
-    throw error;
-  }
-  if (result && typeof result.then === 'function') {
-    return result.then(
-      (resolution) => {
-        restore();
-        return resolution;
-      },
-      (error) => {
-        restore();
-        throw error;
-      }
-    );
-  }
-  restore();
-  return result;
-};
diff --git a/lib/utils/log/serverlessLog.js b/lib/utils/log/serverlessLog.js
deleted file mode 100644
index 94ba61795e0..00000000000
--- a/lib/utils/log/serverlessLog.js
+++ /dev/null
@@ -1,11 +0,0 @@
-'use strict';
-
-/* eslint-disable no-console */
-
-const chalk = require('chalk');
-
-const log = function (message) {
-  console.log(`Serverless: ${chalk.yellow(message)}`);
-};
-
-module.exports = log;
diff --git a/lib/utils/logDeprecation.js b/lib/utils/logDeprecation.js
deleted file mode 100644
index cb0a22e187f..00000000000
--- a/lib/utils/logDeprecation.js
+++ /dev/null
@@ -1,69 +0,0 @@
-'use strict';
-
-const chalk = require('chalk');
-const weakMemoizee = require('memoizee/weak');
-
-const disabledCodesByEnv = extractCodes(process.env.SLS_DEPRECATION_DISABLE);
-
-const triggeredDeprecations = new Set();
-
-function extractCodes(codesStr) {
-  if (!codesStr) {
-    return new Set();
-  }
-  return new Set(codesStr.split(','));
-}
-
-const resolveDeprecatedByService = weakMemoizee((serviceConfig) => {
-  let disabledDeprecations = [];
-  if (typeof serviceConfig.disabledDeprecations === 'string') {
-    disabledDeprecations = [serviceConfig.disabledDeprecations];
-  } else {
-    disabledDeprecations = Array.from(serviceConfig.disabledDeprecations || []);
-  }
-  return new Set(disabledDeprecations);
-});
-
-function writeDeprecation(code, message) {
-  const prefix = 'Serverless: ';
-  const messageLines = message.split('\n');
-  const followingLinesPrefix = ' '.repeat(prefix.length);
-  for (let i = 1; i < messageLines.length; ++i) {
-    messageLines[i] = followingLinesPrefix + messageLines[i];
-  }
-  message = messageLines.join('\n');
-  process.stdout.write(
-    `Serverless: ${chalk.keyword('orange')(`Deprecation warning: ${message}`)}\n`
-  );
-  if (!code.startsWith('EXT_')) {
-    process.stdout.write(
-      `            ${chalk.keyword('orange')(
-        `More Info: https://www.serverless.com/framework/docs/deprecations/#${code}`
-      )}\n`
-    );
-  }
-}
-
-module.exports = (code, message, { serviceConfig } = {}) => {
-  try {
-    if (
-      triggeredDeprecations.has(code) ||
-      disabledCodesByEnv.has(code) ||
-      disabledCodesByEnv.has('*')
-    ) {
-      return;
-    }
-    if (serviceConfig) {
-      const serviceDisabledCodes = resolveDeprecatedByService(serviceConfig);
-      if (serviceDisabledCodes.has(code) || serviceDisabledCodes.has('*')) {
-        return;
-      }
-    }
-
-    writeDeprecation(code, message);
-  } finally {
-    triggeredDeprecations.add(code);
-  }
-};
-
-module.exports.triggeredDeprecations = triggeredDeprecations;
diff --git a/lib/utils/npm-command-deferred.js b/lib/utils/npm-command-deferred.js
index baea3a106a7..adde91550d1 100644
--- a/lib/utils/npm-command-deferred.js
+++ b/lib/utils/npm-command-deferred.js
@@ -1,11 +1,11 @@
 'use strict';
 
 const path = require('path');
-const fse = require('fs-extra');
+const fsp = require('fs').promises;
 
 const localNpmBinPath = path.join(__dirname, '../../node_modules/npm/bin/npm-cli.js');
 
-module.exports = fse
+module.exports = fsp
   .stat(localNpmBinPath)
   .then(
     (stats) => stats.isFile(),
@@ -15,5 +15,7 @@ module.exports = fse
     }
   )
   .then((isNpmInstalledLocaly) => {
-    return isNpmInstalledLocaly ? `node ${localNpmBinPath}` : 'npm';
+    return isNpmInstalledLocaly
+      ? { command: 'node', args: [localNpmBinPath] }
+      : { command: 'npm', args: [] };
   });
diff --git a/lib/utils/npm-package/is-global.js b/lib/utils/npm-package/is-global.js
new file mode 100644
index 00000000000..54f04806f76
--- /dev/null
+++ b/lib/utils/npm-package/is-global.js
@@ -0,0 +1,22 @@
+'use strict';
+
+const memoizee = require('memoizee');
+const path = require('path');
+const { spawnSync } = require('child_process');
+
+const serverlessPackageRoot = path.resolve(__dirname, '../../../');
+
+// This method should be kept as sync. The reason for it is the fact that
+// telemetry generation and persistence needs to be run in sync manner
+// and it depends on this function, either directly or indirectly.
+module.exports = memoizee(() => {
+  const npmPackagesRoot = (() => {
+    try {
+      return String(spawnSync('npm', ['root', '-g']).stdout).trim();
+    } catch {
+      return null;
+    }
+  })();
+  if (!npmPackagesRoot) return false;
+  return path.resolve(npmPackagesRoot, 'serverless') === serverlessPackageRoot;
+});
diff --git a/lib/utils/npm-package/is-writable.js b/lib/utils/npm-package/is-writable.js
new file mode 100644
index 00000000000..8fe800cdec1
--- /dev/null
+++ b/lib/utils/npm-package/is-writable.js
@@ -0,0 +1,18 @@
+'use strict';
+
+const path = require('path');
+const fsp = require('fs').promises;
+const { log } = require('@serverless/utils/log');
+
+const npmPackageRoot = path.resolve(__dirname, '../../../');
+
+module.exports = async () => {
+  const stats = await fsp.stat(npmPackageRoot);
+  try {
+    await fsp.utimes(npmPackageRoot, String(stats.atimeMs / 1000), String(stats.mtimeMs / 1000));
+    return true;
+  } catch (error) {
+    log.info('Auto update: file access error: %O', error);
+    return false;
+  }
+};
diff --git a/lib/utils/npmPackage/isGlobal.js b/lib/utils/npmPackage/isGlobal.js
deleted file mode 100644
index a1373ba29fc..00000000000
--- a/lib/utils/npmPackage/isGlobal.js
+++ /dev/null
@@ -1,22 +0,0 @@
-'use strict';
-
-const memoizee = require('memoizee');
-const path = require('path');
-const spawn = require('child-process-ext/spawn');
-
-const serverlessPackageRoot = path.resolve(__dirname, '../../../');
-
-module.exports = memoizee(
-  async () => {
-    const npmPackagesRoot = await (async () => {
-      try {
-        return String((await spawn('npm', ['root', '-g'])).stdoutBuffer).trim();
-      } catch {
-        return null;
-      }
-    })();
-    if (!npmPackagesRoot) return false;
-    return path.resolve(npmPackagesRoot, 'serverless') === serverlessPackageRoot;
-  },
-  { type: 'promise' }
-);
diff --git a/lib/utils/npmPackage/isWritable.js b/lib/utils/npmPackage/isWritable.js
deleted file mode 100644
index 91bb772b541..00000000000
--- a/lib/utils/npmPackage/isWritable.js
+++ /dev/null
@@ -1,20 +0,0 @@
-'use strict';
-
-const { format } = require('util');
-const path = require('path');
-const fs = require('fs').promises;
-
-const npmPackageRoot = path.resolve(__dirname, '../../../');
-
-module.exports = async (serverless) => {
-  const stats = await fs.stat(npmPackageRoot);
-  try {
-    await fs.utimes(npmPackageRoot, String(stats.atimeMs / 1000), String(stats.mtimeMs / 1000));
-    return true;
-  } catch (error) {
-    if (process.env.SLS_DEBUG) {
-      serverless.cli.log(format('Auto update: file access error: %O', error));
-    }
-    return false;
-  }
-};
diff --git a/lib/utils/open-browser.js b/lib/utils/open-browser.js
new file mode 100644
index 00000000000..6bfde4c04c4
--- /dev/null
+++ b/lib/utils/open-browser.js
@@ -0,0 +1,23 @@
+'use strict';
+
+/* eslint-disable no-console */
+
+const open = require('open');
+const isDockerContainer = require('is-docker');
+const { log, style } = require('@serverless/utils/log');
+
+module.exports = function openBrowser(url) {
+  log.notice();
+  log.notice(
+    style.aside(`If your browser does not open automatically, please open this URL: ${url}`)
+  );
+  log.notice();
+  let browser = process.env.BROWSER;
+  if (browser === 'none' || isDockerContainer()) return;
+  if (process.platform === 'darwin' && browser === 'open') browser = undefined;
+  open(url).then((subprocess) =>
+    subprocess.on('error', (err) => {
+      log.info(`Opening of browser window errored with ${err.stack}`);
+    })
+  );
+};
diff --git a/lib/utils/open.js b/lib/utils/open.js
deleted file mode 100644
index e6ad9468c56..00000000000
--- a/lib/utils/open.js
+++ /dev/null
@@ -1,171 +0,0 @@
-'use strict';
-// copied from https://raw.githubusercontent.com/sindresorhus/open/master/index.js
-// and adapted for node 6 support. Because open>6 requries node >= 8 but open<6 fails npm audit
-// changes:
-//  * use bluebird.promisify instead of util.promisfy
-//  * Object.assign instead of spread
-//  * use Array.prototype.push.apply(a,b) instead of a.push(...b)
-//  * async/await -> then :|
-//  * prettified with our config
-
-const { promisify } = require('bluebird');
-const chalk = require('chalk');
-const path = require('path');
-const childProcess = require('child_process');
-const fs = require('fs');
-const isWsl = require('is-wsl');
-
-const pAccess = promisify(fs.access);
-const pExecFile = promisify(childProcess.execFile);
-
-// Path to included `xdg-open`
-const localXdgOpenPath = path.join(__dirname, 'xdg-open');
-
-// Convert a path from WSL format to Windows format:
-// `/mnt/c/Program Files/Example/MyApp.exe` → `C:\Program Files\Example\MyApp.exe`
-const wslToWindowsPath = (filePath) =>
-  pExecFile('wslpath', ['-w', filePath]).then(({ stdout }) => stdout.trim());
-
-module.exports = (target, options) => {
-  if (typeof target !== 'string') {
-    throw new TypeError('Expected a `target`');
-  }
-
-  options = Object.assign(
-    {
-      wait: false,
-      background: false,
-    },
-    options
-  );
-
-  let command;
-  let appArguments = [];
-  const cliArguments = [];
-  const childProcessOptions = {};
-
-  if (Array.isArray(options.app)) {
-    appArguments = options.app.slice(1);
-    options.app = options.app[0];
-  }
-
-  return Promise.resolve()
-    .then(() => {
-      if (process.platform === 'darwin') {
-        command = 'open';
-
-        if (options.wait) {
-          cliArguments.push('--wait-apps');
-        }
-
-        if (options.background) {
-          cliArguments.push('--background');
-        }
-
-        if (options.app) {
-          cliArguments.push('-a', options.app);
-        }
-        return null;
-      } else if (process.platform === 'win32' || isWsl) {
-        command = `cmd${isWsl ? '.exe' : ''}`;
-        cliArguments.push('/c', 'start', '""', '/b');
-        target = target.replace(/&/g, '^&');
-
-        if (options.wait) {
-          cliArguments.push('/wait');
-        }
-
-        return Promise.resolve()
-          .then(() => {
-            if (options.app) {
-              if (isWsl && options.app.startsWith('/mnt/')) {
-                return wslToWindowsPath(options.app).then((windowsPath) => {
-                  options.app = windowsPath;
-                  cliArguments.push(options.app);
-                });
-              }
-
-              cliArguments.push(options.app);
-            }
-            return null;
-          })
-          .then(() => {
-            if (appArguments.length > 0) {
-              Array.prototype.push.apply(cliArguments, appArguments);
-            }
-            return null;
-          });
-      }
-      return Promise.resolve()
-        .then(() => {
-          if (options.app) {
-            command = options.app;
-          } else {
-            // When bundled by Webpack, there's no actual package file path and no local `xdg-open`.
-            const isBundled = !__dirname || __dirname === '/';
-
-            // Check if local `xdg-open` exists and is executable.
-            return pAccess(localXdgOpenPath, fs.constants.X_OK)
-              .then(() => true)
-              .catch(() => false)
-              .then((exeLocalXdgOpen) => {
-                const useSystemXdgOpen =
-                  process.versions.electron ||
-                  process.platform === 'android' ||
-                  isBundled ||
-                  !exeLocalXdgOpen;
-                command = useSystemXdgOpen ? 'xdg-open' : localXdgOpenPath;
-              });
-          }
-          return null;
-        })
-        .then(() => {
-          if (appArguments.length > 0) {
-            Array.prototype.push.apply(cliArguments, appArguments);
-          }
-
-          if (!options.wait) {
-            // `xdg-open` will block the process unless stdio is ignored
-            // and it's detached from the parent even if it's unref'd.
-            childProcessOptions.stdio = 'ignore';
-            childProcessOptions.detached = true;
-          }
-        });
-    })
-    .then(() => {
-      cliArguments.push(target);
-
-      if (process.platform === 'darwin' && appArguments.length > 0) {
-        cliArguments.push('--args');
-        Array.prototype.push.apply(cliArguments, appArguments);
-      }
-
-      const subprocess = childProcess.spawn(command, cliArguments, childProcessOptions);
-
-      if (options.wait) {
-        return new Promise((resolve, reject) => {
-          subprocess.once('error', reject);
-
-          subprocess.once('close', (exitCode) => {
-            if (exitCode > 0) {
-              reject(new Error(`Exited with code ${exitCode}`));
-              return;
-            }
-
-            resolve(subprocess);
-          });
-        });
-      }
-      subprocess.once('error', (error) => {
-        if (process.env.SLS_DEBUG) {
-          process.stdout.write(
-            `Serverless: ${chalk.red(`Opening of browser window errored with ${error.stack}`)}\n`
-          );
-        }
-      });
-
-      subprocess.unref();
-
-      return subprocess;
-    });
-};
diff --git a/lib/utils/openBrowser.js b/lib/utils/openBrowser.js
deleted file mode 100644
index 2bbf0e35673..00000000000
--- a/lib/utils/openBrowser.js
+++ /dev/null
@@ -1,24 +0,0 @@
-'use strict';
-
-/* eslint-disable no-console */
-
-const opn = require('./open');
-const chalk = require('chalk');
-const isDockerContainer = require('is-docker');
-
-module.exports = function openBrowser(url) {
-  process.stdout.write(
-    `\nIf your browser does not open automatically, please open the URL: ${url}\n\n`
-  );
-  let browser = process.env.BROWSER;
-  if (browser === 'none' || isDockerContainer()) return;
-  if (process.platform === 'darwin' && browser === 'open') browser = undefined;
-  const options = { wait: false, app: browser };
-  opn(url, options).catch((err) => {
-    if (process.env.SLS_DEBUG) {
-      process.stdout.write(
-        `Serverless: ${chalk.red(`Opening of browser window errored with ${err.stack}`)}\n`
-      );
-    }
-  });
-};
diff --git a/lib/utils/process-backend-notification-request.js b/lib/utils/process-backend-notification-request.js
new file mode 100644
index 00000000000..df71764419e
--- /dev/null
+++ b/lib/utils/process-backend-notification-request.js
@@ -0,0 +1,13 @@
+'use strict';
+
+const { log, style } = require('@serverless/utils/log');
+
+const processBackendNotificationRequest = require('@serverless/utils/process-backend-notification-request');
+
+module.exports = (notifications) => {
+  const notification = processBackendNotificationRequest(notifications);
+  if (!notification) return;
+
+  log.notice();
+  log.notice(style.aside(notification.message));
+};
diff --git a/lib/utils/processBackendNotificationRequest.js b/lib/utils/processBackendNotificationRequest.js
deleted file mode 100644
index 681589abc7e..00000000000
--- a/lib/utils/processBackendNotificationRequest.js
+++ /dev/null
@@ -1,28 +0,0 @@
-'use strict';
-
-const chalk = require('chalk');
-
-const processBackendNotificationRequest = require('@serverless/utils/process-backend-notification-request');
-
-module.exports = (notifications) => {
-  const notification = processBackendNotificationRequest(notifications);
-  if (!notification) return;
-
-  const messageLines = notification.message.split('\n');
-
-  const prefix = 'Serverless: ';
-  const borderLength =
-    Math.min(
-      prefix.length + messageLines.reduce((maxLength, line) => Math.max(maxLength, line.length), 0),
-      process.stdout.columns
-    ) || 10;
-  const followingLinesPrefix = ' '.repeat(prefix.length);
-  for (let i = 1; i < messageLines.length; ++i) {
-    messageLines[i] = followingLinesPrefix + messageLines[i];
-  }
-  process.stdout.write(
-    `\n${'*'.repeat(borderLength)}\n${prefix}${chalk.yellow(messageLines.join('\n'))}\n${'*'.repeat(
-      borderLength
-    )}\n\n`
-  );
-};
diff --git a/lib/utils/renameService.js b/lib/utils/rename-service.js
similarity index 89%
rename from lib/utils/renameService.js
rename to lib/utils/rename-service.js
index 0a97f3074b5..564202291d1 100644
--- a/lib/utils/renameService.js
+++ b/lib/utils/rename-service.js
@@ -3,9 +3,9 @@
 const path = require('path');
 const fse = require('fs-extra');
 
-const fileExistsSync = require('./fs/fileExistsSync');
-const readFileSync = require('./fs/readFileSync');
-const writeFileSync = require('./fs/writeFileSync');
+const fileExistsSync = require('./fs/file-exists-sync');
+const readFileSync = require('./fs/read-file-sync');
+const writeFileSync = require('./fs/write-file-sync');
 const ServerlessError = require('../serverless-error');
 
 function renameYmlService(name, ymlServiceFile) {
@@ -57,7 +57,7 @@ function renameService(name, serviceDir) {
   }
 
   const errorMessage = ['serverless.yml or serverlss.ts not found in', ` ${serviceDir}`].join('');
-  throw new ServerlessError(errorMessage);
+  throw new ServerlessError(errorMessage, 'MISSING_SERVICE_FILE');
 }
 
 module.exports.renameService = renameService;
diff --git a/lib/utils/report-deprecated-properties.js b/lib/utils/report-deprecated-properties.js
index bcba8ba1fd2..08370d906d0 100644
--- a/lib/utils/report-deprecated-properties.js
+++ b/lib/utils/report-deprecated-properties.js
@@ -1,7 +1,7 @@
 'use strict';
 
 const _ = require('lodash');
-const logDeprecation = require('./logDeprecation');
+const logDeprecation = require('./log-deprecation');
 
 const getMessage = (props, serviceConfig) => {
   const warnings = [];
@@ -17,7 +17,7 @@ const getMessage = (props, serviceConfig) => {
     const details = warnings
       .map(([oldProp, newProp]) => `  "${oldProp}" -> "${newProp}"`)
       .join('\n');
-    return `Starting with version 3.0.0, following ${what} will be replaced:\n${details}`;
+    return `Starting with version 4.0.0, following ${what} will be replaced:\n${details}`;
   }
   return null;
 };
diff --git a/lib/utils/resolve-region.js b/lib/utils/resolve-region.js
new file mode 100644
index 00000000000..035efff96bc
--- /dev/null
+++ b/lib/utils/resolve-region.js
@@ -0,0 +1,8 @@
+'use strict';
+const _ = require('lodash');
+
+const resolveRegion = ({ configuration, options }) => {
+  return options.region || _.get(configuration, 'provider.region') || 'us-east-1';
+};
+
+module.exports = resolveRegion;
diff --git a/lib/utils/resolve-stage.js b/lib/utils/resolve-stage.js
new file mode 100644
index 00000000000..f255f0432a9
--- /dev/null
+++ b/lib/utils/resolve-stage.js
@@ -0,0 +1,8 @@
+'use strict';
+const _ = require('lodash');
+
+const resolveStage = ({ configuration, options }) => {
+  return options.stage || _.get(configuration, 'provider.stage') || 'dev';
+};
+
+module.exports = resolveStage;
diff --git a/lib/utils/standalone.js b/lib/utils/standalone.js
index 484c9b1ddcc..ca0db1b67e3 100644
--- a/lib/utils/standalone.js
+++ b/lib/utils/standalone.js
@@ -17,7 +17,12 @@ const arch = (() => {
     case 'x32':
       return 'x86';
     case 'arm':
+      return 'armv6';
     case 'arm64':
+      if (process.platform === 'darwin') {
+        // Handle case of M1 Macs that are using x64 binary via Rosetta
+        return 'x64';
+      }
       return 'armv6';
     default:
       return process.arch;
diff --git a/lib/utils/tabCompletion/isSupported.js b/lib/utils/tabCompletion/isSupported.js
deleted file mode 100644
index 5bc00beaf98..00000000000
--- a/lib/utils/tabCompletion/isSupported.js
+++ /dev/null
@@ -1,3 +0,0 @@
-'use strict';
-
-module.exports = process.platform !== 'win32' && process.version.match(/\d+/)[0] >= 8;
diff --git a/lib/utils/tabCompletion/promptDisabledConfigPropertyName.js b/lib/utils/tabCompletion/promptDisabledConfigPropertyName.js
deleted file mode 100644
index 367520bf4ba..00000000000
--- a/lib/utils/tabCompletion/promptDisabledConfigPropertyName.js
+++ /dev/null
@@ -1,3 +0,0 @@
-'use strict';
-
-module.exports = 'tabCompletionPromptDisabled';
diff --git a/lib/utils/tabCompletion/tabtabOptions.js b/lib/utils/tabCompletion/tabtabOptions.js
deleted file mode 100644
index 57328ecc9ea..00000000000
--- a/lib/utils/tabCompletion/tabtabOptions.js
+++ /dev/null
@@ -1,3 +0,0 @@
-'use strict';
-
-module.exports = ['serverless', 'sls'].map((name) => ({ name, completer: name }));
diff --git a/lib/utils/telemetry/anonymize-stacktrace-paths.js b/lib/utils/telemetry/anonymize-stacktrace-paths.js
new file mode 100644
index 00000000000..b77f2244e1b
--- /dev/null
+++ b/lib/utils/telemetry/anonymize-stacktrace-paths.js
@@ -0,0 +1,48 @@
+'use strict';
+
+const path = require('path');
+const commonPath = require('path2/common');
+
+const anonymizeStacktracePaths = (stackFrames) => {
+  const stackFramesWithAbsolutePaths = stackFrames.filter((p) => path.isAbsolute(p));
+  let commonPathPrefix = '';
+
+  if (stackFramesWithAbsolutePaths.length) {
+    commonPathPrefix = commonPath(...stackFramesWithAbsolutePaths);
+
+    const lastServerlessPathIndex = commonPathPrefix.lastIndexOf(
+      `${path.sep}serverless${path.sep}`
+    );
+
+    if (lastServerlessPathIndex !== -1) {
+      commonPathPrefix = commonPathPrefix.slice(0, lastServerlessPathIndex);
+    } else {
+      const nodeModulesPathPart = `${path.sep}node_modules${path.sep}`;
+      const lastNodeModulesPathIndex = commonPathPrefix.lastIndexOf(nodeModulesPathPart);
+      if (lastNodeModulesPathIndex !== -1) {
+        commonPathPrefix = commonPathPrefix.slice(
+          0,
+          lastNodeModulesPathIndex + nodeModulesPathPart.length - 1
+        );
+      }
+    }
+  }
+
+  let previousStackFramePath = null;
+  return stackFrames.map((stackFrame) => {
+    stackFrame = stackFrame.replace(commonPathPrefix, '');
+    const locationIndex = stackFrame.search(/:\d+:/);
+    if (locationIndex === -1) {
+      previousStackFramePath = null;
+      return stackFrame;
+    }
+    const currentStackFramePath = stackFrame.slice(0, locationIndex);
+    if (currentStackFramePath === previousStackFramePath) {
+      return `^${stackFrame.slice(currentStackFramePath.length)}`;
+    }
+    previousStackFramePath = currentStackFramePath;
+    return stackFrame;
+  });
+};
+
+module.exports = anonymizeStacktracePaths;
diff --git a/lib/utils/telemetry/areDisabled.js b/lib/utils/telemetry/are-disabled.js
similarity index 100%
rename from lib/utils/telemetry/areDisabled.js
rename to lib/utils/telemetry/are-disabled.js
diff --git a/lib/utils/telemetry/cache-path.js b/lib/utils/telemetry/cache-path.js
index 64016988afc..bff3e83d8f7 100644
--- a/lib/utils/telemetry/cache-path.js
+++ b/lib/utils/telemetry/cache-path.js
@@ -6,5 +6,5 @@ const os = require('os');
 module.exports = (() => {
   const resolvedHomeDir = os.homedir();
   if (!resolvedHomeDir) return null;
-  return path.resolve(resolvedHomeDir, '.serverless', 'analytics-cache');
+  return path.resolve(resolvedHomeDir, '.serverless', 'telemetry-cache');
 })();
diff --git a/lib/utils/telemetry/generate-payload.js b/lib/utils/telemetry/generate-payload.js
new file mode 100644
index 00000000000..ffc35bebda6
--- /dev/null
+++ b/lib/utils/telemetry/generate-payload.js
@@ -0,0 +1,283 @@
+'use strict';
+
+const path = require('path');
+const crypto = require('crypto');
+const _ = require('lodash');
+const isPlainObject = require('type/plain-object/is');
+const isObject = require('type/object/is');
+const userConfig = require('@serverless/utils/config');
+const getNotificationsMode = require('@serverless/utils/get-notifications-mode');
+const isStandalone = require('../is-standalone-executable');
+const { getConfigurationValidationResult } = require('../../classes/config-schema-handler');
+const { triggeredDeprecations } = require('../log-deprecation');
+const isNpmGlobal = require('../npm-package/is-global');
+const isLocallyInstalled = require('../../cli/is-locally-installed');
+const ci = require('ci-info');
+const AWS = require('aws-sdk');
+
+const configValidationModeValues = new Set(['off', 'warn', 'error']);
+const commandsReportingProjectId = new Set(['deploy', '', 'remove']);
+
+const getServiceConfig = ({ configuration, options, variableSources }) => {
+  const providerName = isObject(configuration.provider)
+    ? configuration.provider.name
+    : configuration.provider;
+
+  const isAwsProvider = providerName === 'aws';
+
+  const defaultRuntime = isAwsProvider
+    ? configuration.provider.runtime || 'nodejs12.x'
+    : _.get(configuration, 'provider.runtime');
+
+  const functions = (() => {
+    if (isObject(configuration.functions)) return configuration.functions;
+    if (!Array.isArray(configuration.functions)) return {};
+    const result = {};
+    for (const functionsBlock of configuration.functions) Object.assign(result, functionsBlock);
+    return result;
+  })();
+
+  const resolveResourceTypes = (resources) => {
+    if (!isPlainObject(resources)) return [];
+    return [
+      ...new Set(
+        Object.values(resources)
+          .map((resource) => {
+            const type = _.get(resource, 'Type');
+            if (typeof type !== 'string' || !type.includes('::')) return null;
+            const domain = type.slice(0, type.indexOf(':'));
+            return domain === 'AWS' ? type : domain;
+          })
+          .filter(Boolean)
+      ),
+    ];
+  };
+
+  const resources = (() => {
+    if (!isAwsProvider) return undefined;
+    return {
+      general: resolveResourceTypes(_.get(configuration.resources, 'Resources')),
+    };
+  })();
+
+  const plugins = configuration.plugins
+    ? configuration.plugins.modules || configuration.plugins
+    : [];
+
+  const resolveUniqueParamsCount = (params) => {
+    if (!isPlainObject(params)) return 0;
+    return new Set(
+      Object.values(params)
+        .filter(isPlainObject)
+        .map((stageParams) => Object.keys(stageParams))
+        .reduce((acc, stageParamsKeys) => [...acc, ...stageParamsKeys], [])
+    ).size;
+  };
+
+  const result = {
+    // TODO: Update when upgrading the default for next major
+    configValidationMode: configValidationModeValues.has(configuration.configValidationMode)
+      ? configuration.configValidationMode
+      : 'warn',
+    provider: {
+      name: providerName,
+      runtime: defaultRuntime,
+      stage: options.stage || _.get(configuration, 'provider.stage') || 'dev',
+      region: isAwsProvider
+        ? options.region || configuration.provider.region || 'us-east-1'
+        : _.get(configuration, 'provider.region'),
+    },
+    variableSources: variableSources ? Array.from(variableSources) : [],
+    plugins,
+    functions: Object.values(functions)
+      .map((functionConfig) => {
+        if (!functionConfig) return null;
+        const functionEvents = Array.isArray(functionConfig.events) ? functionConfig.events : [];
+        const functionRuntime = (() => {
+          if (functionConfig.image) return '$containerimage';
+          return functionConfig.runtime || defaultRuntime;
+        })();
+
+        return {
+          runtime: functionRuntime,
+          events: functionEvents.map((eventConfig) => ({
+            type: isObject(eventConfig) ? Object.keys(eventConfig)[0] || null : null,
+          })),
+        };
+      })
+      .filter(Boolean),
+    resources,
+    paramsCount: resolveUniqueParamsCount(configuration.params),
+  };
+
+  // We want to recognize types of constructs from `serverless-lift` plugin if possible
+  if (plugins.includes('serverless-lift') && _.isObject(configuration.constructs)) {
+    result.constructs = Object.values(configuration.constructs)
+      .map((construct) => {
+        if (_.isObject(construct) && construct.type != null) {
+          return { type: construct.type };
+        }
+        return null;
+      })
+      .filter(Boolean);
+  }
+
+  return result;
+};
+
+// This method is explicitly kept as synchronous. The reason for it being the fact that it needs to
+// be executed in such manner due to its use in `process.on('SIGINT')` handler.
+module.exports = ({
+  command,
+  options,
+  commandSchema,
+  serviceDir,
+  configuration,
+  serverless,
+  commandUsage,
+  variableSources,
+}) => {
+  let commandDurationMs;
+
+  if (EvalError.$serverlessCommandStartTime) {
+    const diff = process.hrtime(EvalError.$serverlessCommandStartTime);
+    // First element is in seconds and second in nanoseconds
+    commandDurationMs = Math.floor(diff[0] * 1000 + diff[1] / 1000000);
+  }
+
+  let timezone;
+  try {
+    timezone = new Intl.DateTimeFormat().resolvedOptions().timeZone;
+  } catch {
+    // Pass silently
+  }
+
+  const ciName = (() => {
+    if (process.env.SERVERLESS_CI_CD) {
+      return 'Serverless CI/CD';
+    }
+
+    if (process.env.SEED_APP_NAME) {
+      return 'Seed';
+    }
+
+    if (ci.isCI) {
+      if (ci.name) {
+        return ci.name;
+      }
+      return 'unknown';
+    }
+    return null;
+  })();
+
+  const userId = (() => {
+    // In this situation deployment relies on existence on company-wide access key
+    // and `userId` from config does not matter
+    if (process.env.SERVERLESS_ACCESS_KEY) {
+      return null;
+    }
+
+    return userConfig.get('userId');
+  })();
+
+  const usedVersions = (() => {
+    return {
+      'serverless': require('../../../package').version,
+      '@serverless/dashboard-plugin': require('@serverless/dashboard-plugin/package').version,
+    };
+  })();
+
+  // We only consider options that are present in command schema
+  const availableOptionNames = new Set(Object.keys(commandSchema.options));
+  const commandOptionNames = Object.keys(options).filter((x) => availableOptionNames.has(x));
+
+  const payload = {
+    ciName,
+    isTtyTerminal: process.stdin.isTTY,
+    cliName: 'serverless',
+    command,
+    commandOptionNames,
+    dashboard: {
+      userId,
+    },
+    firstLocalInstallationTimestamp: userConfig.get('meta.created_at'),
+    frameworkLocalUserId: userConfig.get('frameworkId'),
+    installationType: (() => {
+      if (isStandalone) {
+        if (process.platform === 'win32') return 'global:standalone:windows';
+        return 'global:standalone:other';
+      }
+      if (!isLocallyInstalled) {
+        return isNpmGlobal() ? 'global:npm' : 'global:other';
+      }
+      if (EvalError.$serverlessInitInstallationVersion) return 'local:fallback';
+      return 'local:direct';
+    })(),
+    isAutoUpdateEnabled: Boolean(userConfig.get('autoUpdate.enabled')),
+    notificationsMode: getNotificationsMode(),
+    timestamp: Date.now(),
+    timezone,
+    triggeredDeprecations: Array.from(triggeredDeprecations),
+    versions: usedVersions,
+  };
+
+  if (commandDurationMs != null) {
+    payload.commandDurationMs = commandDurationMs;
+  }
+
+  if (configuration && commandSchema.serviceDependencyMode) {
+    const npmDependencies = (() => {
+      const pkgJson = (() => {
+        try {
+          return require(path.resolve(serviceDir, 'package.json'));
+        } catch (error) {
+          return null;
+        }
+      })();
+      if (!pkgJson) return [];
+      return Array.from(
+        new Set([
+          ...Object.keys(pkgJson.dependencies || {}),
+          ...Object.keys(pkgJson.optionalDependencies || {}),
+          ...Object.keys(pkgJson.devDependencies || {}),
+        ])
+      );
+    })();
+
+    const providerName = isObject(configuration.provider)
+      ? configuration.provider.name
+      : configuration.provider;
+    const isAwsProvider = providerName === 'aws';
+
+    payload.hasLocalCredentials = isAwsProvider && Boolean(new AWS.Config().credentials);
+    payload.npmDependencies = npmDependencies;
+    payload.config = getServiceConfig({ configuration, options, variableSources });
+    payload.isConfigValid = getConfigurationValidationResult(configuration);
+    payload.dashboard.orgUid = serverless && serverless.service.orgUid;
+
+    if (isAwsProvider && serverless && commandsReportingProjectId.has(command)) {
+      const serviceName = isObject(configuration.service)
+        ? configuration.service.name
+        : configuration.service;
+      const accountId = serverless && serverless.getProvider('aws').accountId;
+      if (serviceName && accountId) {
+        payload.projectId = crypto
+          .createHash('sha256')
+          .update(`${serviceName}-${accountId}`)
+          .digest('base64');
+      }
+    }
+
+    if (isAwsProvider && serverless && (command === 'deploy' || command === '')) {
+      payload.didCreateService = Boolean(
+        serverless && serverless.getProvider('aws').didCreateService
+      );
+    }
+  }
+
+  if (commandUsage) {
+    payload.commandUsage = commandUsage;
+  }
+
+  return payload;
+};
diff --git a/lib/utils/telemetry/generatePayload.js b/lib/utils/telemetry/generatePayload.js
deleted file mode 100644
index 00d628bda84..00000000000
--- a/lib/utils/telemetry/generatePayload.js
+++ /dev/null
@@ -1,164 +0,0 @@
-'use strict';
-
-const path = require('path');
-const os = require('os');
-const fs = require('fs').promises;
-const userConfig = require('@serverless/utils/config');
-const isStandalone = require('../isStandaloneExecutable');
-const { triggeredDeprecations } = require('../logDeprecation');
-const isNpmGlobal = require('../npmPackage/isGlobal');
-const noServiceCommands = require('../../cli/commands-schema/no-service');
-const ci = require('ci-info');
-
-const versions = {
-  'serverless': require('../../../package').version,
-  '@serverless/enterprise-plugin': require('@serverless/enterprise-plugin/package').version,
-};
-
-const checkIsTabAutocompletionInstalled = async () => {
-  try {
-    return (await fs.readdir(path.resolve(os.homedir(), '.config/tabtab'))).some((filename) =>
-      filename.startsWith('serverless.')
-    );
-  } catch {
-    return false;
-  }
-};
-
-const shouldIncludeServiceSpecificConfig = (serverless) => {
-  if (!serverless.serviceDir) {
-    return false;
-  }
-
-  const noServiceCommand = noServiceCommands.get(serverless.processedInput.commands.join(' '));
-  if (noServiceCommand && !noServiceCommand.serviceDependencyMode) {
-    return false;
-  }
-
-  return true;
-};
-
-const getServiceConfig = (serverless) => {
-  const { service: serviceConfig } = serverless;
-  const { provider: providerConfig } = serviceConfig;
-  const provider = serverless.getProvider(providerConfig.name);
-
-  const isAwsProvider = providerConfig.name === 'aws';
-
-  const defaultRuntime = isAwsProvider ? provider.getRuntime() : providerConfig.runtime;
-
-  return {
-    provider: {
-      name: providerConfig.name,
-      runtime: defaultRuntime,
-      stage: isAwsProvider ? provider.getStage() : providerConfig.stage,
-      region: isAwsProvider ? provider.getRegion() : providerConfig.region,
-    },
-    plugins: serviceConfig.plugins ? serviceConfig.plugins.modules || serviceConfig.plugins : [],
-    functions: Object.values(serviceConfig.functions).map((functionConfig) => {
-      const functionEvents = functionConfig.events || [];
-      const functionRuntime = (() => {
-        if (functionConfig.image) return '$containerimage';
-        return functionConfig.runtime || defaultRuntime;
-      })();
-
-      return {
-        runtime: functionRuntime,
-        events: functionEvents.map((eventConfig) => ({
-          type: Object.keys(eventConfig)[0] || null,
-        })),
-      };
-    }),
-  };
-};
-
-module.exports = async (serverless) => {
-  let timezone;
-  try {
-    timezone = new Intl.DateTimeFormat().resolvedOptions().timeZone;
-  } catch {
-    // Pass silently
-  }
-
-  const ciName = (() => {
-    if (process.env.SERVERLESS_CI_CD) {
-      return 'Serverless CI/CD';
-    }
-
-    if (process.env.SEED_APP_NAME) {
-      return 'Seed';
-    }
-
-    if (ci.isCI) {
-      if (ci.name) {
-        return ci.name;
-      }
-      return 'unknown';
-    }
-    return null;
-  })();
-
-  const userId = (() => {
-    // In this situation deployment relies on existence on company-wide access key
-    // and `userId` from config does not matter
-    if (process.env.SERVERLESS_ACCESS_KEY) {
-      return null;
-    }
-
-    return userConfig.get('userId');
-  })();
-
-  const payload = {
-    ciName,
-    cliName: 'serverless',
-    command: serverless.processedInput.commands.join(' '),
-    dashboard: {
-      userId,
-    },
-    firstLocalInstallationTimestamp: userConfig.get('meta.created_at'),
-    frameworkLocalUserId: userConfig.get('frameworkId'),
-    installationType: await (async () => {
-      if (isStandalone) {
-        if (process.platform === 'win32') return 'global:standalone:windows';
-        return 'global:standalone:other';
-      }
-      if (!serverless.isLocallyInstalled) {
-        return (await isNpmGlobal()) ? 'global:npm' : 'global:other';
-      }
-      if (serverless._isInvokedByGlobalInstallation) return 'local:fallback';
-      return 'local:direct';
-    })(),
-    isAutoUpdateEnabled: Boolean(userConfig.get('autoUpdate.enabled')),
-    isTabAutocompletionInstalled: await checkIsTabAutocompletionInstalled(),
-    timestamp: Date.now(),
-    timezone,
-    triggeredDeprecations: Array.from(triggeredDeprecations),
-    versions,
-  };
-
-  if (shouldIncludeServiceSpecificConfig(serverless)) {
-    const npmDependencies = (() => {
-      const pkgJson = (() => {
-        try {
-          return require(path.resolve(serverless.serviceDir, 'package.json'));
-        } catch (error) {
-          return null;
-        }
-      })();
-      if (!pkgJson) return [];
-      return Array.from(
-        new Set([
-          ...Object.keys(pkgJson.dependencies || {}),
-          ...Object.keys(pkgJson.optionalDependencies || {}),
-          ...Object.keys(pkgJson.devDependencies || {}),
-        ])
-      );
-    })();
-
-    payload.npmDependencies = npmDependencies;
-    payload.config = getServiceConfig(serverless);
-    payload.dashboard.orgUid = serverless.service.orgUid;
-  }
-
-  return payload;
-};
diff --git a/lib/utils/telemetry/index.js b/lib/utils/telemetry/index.js
index da6cea7362a..f8940423052 100644
--- a/lib/utils/telemetry/index.js
+++ b/lib/utils/telemetry/index.js
@@ -1,16 +1,18 @@
 'use strict';
 
 const { join } = require('path');
-const { format } = require('util');
 const ensurePlainObject = require('type/plain-object/ensure');
 const { v1: uuid } = require('uuid');
 const fetch = require('node-fetch');
 const fse = require('fs-extra');
+const fsp = require('fs').promises;
 const telemetryUrl = require('@serverless/utils/analytics-and-notfications-url');
-const log = require('../log/serverlessLog');
-const isTelemetryDisabled = require('./areDisabled');
+const { log } = require('@serverless/utils/log');
+const isTelemetryDisabled = require('./are-disabled');
 const cacheDirPath = require('./cache-path');
 
+const telemetryLog = log.get('telemetry');
+
 const timestampWeekBefore = Date.now() - 1000 * 60 * 60 * 24 * 7;
 
 const isUuid = RegExp.prototype.test.bind(
@@ -20,8 +22,8 @@ const isUuid = RegExp.prototype.test.bind(
 let serverlessRunEndTime;
 
 const logError = (type, error) => {
+  telemetryLog.debug('User stats error: %s: %O', type, error);
   if (!process.env.SLS_STATS_DEBUG) return;
-  log(format('User stats error: %s: %O', type, error));
 };
 
 const markServerlessRunEnd = () => (serverlessRunEndTime = Date.now());
@@ -37,13 +39,11 @@ const processResponseBody = async (response, ids, startTime) => {
   }
 
   const endTime = Date.now();
-  if (serverlessRunEndTime && process.env.SLS_STATS_DEBUG) {
-    log(
-      format(
-        'Stats request prevented process from exiting for %dms (request time: %dms)',
-        endTime - serverlessRunEndTime,
-        endTime - startTime
-      )
+  if (serverlessRunEndTime) {
+    telemetryLog.debug(
+      'Stats request prevented process from exiting for %dms (request time: %dms)',
+      endTime - serverlessRunEndTime,
+      endTime - startTime
     );
   }
   return result;
@@ -79,7 +79,7 @@ async function request(payload, { ids, timeout } = {}) {
     ids.map(async (id) => {
       const cachePath = join(cacheDirPath, id);
       try {
-        await fse.unlink(cachePath);
+        await fsp.unlink(cachePath);
       } catch (error) {
         logError(`Could not remove cache file ${id}`, error);
       }
@@ -89,7 +89,9 @@ async function request(payload, { ids, timeout } = {}) {
   return processResponseBody(response, ids, startTime);
 }
 
-async function storeLocally(payload, options = {}) {
+// This method is explicitly kept as synchronous. The reason for it being the fact that it needs to
+// be executed in such manner due to its use in `process.on('SIGINT')` handler.
+function storeLocally(payload, options = {}) {
   ensurePlainObject(payload);
   if (!telemetryUrl) return null;
   const isForced = options && options.isForced;
@@ -97,13 +99,13 @@ async function storeLocally(payload, options = {}) {
   if (!cacheDirPath) return null;
   const id = uuid();
 
-  return (async function self() {
+  return (function self() {
     try {
-      return await fse.writeJson(join(cacheDirPath, id), { payload, timestamp: Date.now() });
+      return fse.writeJsonSync(join(cacheDirPath, id), { payload, timestamp: Date.now() });
     } catch (error) {
       if (error.code === 'ENOENT') {
         try {
-          await fse.ensureDir(cacheDirPath);
+          fse.ensureDirSync(cacheDirPath);
           return self();
         } catch (ensureDirError) {
           logError('Cache dir creation error:', ensureDirError);
@@ -126,7 +128,7 @@ async function send(options = {}) {
   if (!telemetryUrl) return null;
   let dirFilenames;
   try {
-    dirFilenames = await fse.readdir(cacheDirPath);
+    dirFilenames = await fsp.readdir(cacheDirPath);
   } catch (readdirError) {
     if (readdirError.code !== 'ENOENT') logError('Cannot access cache dir', readdirError);
     return null;
@@ -144,7 +146,7 @@ async function send(options = {}) {
           logError(`Cannot read cache file: ${dirFilename}`, readJsonError);
           const cacheFile = join(cacheDirPath, dirFilename);
           try {
-            return await fse.unlink(cacheFile);
+            return await fsp.unlink(cacheFile);
           } catch (error) {
             logError(`Could not remove cache file ${dirFilename}`, error);
           }
@@ -164,7 +166,7 @@ async function send(options = {}) {
 
         const cacheFile = join(cacheDirPath, dirFilename);
         try {
-          return await fse.unlink(cacheFile);
+          return await fsp.unlink(cacheFile);
         } catch (error) {
           logError(`Could not remove cache file ${dirFilename}`, error);
         }
diff --git a/lib/utils/telemetry/resolve-error-location.js b/lib/utils/telemetry/resolve-error-location.js
new file mode 100644
index 00000000000..48255f771a1
--- /dev/null
+++ b/lib/utils/telemetry/resolve-error-location.js
@@ -0,0 +1,27 @@
+'use strict';
+
+const anonymizeStacktracePaths = require('./anonymize-stacktrace-paths');
+
+const resolveErrorLocation = (exceptionTokens) => {
+  if (!exceptionTokens.stack) return '<not accessible due to non-error exception>';
+
+  const splittedStack = exceptionTokens.stack.split(/[\r\n]+/);
+  if (splittedStack.length === 1 && exceptionTokens.code) return '<not available>';
+
+  const stacktraceLineRegex = /(?:\s*at.*\((.*:\d+:\d+)\).?|\s*at\s(.*:\d+:\d+))/;
+  const stacktracePaths = [];
+  for (const line of splittedStack) {
+    const match = line.match(stacktraceLineRegex) || [];
+    const matchedPath = match[1] || match[2];
+    if (matchedPath) {
+      // Limited to maximum 7 lines in location
+      if (stacktracePaths.push(matchedPath) === 7) break;
+    } else if (stacktracePaths.length) break;
+  }
+
+  if (!stacktracePaths.length) return '<not reflected in stack>';
+
+  return anonymizeStacktracePaths(stacktracePaths).join('\n').replace(/\\/g, '/');
+};
+
+module.exports = resolveErrorLocation;
diff --git a/lib/utils/tokenize-exception.js b/lib/utils/tokenize-exception.js
index 38282d3b23a..f7dfbeeecf5 100644
--- a/lib/utils/tokenize-exception.js
+++ b/lib/utils/tokenize-exception.js
@@ -3,7 +3,7 @@
 const { inspect } = require('util');
 const isError = require('type/error/is');
 
-const userErrorNames = new Set(['ServerlessError', 'YAMLException']);
+const userErrorNames = new Set(['ServerlessError']);
 
 module.exports = (exception) => {
   if (isError(exception)) {
@@ -13,6 +13,8 @@ module.exports = (exception) => {
       stack: exception.stack,
       message: exception.message,
       isUserError: userErrorNames.has(exception.name),
+      code: exception.code,
+      decoratedMessage: exception.decoratedMessage,
     };
   }
   return {
diff --git a/lib/utils/yamlAstParser.js b/lib/utils/yaml-ast-parser.js
similarity index 93%
rename from lib/utils/yamlAstParser.js
rename to lib/utils/yaml-ast-parser.js
index 1d35a209e5e..1baa2ae59ba 100644
--- a/lib/utils/yamlAstParser.js
+++ b/lib/utils/yaml-ast-parser.js
@@ -5,8 +5,7 @@ const BbPromise = require('bluebird');
 const fs = BbPromise.promisifyAll(require('fs'));
 const _ = require('lodash');
 const os = require('os');
-const chalk = require('chalk');
-const log = require('./log/serverlessLog');
+const { log } = require('@serverless/utils/log');
 
 const findKeyChain = (astContent) => {
   let content = astContent;
@@ -25,12 +24,7 @@ const parseAST = (ymlAstContent, astObject) => {
   if (ymlAstContent.mappings && Array.isArray(ymlAstContent.mappings)) {
     ymlAstContent.mappings.forEach((v) => {
       if (!v.value) {
-        const errorMessage = [
-          'Serverless: ',
-          `${chalk.red('Your serverless.yml has an invalid value with key:')} `,
-          `${chalk.red(`"${v.key.value}"`)}`,
-        ].join('');
-        log(errorMessage);
+        log.error(`Your serverless.yml has an invalid value with key: "${v.key.value}"`);
         return;
       }
 
@@ -125,7 +119,7 @@ const addNewArrayItem = (ymlFile, pathInYml, newValue) =>
     return fs.writeFileAsync(ymlFile, `${yamlContent}${os.EOL}${newText}`);
   });
 
-const removeExistingArrayItem = (ymlFile, pathInYml, removeValue) =>
+const removeExistingArrayItem = async (ymlFile, pathInYml, removeValue) =>
   fs.readFileAsync(ymlFile, 'utf8').then((yamlContent) => {
     const rawAstObject = yaml.load(yamlContent);
     const astObject = parseAST(rawAstObject);
diff --git a/package.json b/package.json
index 609cb1b3b46..bbeea593014 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "serverless",
-  "version": "2.37.2",
+  "version": "3.0.1",
   "description": "Serverless Framework - Build web, mobile and IoT applications with serverless architectures using AWS Lambda, Azure Functions, Google CloudFunctions & more",
   "preferGlobal": true,
   "homepage": "https://serverless.com/framework/docs/",
@@ -16,56 +16,59 @@
     "apache-open-whisk",
     "iot"
   ],
-  "main": "lib/Serverless.js",
+  "main": "lib/serverless.js",
   "bin": {
     "serverless": "./bin/serverless.js",
     "sls": "./bin/serverless.js"
   },
   "dependencies": {
-    "@serverless/cli": "^1.5.2",
-    "@serverless/components": "^3.9.0",
-    "@serverless/enterprise-plugin": "^4.5.3",
-    "@serverless/utils": "^4.1.0",
-    "ajv": "^6.12.6",
-    "ajv-keywords": "^3.5.2",
+    "@serverless/dashboard-plugin": "^6.0.0",
+    "@serverless/platform-client": "^4.3.0",
+    "@serverless/utils": "^6.0.0",
+    "ajv": "^8.9.0",
+    "ajv-formats": "^2.1.1",
     "archiver": "^5.3.0",
-    "aws-sdk": "^2.890.0",
+    "aws-sdk": "^2.1065.0",
     "bluebird": "^3.7.2",
-    "boxen": "^5.0.1",
     "cachedir": "^2.3.0",
-    "chalk": "^4.1.1",
+    "chalk": "^4.1.2",
     "child-process-ext": "^2.1.1",
-    "ci-info": "^3.1.1",
+    "ci-info": "^3.3.0",
+    "cli-progress-footer": "^2.3.0",
     "d": "^1.0.1",
-    "dayjs": "^1.10.4",
+    "dayjs": "^1.10.7",
     "decompress": "^4.2.1",
-    "dotenv": "^8.2.0",
-    "download": "^8.0.0",
-    "essentials": "^1.1.1",
+    "dotenv": "^10.0.0",
+    "dotenv-expand": "^5.1.0",
+    "essentials": "^1.2.0",
+    "ext": "^1.6.0",
     "fastest-levenshtein": "^1.0.12",
-    "filesize": "^6.3.0",
+    "filesize": "^8.0.7",
     "fs-extra": "^9.1.0",
     "get-stdin": "^8.0.0",
-    "globby": "^11.0.3",
-    "got": "^11.8.2",
-    "graceful-fs": "^4.2.6",
+    "globby": "^11.1.0",
+    "got": "^11.8.3",
+    "graceful-fs": "^4.2.9",
     "https-proxy-agent": "^5.0.0",
     "is-docker": "^2.2.1",
-    "is-wsl": "^2.2.0",
     "js-yaml": "^4.1.0",
     "json-cycle": "^1.3.0",
     "json-refs": "^3.0.15",
     "lodash": "^4.17.21",
     "memoizee": "^0.4.15",
     "micromatch": "^4.0.4",
-    "ncjsm": "^4.1.0",
-    "node-fetch": "^2.6.1",
-    "object-hash": "^2.1.1",
+    "node-fetch": "^2.6.7",
+    "object-hash": "^2.2.0",
+    "open": "^7.4.2",
+    "path2": "^0.1.0",
+    "process-utils": "^4.0.0",
     "promise-queue": "^2.2.5",
-    "replaceall": "^0.1.6",
+    "require-from-string": "^2.0.2",
     "semver": "^7.3.5",
-    "tabtab": "^3.0.2",
-    "tar": "^6.1.0",
+    "signal-exit": "^3.0.6",
+    "strip-ansi": "^6.0.1",
+    "supports-color": "^8.1.1",
+    "tar": "^6.1.11",
     "timers-ext": "^0.1.7",
     "type": "^2.5.0",
     "untildify": "^4.0.0",
@@ -73,34 +76,34 @@
     "yaml-ast-parser": "0.0.43"
   },
   "devDependencies": {
-    "@commitlint/cli": "^12.1.1",
-    "@serverless/eslint-config": "^3.0.0",
-    "@serverless/test": "^8.1.0",
-    "chai": "^4.3.4",
+    "@commitlint/cli": "^12.1.4",
+    "@serverless/eslint-config": "^4.0.0",
+    "@serverless/test": "^9.0.0",
+    "adm-zip": "^0.5.9",
+    "chai": "^4.3.6",
     "chai-as-promised": "^7.1.1",
-    "cos-nodejs-sdk-v5": "^2.9.13",
-    "eslint": "^7.24.0",
-    "eslint-plugin-import": "^2.22.1",
+    "cos-nodejs-sdk-v5": "^2.11.6",
+    "eslint": "^7.32.0",
+    "eslint-plugin-import": "^2.25.4",
     "git-list-updated": "^1.2.1",
     "github-release-from-cc-changelog": "^2.2.0",
     "husky": "^4.3.8",
-    "jszip": "^3.6.0",
+    "jszip": "^3.7.1",
     "lint-staged": "^10.5.4",
-    "log": "^6.0.0",
-    "log-node": "^7.0.0",
-    "mocha": "^8.3.2",
+    "log": "^6.3.1",
+    "log-node": "^8.0.3",
+    "mocha": "^8.4.0",
     "mock-require": "^3.0.3",
+    "ncjsm": "^4.3.0",
     "nyc": "^15.1.0",
-    "pkg": "^4.5.1",
-    "prettier": "^2.2.1",
-    "process-utils": "^4.0.0",
+    "pkg": "^5.5.2",
+    "prettier": "^2.5.1",
     "proxyquire": "^2.1.3",
-    "semver-regex": "^3.1.2",
-    "sinon": "^10.0.0",
-    "sinon-chai": "^3.6.0",
-    "standard-version": "^9.2.0",
-    "strip-ansi": "^6.0.0",
-    "ws": "^7.4.5",
+    "semver-regex": "^3.1.3",
+    "sinon": "^12.0.1",
+    "sinon-chai": "^3.7.0",
+    "standard-version": "^9.3.2",
+    "ws": "^7.5.6",
     "xml2js": "^0.4.23"
   },
   "eslintConfig": {
@@ -120,12 +123,12 @@
   "eslintIgnore": [
     "!/.github",
     "/lib/plugins/create/templates/**",
-    "/lib/plugins/aws/customResources/node_modules/**",
+    "/lib/plugins/aws/custom-resources/node_modules/**",
     "!/test/fixtures/programmatic/locallyInstalledServerless/node_modules/**"
   ],
   "mocha": {
     "require": [
-      "./test/mochaPatch",
+      "./test/mocha-patch",
       "@serverless/test/setup/log",
       "@serverless/test/setup/mock-homedir",
       "@serverless/test/setup/mock-cwd",
@@ -191,10 +194,10 @@
   "scripts": {
     "commitlint": "commitlint -f HEAD@{15}",
     "coverage": "nyc npm test",
-    "integration-test-cleanup": "node test/utils/awsCleanup.js",
+    "integration-test-cleanup": "node test/utils/aws-cleanup.js",
     "integration-test-run-all": "mocha-isolated --pass-through-aws-creds --skip-fs-cleanup-check --max-workers=20 \"test/integration/**/*.test.js\"",
-    "integration-test-run-basic": "mocha test/integrationBasic.test.js",
-    "integration-test-run-package": "mocha-isolated --skip-fs-cleanup-check test/integrationPackage/**/*.tests.js",
+    "integration-test-run-basic": "mocha test/integration-basic.test.js",
+    "integration-test-run-package": "mocha-isolated --skip-fs-cleanup-check test/integration-package/**/*.tests.js",
     "integration-test-setup": "node ./scripts/test/integration-setup/index.js",
     "integration-test-teardown": "node ./scripts/test/integration-teardown.js",
     "lint": "eslint .",
@@ -213,7 +216,7 @@
     "test:isolated": "mocha-isolated \"test/unit/**/*.test.js\""
   },
   "engines": {
-    "node": ">=10.0"
+    "node": ">=12.0"
   },
   "license": "MIT"
 }
diff --git a/scripts/pkg/build.js b/scripts/pkg/build.js
index bb71518becd..91fa85ff762 100755
--- a/scripts/pkg/build.js
+++ b/scripts/pkg/build.js
@@ -20,7 +20,7 @@ const spawnOptions = { cwd: serverlessPath, stdio: 'inherit' };
   // It's due to fact that npm tends to issue buggy releases
   // Node.js confirms on given version before including it within its bundle
   // Version mappings reference: https://nodejs.org/en/download/releases/
-  await spawn('npm', ['install', '--no-save', 'npm@6.13.4'], spawnOptions);
+  await spawn('npm', ['install', '--no-save', 'npm@8.1.2'], spawnOptions);
 
   try {
     process.stdout.write('Build binaries\n');
@@ -31,7 +31,7 @@ const spawnOptions = { cwd: serverlessPath, stdio: 'inherit' };
         '-c',
         'scripts/pkg/config.js',
         '--targets',
-        'node14-linux-x64,node14-mac-x64,node14-win-x64',
+        'node16-linux-x64,node16-mac-x64,node16-win-x64',
         '--out-path',
         'dist',
         'bin/serverless.js',
diff --git a/scripts/pkg/config.js b/scripts/pkg/config.js
index 541147c650c..91161c33abd 100644
--- a/scripts/pkg/config.js
+++ b/scripts/pkg/config.js
@@ -5,19 +5,21 @@ module.exports = {
   // which is important for local templates installation
   license: 'MIT',
   files: [
+    // Standalone commands
+    '../../commands',
     // Custom resources
-    '../../lib/plugins/aws/customResources/resources',
+    '../../lib/plugins/aws/custom-resources/resources',
     // Basic CF templates
     '../../lib/plugins/aws/package/lib/*.json',
     // Service templates
     '../../lib/plugins/create/templates',
     // Local invocation artifacts
-    '../../lib/plugins/aws/invokeLocal/runtimeWrappers',
+    '../../lib/plugins/aws/invoke-local/runtime-wrappers',
     // Dashboard policies
-    '../../node_modules/@serverless/enterprise-plugin/lib/safeguards/policies',
+    '../../node_modules/@serverless/dashboard-plugin/lib/safeguards/policies',
     // Dashboard wrappers
-    '../../node_modules/@serverless/enterprise-plugin/sdk-js/dist/index.js',
-    '../../node_modules/@serverless/enterprise-plugin/sdk-py',
+    '../../node_modules/@serverless/dashboard-plugin/sdk-js/dist/index.js',
+    '../../node_modules/@serverless/dashboard-plugin/sdk-py',
     // Ensure npm is bundled as a dependency
     '../../node_modules/npm/bin/npm-cli.js',
     // Below module is not automatically traced by pkg, we need to point it manually
diff --git a/scripts/pkg/install.sh b/scripts/pkg/install.sh
index 8c934c971fd..28b16b94185 100755
--- a/scripts/pkg/install.sh
+++ b/scripts/pkg/install.sh
@@ -30,6 +30,9 @@ fi
 MACHINE_TYPE=`uname -m`
 if [[ $MACHINE_TYPE == "x86_64" ]]; then
   ARCH='x64'
+elif [[ $OSTYPE == "darwin"* ]] && [[ $MACHINE_TYPE == "arm64" ]]; then
+  ARCH='x64'
+  echo "There is no native binary installer available for $MACHINE_TYPE architecture. Version for x86_64 architecture will be installed instead. In order to use it, you need to have Rosetta installed."
 else
   echo "$red Sorry, there's no serverless binary installer available for $MACHINE_TYPE architecture. Please open request for it at https://github.com/serverless/serverless/issues.$reset"
   exit 1
diff --git a/scripts/pkg/upload/world.js b/scripts/pkg/upload/world.js
index bd58eb47f36..9520500f076 100755
--- a/scripts/pkg/upload/world.js
+++ b/scripts/pkg/upload/world.js
@@ -2,6 +2,7 @@
 
 const path = require('path');
 const fs = require('fs');
+const fsp = require('fs').promises;
 const fetch = require('node-fetch');
 const chalk = require('chalk');
 
@@ -37,7 +38,7 @@ module.exports = async (versionTag, { isLegacyVersion }) => {
     request(`${API_URL}${releaseId}/assets`, requestOptions)
   );
 
-  const distFileBasenames = await fs.promises.readdir(distPath);
+  const distFileBasenames = await fsp.readdir(distPath);
   await Promise.all(
     distFileBasenames
       .map(async (distFileBasename) => {
@@ -63,7 +64,7 @@ module.exports = async (versionTag, { isLegacyVersion }) => {
             body: fs.createReadStream(filePath),
             headers: {
               ...requestOptions.headers,
-              'content-length': (await fs.promises.stat(filePath)).size,
+              'content-length': (await fsp.stat(filePath)).size,
               'content-type': 'application/octet-stream',
             },
           }
diff --git a/scripts/postinstall.js b/scripts/postinstall.js
old mode 100644
new mode 100755
index bebf691af91..38ce6f2e5a3
--- a/scripts/postinstall.js
+++ b/scripts/postinstall.js
@@ -1,33 +1,32 @@
 'use strict';
 
-const boxen = require('boxen');
 const chalk = require('chalk');
-const isStandaloneExecutable = require('../lib/utils/isStandaloneExecutable');
+const isStandaloneExecutable = require('../lib/utils/is-standalone-executable');
 
 const isWindows = process.platform === 'win32';
 
 const truthyStr = (val) => val && !['0', 'false', 'f', 'n', 'no'].includes(val.toLowerCase());
 const { CI, ADBLOCK, SILENT } = process.env;
+const isNpmGlobalPackage = require('../lib/utils/npm-package/is-global');
+
 if (!truthyStr(CI) && !truthyStr(ADBLOCK) && !truthyStr(SILENT)) {
   const messageTokens = ['Serverless Framework successfully installed!'];
+
   if (isStandaloneExecutable && !isWindows) {
     messageTokens.push(
-      'To start your first project, please open another terminal and run “serverless”.',
-      'You can uninstall at anytime by running “serverless uninstall”.'
+      'To start your first project, please open another terminal and run “serverless”.'
     );
   } else {
-    messageTokens.push("To start your first project run 'serverless'.");
+    messageTokens.push('To start your first project run “serverless”.');
+  }
+
+  if ((isStandaloneExecutable && !isWindows) || isNpmGlobalPackage()) {
+    messageTokens.push('Turn on automatic updates by running “serverless config --autoupdate”.');
   }
-  const message = messageTokens.join('\n\n');
-  process.stdout.write(
-    `${
-      isStandaloneExecutable && isWindows
-        ? message
-        : boxen(chalk.yellow(message), {
-            padding: 1,
-            margin: 1,
-            borderColor: 'yellow',
-          })
-    }\n`
-  );
+
+  if (isStandaloneExecutable && !isWindows) {
+    messageTokens.push('Uninstall at any time by running “serverless uninstall”.');
+  }
+
+  process.stdout.write(`${chalk.grey(messageTokens.join('\n\n'))}\n`);
 }
diff --git a/scripts/serverless.js b/scripts/serverless.js
index c99975b64b2..bb39fb8ae61 100755
--- a/scripts/serverless.js
+++ b/scripts/serverless.js
@@ -8,95 +8,179 @@ require('essentials');
 // https://github.com/isaacs/node-graceful-fs#global-patching
 require('graceful-fs').gracefulify(require('fs'));
 
-if (require('../lib/utils/tabCompletion/isSupported') && process.argv[2] === 'completion') {
-  require('../lib/utils/autocomplete')();
-  return;
-}
+// Setup log writing
+require('@serverless/utils/log-reporters/node');
+const { log, progress } = require('@serverless/utils/log');
 
 const handleError = require('../lib/cli/handle-error');
-const humanizePropertyPathKeys = require('../lib/configuration/variables/humanize-property-path-keys');
-
+const {
+  storeLocally: storeTelemetryLocally,
+  send: sendTelemetry,
+} = require('../lib/utils/telemetry');
+const generateTelemetryPayload = require('../lib/utils/telemetry/generate-payload');
+const isTelemetryDisabled = require('../lib/utils/telemetry/are-disabled');
+const logDeprecation = require('../lib/utils/log-deprecation');
+
+let command;
+let isHelpRequest;
+let options;
+let commandSchema;
+let serviceDir = null;
+let configuration = null;
 let serverless;
-
-process.once('uncaughtException', (error) =>
-  handleError(error, {
-    isUncaughtException: true,
-    isLocallyInstalled: serverless && serverless.isLocallyInstalled,
-    isInvokedByGlobalInstallation: serverless && serverless.isInvokedByGlobalInstallation,
-  })
-);
-
-const processSpanPromise = (async () => {
+const commandUsage = {};
+const variableSourcesInConfig = new Set();
+
+// Inquirer async operations do not keep node process alive
+// We need to issue a keep alive timer so process does not die
+// to properly handle e.g. `SIGINT` interrupt
+const keepAliveTimer = setTimeout(() => {}, 60 * 60 * 1000);
+
+let processSpanPromise;
+let hasBeenFinalized = false;
+const finalize = async ({ error, shouldBeSync, telemetryData, shouldSendTelemetry } = {}) => {
+  if (hasBeenFinalized) {
+    if (error) {
+      // Programmer error in finalize handling, ensure to expose
+      process.nextTick(() => {
+        throw error;
+      });
+    }
+    return null;
+  }
+  hasBeenFinalized = true;
+  clearTimeout(keepAliveTimer);
+  progress.clear();
+  if (error) ({ telemetryData } = await handleError(error, { serverless }));
+  if (!shouldBeSync) await logDeprecation.printSummary();
+  if (isTelemetryDisabled || !commandSchema) return null;
+  if (!error && isHelpRequest) return null;
+  storeTelemetryLocally({
+    ...generateTelemetryPayload({
+      command,
+      options,
+      commandSchema,
+      serviceDir,
+      configuration,
+      serverless,
+      commandUsage,
+      variableSources: variableSourcesInConfig,
+    }),
+    ...telemetryData,
+  });
+  if (!error && !shouldSendTelemetry) return null;
+  return sendTelemetry({ serverlessExecutionSpan: processSpanPromise });
+};
+
+process.once('uncaughtException', (error) => {
+  log.error('Uncaught exception');
+  finalize({ error }).then(() => process.exit());
+});
+
+processSpanPromise = (async () => {
   try {
     const wait = require('timers-ext/promise/sleep');
     await wait(); // Ensure access to "processSpanPromise"
 
+    require('signal-exit/signals').forEach((signal) => {
+      process.once(signal, () => {
+        // If there's another listener (e.g. we're in deamon context or reading stdin input)
+        // then let the other listener decide how process will exit
+        const isOtherSigintListener = Boolean(process.listenerCount(signal));
+        finalize({
+          shouldBeSync: true,
+          telemetryData: { outcome: 'interrupt', interruptSignal: signal },
+        });
+        if (isOtherSigintListener) return;
+        // Follow recommendation from signal-exit:
+        // https://github.com/tapjs/signal-exit/blob/654117d6c9035ff6a805db4d4acf1f0c820fcb21/index.js#L97-L98
+        if (process.platform === 'win32' && signal === 'SIGHUP') signal = 'SIGINT';
+        process.kill(process.pid, signal);
+      });
+    });
+
+    const humanizePropertyPathKeys = require('../lib/configuration/variables/humanize-property-path-keys');
+    const processBackendNotificationRequest = require('../lib/utils/process-backend-notification-request');
+
+    (() => {
+      // Rewrite eventual `sls deploy -f` into `sls deploy function -f`
+      const isParamName = RegExp.prototype.test.bind(require('../lib/cli/param-reg-exp'));
+
+      const args = process.argv.slice(2);
+      const firstParamIndex = args.findIndex(isParamName);
+      const commands = args.slice(0, firstParamIndex === -1 ? Infinity : firstParamIndex);
+      if (commands.join(' ') !== 'deploy') return;
+      if (!args.includes('-f') && !args.includes('--function')) return;
+      logDeprecation(
+        'CLI_DEPLOY_FUNCTION_OPTION_V3',
+        'Starting with v4.0.0, `--function` or `-f` option for `deploy` command will no longer be supported. In order to deploy a single function, please use `deploy function` command instead.'
+      );
+      process.argv.splice(3, 0, 'function');
+    })();
+
     const resolveInput = require('../lib/cli/resolve-input');
 
+    let commands;
     // Parse args against schemas of commands which do not require to be run in service context
-    let { command, commands, options, isHelpRequest, commandSchema } = resolveInput(
+    ({ command, commands, options, isHelpRequest, commandSchema } = resolveInput(
       require('../lib/cli/commands-schema/no-service')
-    );
+    ));
 
     // If version number request, show it and abort
     if (options.version) {
       await require('../lib/cli/render-version')();
+      await finalize();
       return;
     }
 
     const ServerlessError = require('../lib/serverless-error');
+
+    // Abort if command is not supported in this environment
     if (commandSchema && commandSchema.isHidden && commandSchema.noSupportNotice) {
       throw new ServerlessError(
-        `Cannot run \`${command}\` command: ${commandSchema.noSupportNotice}`
+        `Cannot run \`${command}\` command: ${commandSchema.noSupportNotice}`,
+        'NOT_SUPPORTED_COMMAND'
       );
     }
 
     const path = require('path');
     const uuid = require('uuid');
     const _ = require('lodash');
-    const Serverless = require('../lib/Serverless');
+    const clear = require('ext/object/clear');
+    const Serverless = require('../lib/serverless');
     const resolveVariables = require('../lib/configuration/variables/resolve');
     const isPropertyResolved = require('../lib/configuration/variables/is-property-resolved');
     const eventuallyReportVariableResolutionErrors = require('../lib/configuration/variables/eventually-report-resolution-errors');
     const filterSupportedOptions = require('../lib/cli/filter-supported-options');
-    const logDeprecation = require('../lib/utils/logDeprecation');
 
     let configurationPath = null;
-    let configuration = null;
-    let serviceDir = null;
     let providerName;
     let variablesMeta;
     let resolverConfiguration;
+    let isInteractiveSetup;
 
-    const ensureResolvedProperty = (propertyPath, { shouldSilentlyReturnIfLegacyMode } = {}) => {
+    const ensureResolvedProperty = (propertyPath) => {
       if (isPropertyResolved(variablesMeta, propertyPath)) return true;
       variablesMeta = null;
       if (isHelpRequest) return false;
       const humanizedPropertyPath = humanizePropertyPathKeys(propertyPath.split('\0'));
-      if (!shouldSilentlyReturnIfLegacyMode || configuration.variablesResolutionMode) {
-        throw new ServerlessError(
-          `Cannot resolve ${path.basename(
-            configurationPath
-          )}: "${humanizedPropertyPath}" property is not accessible ` +
-            '(configured behind variables which cannot be resolved at this stage)'
-        );
-      }
-      logDeprecation(
-        'NEW_VARIABLES_RESOLVER',
-        `"${humanizedPropertyPath}" is not accessible ` +
-          '(configured behind variables which cannot be resolved at this stage).\n' +
-          'Starting with next major release, ' +
-          'this will be communicated with a thrown error.\n' +
-          'Set "variablesResolutionMode: 20210326" in your service config, ' +
-          'to adapt to this behavior now',
-        { serviceConfig: configuration }
+      throw new ServerlessError(
+        `Cannot resolve ${path.basename(
+          configurationPath
+        )}: "${humanizedPropertyPath}" property is not accessible ` +
+          '(configured behind variables which cannot be resolved at this stage)',
+        'INACCESSIBLE_CONFIGURATION_PROPERTY'
       );
-      return false;
     };
 
     if (!commandSchema || commandSchema.serviceDependencyMode) {
+      // Command is potentially service specific, follow up with resolution of service config
+
+      isInteractiveSetup = !isHelpRequest && command === '';
+
       const resolveConfigurationPath = require('../lib/cli/resolve-configuration-path');
       const readConfiguration = require('../lib/configuration/read');
+      const resolveProviderName = require('../lib/configuration/resolve-provider-name');
 
       // Resolve eventual service configuration path
       configurationPath = await resolveConfigurationPath();
@@ -120,39 +204,16 @@ const processSpanPromise = (async () => {
         serviceDir = process.cwd();
         if (!commandSchema) {
           // If command was not recognized in first resolution phase
-          // Parse args again also against schemas commands which require service to be run
+          // parse args again also against schemas of commands which require service context
           resolveInput.clear();
           ({ command, commands, options, isHelpRequest, commandSchema } = resolveInput(
             require('../lib/cli/commands-schema/service')
           ));
         }
 
-        // IIFE for maintanance convenience
+        // IIFE for maintenance convenience
         await (async () => {
-          if (_.get(configuration.provider, 'variableSyntax')) {
-            // Request to rely on old variables resolver explictly, abort
-            if (isHelpRequest) return;
-            if (configuration.variablesResolutionMode) {
-              throw new ServerlessError(
-                `Cannot resolve ${path.basename(
-                  configurationPath
-                )}: "variableSyntax" is not supported with new variables resolver. ` +
-                  'Please drop this setting'
-              );
-            }
-            logDeprecation(
-              'NEW_VARIABLES_RESOLVER',
-              'Serverless Framework was enhanced with a new variables resolver ' +
-                'which doesn\'t recognize "provider.variableSyntax" setting.' +
-                "Starting with a new major it will be the only resolver that's used." +
-                '. Drop setting from a configuration to adapt to it',
-              { serviceConfig: configuration }
-            );
-            return;
-          }
-
           const resolveVariablesMeta = require('../lib/configuration/variables/resolve-meta');
-          const resolveProviderName = require('../lib/configuration/resolve-provider-name');
 
           variablesMeta = resolveVariablesMeta(configuration);
 
@@ -168,10 +229,8 @@ const processSpanPromise = (async () => {
             return;
           }
 
-          // "variablesResolutionMode" must not be configured with variables as it influences
-          // variable resolution choices
-          if (!ensureResolvedProperty('variablesResolutionMode')) return;
           if (!ensureResolvedProperty('disabledDeprecations')) return;
+          if (!ensureResolvedProperty('deprecationNotificationMode')) return;
 
           if (isPropertyResolved(variablesMeta, 'provider\0name')) {
             providerName = resolveProviderName(configuration);
@@ -181,14 +240,16 @@ const processSpanPromise = (async () => {
             }
           }
           if (!commandSchema && providerName === 'aws') {
-            // If command was not recognized in first resolution phase
-            // Parse args again also against schemas commands which require AWS service to be run
+            // If command was not recognized in previous resolution phases
+            // parse args again also against schemas commands which require AWS service context
             resolveInput.clear();
+
             ({ command, commands, options, isHelpRequest, commandSchema } = resolveInput(
               require('../lib/cli/commands-schema/aws-service')
             ));
           }
 
+          let envVarNamesNeededForDotenvResolution;
           if (variablesMeta.size) {
             // Some properties are configured with variables
 
@@ -204,11 +265,14 @@ const processSpanPromise = (async () => {
                 opt: require('../lib/configuration/variables/sources/opt'),
                 self: require('../lib/configuration/variables/sources/self'),
                 strToBool: require('../lib/configuration/variables/sources/str-to-bool'),
+                sls: require('../lib/configuration/variables/sources/instance-dependent/get-sls')(),
               },
               options: filterSupportedOptions(options, { commandSchema, providerName }),
               fulfilledSources: new Set(['file', 'self', 'strToBool']),
               propertyPathsToResolve: new Set(['provider\0name', 'provider\0stage', 'useDotenv']),
+              variableSourcesInConfig,
             };
+            if (isInteractiveSetup) resolverConfiguration.fulfilledSources.add('opt');
             await resolveVariables(resolverConfiguration);
 
             if (
@@ -258,24 +322,63 @@ const processSpanPromise = (async () => {
               }
             }
 
+            resolverConfiguration.fulfilledSources.add('env');
             if (
-              !ensureResolvedProperty('provider\0stage', { shouldSilentlyReturnIfLegacyMode: true })
+              !isPropertyResolved(variablesMeta, 'provider\0stage') ||
+              !isPropertyResolved(variablesMeta, 'useDotenv')
             ) {
-              // Hack to not duplicate the warning with similar deprecation
-              logDeprecation.triggeredDeprecations.add('VARIABLES_ERROR_ON_UNRESOLVED');
-              return;
-            }
+              // Assume "env" source fulfilled for `provider.stage` and `useDotenv` resolution.
+              // To pick eventual resolution conflict, track what env variables were reported
+              // misssing when applying this resolution
+              const envSource = require('../lib/configuration/variables/sources/env');
+              envSource.missingEnvVariables.clear();
+              await resolveVariables({
+                ...resolverConfiguration,
+                propertyPathsToResolve: new Set(['provider\0stage', 'useDotenv']),
+              });
+              if (
+                eventuallyReportVariableResolutionErrors(
+                  configurationPath,
+                  configuration,
+                  variablesMeta
+                )
+              ) {
+                // Unrecoverable resolution errors, abort
+                variablesMeta = null;
+                return;
+              }
+
+              if (
+                !ensureResolvedProperty('provider\0stage', {
+                  shouldSilentlyReturnIfLegacyMode: true,
+                })
+              ) {
+                return;
+              }
+
+              if (!ensureResolvedProperty('useDotenv')) return;
 
-            if (!ensureResolvedProperty('useDotenv')) return;
+              envVarNamesNeededForDotenvResolution = envSource.missingEnvVariables;
+            }
           }
 
           // Load eventual environment variables from .env files
           await require('../lib/cli/conditionally-load-dotenv')(options, configuration);
 
-          if (!variablesMeta.size) return; // No properties configured with variables
+          if (envVarNamesNeededForDotenvResolution) {
+            for (const envVarName of envVarNamesNeededForDotenvResolution) {
+              if (process.env[envVarName]) {
+                throw new ServerlessError(
+                  'Cannot reliably resolve "env" variables due to resolution conflict.\n' +
+                    `Environment variable "${envVarName}" which influences resolution of ` +
+                    '".env" file were found to be defined in resolved ".env" file.' +
+                    'DOTENV_ENV_VAR_RESOLUTION_CONFLICT'
+                );
+              }
+            }
+          }
 
-          // Resolve all unresolved configuration properties
-          resolverConfiguration.fulfilledSources.add('env');
+          if (!variablesMeta.size) return; // No properties configured with variables
 
           if (isHelpRequest || commands[0] === 'plugin') {
             // We do not need full config resolved, we just need to know what
@@ -333,36 +436,89 @@ const processSpanPromise = (async () => {
           if (!variablesMeta.size) return; // All properties successuflly resolved
 
           if (!ensureResolvedProperty('plugins')) return;
+          if (!ensureResolvedProperty('package\0path')) return;
 
           if (!ensureResolvedProperty('frameworkVersion')) return;
-          if (!ensureResolvedProperty('configValidationMode')) return;
           if (!ensureResolvedProperty('app')) return;
           if (!ensureResolvedProperty('org')) return;
-          if (!ensureResolvedProperty('service', { shouldSilentlyReturnIfLegacyMode: true })) {
-            return;
-          }
+          if (!ensureResolvedProperty('service')) return;
           if (configuration.org) {
             // Dashboard requires AWS region to be resolved upfront
-            ensureResolvedProperty('provider\0region', { shouldSilentlyReturnIfLegacyMode: true });
+            ensureResolvedProperty('provider\0region');
           }
         })();
+
+        // Ensure to have full AWS commands schema loaded if we're in context of AWS provider
+        // It's not the case if not AWS service specific command was resolved
+        if (configuration && resolveProviderName(configuration) === 'aws') {
+          resolveInput.clear();
+          ({ command, commands, options, isHelpRequest, commandSchema } = resolveInput(
+            require('../lib/cli/commands-schema/aws-service')
+          ));
+        }
       } else {
         // In non-service context we recognize all AWS service commands
         resolveInput.clear();
         ({ command, commands, options, isHelpRequest, commandSchema } = resolveInput(
           require('../lib/cli/commands-schema/aws-service')
         ));
+
+        // Validate result command and options
         require('../lib/cli/ensure-supported-command')();
       }
+    } else {
+      require('../lib/cli/ensure-supported-command')();
+    }
+
+    const configurationFilename = configuration && configurationPath.slice(serviceDir.length + 1);
+
+    // Names of the commands which are configured independently in root `commands` folder
+    // and not in Serverless class internals
+    const notIntegratedCommands = new Set(['doctor', 'plugin install', 'plugin uninstall']);
+    const isStandaloneCommand = notIntegratedCommands.has(command);
+
+    if (!isHelpRequest && (isInteractiveSetup || isStandaloneCommand)) {
+      if (configuration) require('../lib/cli/ensure-supported-command')(configuration);
+      if (isInteractiveSetup) {
+        if (!process.stdin.isTTY && !process.env.SLS_INTERACTIVE_SETUP_ENABLE) {
+          throw new ServerlessError(
+            'Attempted to run an interactive setup in non TTY environment.\n' +
+              "If that's intended, run with the SLS_INTERACTIVE_SETUP_ENABLE=1 environment variable",
+            'INTERACTIVE_SETUP_IN_NON_TTY'
+          );
+        }
+        const interactiveContext = await require('../lib/cli/interactive-setup')({
+          configuration,
+          serviceDir,
+          configurationFilename,
+          options,
+          commandUsage,
+        });
+        if (interactiveContext.configuration) {
+          configuration = interactiveContext.configuration;
+        }
+        if (interactiveContext.serverless) {
+          serverless = interactiveContext.serverless;
+        }
+      } else {
+        await require(`../commands/${commands.join('-')}`)({
+          configuration,
+          serviceDir,
+          configurationFilename,
+          options,
+        });
+      }
+
+      await finalize({ telemetryData: { outcome: 'success', shouldSendTelemetry: true } });
+      return;
     }
 
     serverless = new Serverless({
       configuration,
       serviceDir,
-      configurationFilename: configuration && configurationPath.slice(serviceDir.length + 1),
+      configurationFilename,
       isConfigurationResolved:
         commands[0] === 'plugin' || Boolean(variablesMeta && !variablesMeta.size),
-      hasResolvedCommandsExternally: true,
       commands,
       options,
     });
@@ -371,37 +527,27 @@ const processSpanPromise = (async () => {
       serverless.onExitPromise = processSpanPromise;
       serverless.invocationId = uuid.v4();
       await serverless.init();
-      if (serverless.invokedInstance) {
-        serverless.invokedInstance.invocationId = serverless.invocationId;
-        serverless = serverless.invokedInstance;
-      }
 
       // IIFE for maintanance convenience
       await (async () => {
         if (!configuration) return;
         let hasFinalCommandSchema = false;
         if (configuration.plugins) {
-          // TODO: Remove "serverless.pluginManager.externalPlugins" check with next major
-          if (serverless.pluginManager.externalPlugins) {
-            if (serverless.pluginManager.externalPlugins.size) {
-              // After plugins are loaded, re-resolve CLI command and options schema as plugin
-              // might have defined extra commands and options
-              const commandsSchema = require('../lib/cli/commands-schema/resolve-final')(
-                serverless.pluginManager.externalPlugins,
-                { providerName: providerName || 'aws', configuration }
-              );
-              resolveInput.clear();
-              ({ command, commands, options, isHelpRequest, commandSchema } = resolveInput(
-                commandsSchema
-              ));
-              serverless.processedInput.commands = serverless.pluginManager.cliCommands = commands;
-              serverless.processedInput.options = serverless.pluginManager.cliOptions = options;
-              hasFinalCommandSchema = true;
-            }
-          } else {
-            // Invocation fallen back to old Framework version. As we do not have easily
-            // accessible info on loaded plugins, skip further variables resolution
-            variablesMeta = null;
+          // After plugins are loaded, re-resolve CLI command and options schema as plugin
+          // might have defined extra commands and options
+
+          if (serverless.pluginManager.externalPlugins.size) {
+            const commandsSchema = require('../lib/cli/commands-schema/resolve-final')(
+              serverless.pluginManager.externalPlugins,
+              { providerName: providerName || 'aws', configuration }
+            );
+            resolveInput.clear();
+            ({ command, commands, options, isHelpRequest, commandSchema } =
+              resolveInput(commandsSchema));
+            serverless.processedInput.commands = serverless.pluginManager.cliCommands = commands;
+            serverless.processedInput.options = options;
+            Object.assign(clear(serverless.pluginManager.cliOptions), options);
+            hasFinalCommandSchema = true;
           }
         }
         if (!providerName && !hasFinalCommandSchema) {
@@ -411,25 +557,22 @@ const processSpanPromise = (async () => {
             require('../lib/cli/commands-schema/aws-service')
           ));
         }
+        hasFinalCommandSchema = true;
 
-        require('../lib/cli/ensure-supported-command')(configuration);
+        // Validate result command and options
+        if (hasFinalCommandSchema) require('../lib/cli/ensure-supported-command')(configuration);
         if (isHelpRequest) return;
         if (!_.get(variablesMeta, 'size')) return;
 
+        // Resolve remaininig service configuration variables
         if (providerName === 'aws') {
+          // Ensure properties which are crucial to some variable source resolvers
+          // are actually resolved.
           if (
-            !ensureResolvedProperty('provider\0credentials', {
-              shouldSilentlyReturnIfLegacyMode: true,
-            }) ||
-            !ensureResolvedProperty('provider\0deploymentBucket\0serverSideEncryption', {
-              shouldSilentlyReturnIfLegacyMode: true,
-            }) ||
-            !ensureResolvedProperty('provider\0profile', {
-              shouldSilentlyReturnIfLegacyMode: true,
-            }) ||
-            !ensureResolvedProperty('provider\0region', {
-              shouldSilentlyReturnIfLegacyMode: true,
-            })
+            !ensureResolvedProperty('provider\0credentials') ||
+            !ensureResolvedProperty('provider\0deploymentBucket\0serverSideEncryption') ||
+            !ensureResolvedProperty('provider\0profile') ||
+            !ensureResolvedProperty('provider\0region')
           ) {
             return;
           }
@@ -440,14 +583,11 @@ const processSpanPromise = (async () => {
             providerName,
           });
         }
-        if (configuration.variablesResolutionMode >= 20210326) {
-          // New resolver, resolves just recognized CLI options. Therefore we cannot assume
-          // we have full "opt" source data if user didn't explicitly switch to new resolver
-          resolverConfiguration.fulfilledSources.add('opt');
-        }
-        resolverConfiguration.sources.sls = require('../lib/configuration/variables/sources/instance-dependent/get-sls')(
-          serverless
-        );
+        resolverConfiguration.fulfilledSources.add('opt');
+
+        // Register serverless instance and AWS provider specific variable sources
+        resolverConfiguration.sources.sls =
+          require('../lib/configuration/variables/sources/instance-dependent/get-sls')(serverless);
         resolverConfiguration.fulfilledSources.add('sls');
 
         if (providerName === 'aws') {
@@ -461,156 +601,86 @@ const processSpanPromise = (async () => {
             ssm: require('../lib/configuration/variables/sources/instance-dependent/get-ssm')(
               serverless
             ),
+            aws: require('../lib/configuration/variables/sources/instance-dependent/get-aws')(
+              serverless
+            ),
           });
           resolverConfiguration.fulfilledSources.add('cf').add('s3').add('ssm');
         }
 
-        if (configuration.org && serverless.pluginManager.dashboardPlugin) {
-          for (const [sourceName, sourceConfig] of Object.entries(
-            serverless.pluginManager.dashboardPlugin.configurationVariablesSources
-          )) {
-            resolverConfiguration.sources[sourceName] = sourceConfig;
-            resolverConfiguration.fulfilledSources.add(sourceName);
-          }
-        }
-
-        const ensurePlainFunction = require('type/plain-function/ensure');
-        const ensurePlainObject = require('type/plain-object/ensure');
-
-        for (const externalPlugin of serverless.pluginManager.externalPlugins) {
-          const pluginName = externalPlugin.constructor.name;
-          if (externalPlugin.configurationVariablesSources != null) {
-            ensurePlainObject(externalPlugin.configurationVariablesSources, {
-              errorMessage:
-                'Invalid "configurationVariablesSources" ' +
-                `configuration on "${pluginName}", expected object, got: %v"`,
-              Error: ServerlessError,
-            });
-
+        // Register dashboard specific variable source resolvers
+        if (serverless.pluginManager.dashboardPlugin) {
+          if (configuration.org) {
             for (const [sourceName, sourceConfig] of Object.entries(
-              externalPlugin.configurationVariablesSources
+              serverless.pluginManager.dashboardPlugin.configurationVariablesSources
             )) {
-              if (resolverConfiguration.sources[sourceName]) {
-                throw new ServerlessError(
-                  `Cannot add "${sourceName}" configuration variable source ` +
-                    `(through "${pluginName}" plugin) as resolution rules ` +
-                    'for this source name are already configured'
-                );
-              }
-              ensurePlainFunction(
-                ensurePlainObject(sourceConfig, {
-                  errorMessage:
-                    `Invalid "configurationVariablesSources.${sourceName}" ` +
-                    `configuration on "${pluginName}", expected object, got: %v"`,
-                  Error: ServerlessError,
-                }).resolve,
-                {
-                  errorMessage:
-                    `Invalid "configurationVariablesSources.${sourceName}.resolve" ` +
-                    `value on "${pluginName}", expected function, got: %v"`,
-                  Error: ServerlessError,
-                }
-              );
-
               resolverConfiguration.sources[sourceName] = sourceConfig;
               resolverConfiguration.fulfilledSources.add(sourceName);
             }
-          } else if (
-            externalPlugin.variableResolvers &&
-            configuration.variablesResolutionMode < 20210326
-          ) {
-            logDeprecation(
-              'NEW_VARIABLES_RESOLVER',
-              `Plugin "${pluginName}" attempts to extend old variables resolver. ` +
-                'Ensure to rely on latest version of a plugin and if this warning is ' +
-                'still displayed please report the problem at plugin issue tracker' +
-                'Starting with next major release, ' +
-                'old variables resolver will not be supported.\n',
-              { serviceConfig: configuration }
-            );
+          } else {
+            resolverConfiguration.sources.param =
+              serverless.pluginManager.dashboardPlugin.configurationVariablesSources.param;
+            resolverConfiguration.fulfilledSources.add('param');
           }
         }
 
+        // Register variable source resolvers provided by external plugins
+        const resolverExternalPluginSources = require('../lib/configuration/variables/sources/resolve-external-plugin-sources');
+        resolverExternalPluginSources(
+          configuration,
+          resolverConfiguration,
+          serverless.pluginManager.externalPlugins
+        );
+
+        // Having all source resolvers configured, resolve variables
         await resolveVariables(resolverConfiguration);
-        if (!variablesMeta.size) {
-          serverless.isConfigurationInputResolved = true;
-          return;
-        }
+        if (!variablesMeta.size) return;
         if (
           eventuallyReportVariableResolutionErrors(configurationPath, configuration, variablesMeta)
         ) {
           return;
         }
-        const unresolvedSources = require('../lib/configuration/variables/resolve-unresolved-source-types')(
-          variablesMeta
+
+        // Do not confirm on unresolved sources with partially resolved configuration
+        if (resolverConfiguration.propertyPathsToResolve) return;
+
+        // Report unrecognized variable sources found in variables configured in service config
+        const unresolvedSources =
+          require('../lib/configuration/variables/resolve-unresolved-source-types')(variablesMeta);
+        const recognizedSourceNames = new Set(Object.keys(resolverConfiguration.sources));
+
+        const unrecognizedSourceNames = Array.from(unresolvedSources.keys()).filter(
+          (sourceName) => !recognizedSourceNames.has(sourceName)
         );
-        if (!(configuration.variablesResolutionMode >= 20210326)) {
-          unresolvedSources.delete('opt');
-          const legacyCfVarPropertyPaths = new Set();
-          const legacySsmVarPropertyPaths = new Set();
-          for (const [sourceType, propertyPaths] of unresolvedSources) {
-            if (sourceType.startsWith('cf.')) {
-              for (const propertyPath of propertyPaths) legacyCfVarPropertyPaths.add(propertyPath);
-              unresolvedSources.delete(sourceType);
-            }
-            if (sourceType.startsWith('ssm.')) {
-              for (const propertyPath of propertyPaths) legacySsmVarPropertyPaths.add(propertyPath);
-              unresolvedSources.delete(sourceType);
-            }
-          }
-          if (legacyCfVarPropertyPaths.size) {
-            logDeprecation(
-              'NEW_VARIABLES_RESOLVER',
-              'Syntax for referencing CF outputs was upgraded to ' +
-                '"${cf(<region>):stackName.outputName}" (while  ' +
-                '"${cf.<region>:stackName.outputName}" is now deprecated, ' +
-                'as not supported by new variables resolver).\n' +
-                'Please upgrade to use new form instead.' +
-                'Starting with next major release, ' +
-                'this will be communicated with a thrown error.\n',
-              { serviceConfig: configuration }
-            );
-          }
-          if (legacySsmVarPropertyPaths.size) {
-            logDeprecation(
-              'NEW_VARIABLES_RESOLVER',
-              'Syntax for referencing SSM parameters was upgraded to ' +
-                '"${ssm(<region>):parameter-path}" (while  ' +
-                '"${ssm.<region>:parameter-path}" is now deprecated, ' +
-                'as not supported by new variables resolver).\n' +
-                'Please upgrade to use new form instead.' +
-                'Starting with next major release, ' +
-                'this will be communicated with a thrown error.\n',
-              { serviceConfig: configuration }
-            );
-          }
-          if (unresolvedSources.size) {
-            logDeprecation(
-              'NEW_VARIABLES_RESOLVER',
-              `Approached unrecognized configuration variable sources: "${Array.from(
-                unresolvedSources.keys()
-              ).join('", "')}".\n` +
-                'From a next major this will be communicated with a thrown error.\n' +
-                'Set "variablesResolutionMode: 20210326" in your service config, ' +
-                'to adapt to new behavior now',
-              { serviceConfig: configuration }
-            );
-          }
-        } else {
+
+        if (unrecognizedSourceNames.includes('output')) {
           throw new ServerlessError(
-            `Approached unrecognized configuration variable sources: "${Array.from(
-              unresolvedSources.keys()
-            ).join('", "')}"`,
-            'UNRECOGNIZED_VARIABLE_SOURCES'
+            '"Cannot resolve configuration: ' +
+              '"output" variable can only be used in ' +
+              'services deployed with Serverless Dashboard (with "org" setting configured)',
+            'DASHBOARD_VARIABLE_SOURCES_MISUSE'
           );
         }
+        throw new ServerlessError(
+          `Unrecognized configuration variable sources: "${unrecognizedSourceNames.join('", "')}"`,
+          'UNRECOGNIZED_VARIABLE_SOURCES'
+        );
       })();
 
       if (isHelpRequest && serverless.pluginManager.externalPlugins) {
+        // Show help
         require('../lib/cli/render-help')(serverless.pluginManager.externalPlugins);
       } else {
+        // Run command
         await serverless.run();
       }
+
+      const backendNotificationRequest = await finalize({
+        telemetryData: { outcome: 'success', shouldSendTelemetry: commands.join(' ') === 'deploy' },
+      });
+      if (backendNotificationRequest) {
+        await processBackendNotificationRequest(backendNotificationRequest);
+      }
     } catch (error) {
       // If Dashboard Plugin, capture error
       const dashboardPlugin =
@@ -621,24 +691,19 @@ const processSpanPromise = (async () => {
       try {
         await dashboardErrorHandler(error, serverless.invocationId);
       } catch (dashboardErrorHandlerError) {
-        const log = require('@serverless/utils/log');
         const tokenizeException = require('../lib/utils/tokenize-exception');
         const exceptionTokens = tokenizeException(dashboardErrorHandlerError);
-        log(
+        log.warning(
           `Publication to Serverless Dashboard errored with:\n${' '.repeat('Serverless: '.length)}${
             exceptionTokens.isUserError || !exceptionTokens.stack
               ? exceptionTokens.message
               : exceptionTokens.stack
-          }`,
-          { color: 'orange' }
+          }`
         );
       }
       throw error;
     }
   } catch (error) {
-    handleError(error, {
-      isLocallyInstalled: serverless && serverless.isLocallyInstalled,
-      isInvokedByGlobalInstallation: serverless && serverless.isInvokedByGlobalInstallation,
-    });
+    await finalize({ error });
   }
 })();
diff --git a/scripts/test/integration-setup/cloudformation.yml b/scripts/test/integration-setup/cloudformation.yml
index d2815e34141..e4f8aa3e206 100644
--- a/scripts/test/integration-setup/cloudformation.yml
+++ b/scripts/test/integration-setup/cloudformation.yml
@@ -4,6 +4,26 @@ Parameters:
   ClusterName:
     Type: String
     Description: Name of MSK Cluster
+  ActiveMQBrokerName:
+    Type: String
+    Description: Name of ActiveMQ Broker
+  ActiveMQUser:
+    Type: String
+    Description: Name of ActiveMQ User
+  ActiveMQPassword:
+    Type: String
+    Description: Password of ActiveMQ User
+    NoEcho: true
+  RabbitMQBrokerName:
+    Type: String
+    Description: Name of RabbitMQ Broker
+  RabbitMQUser:
+    Type: String
+    Description: Name of RabbitMQ User
+  RabbitMQPassword:
+    Type: String
+    Description: Password of RabbitMQ User
+    NoEcho: true
   ClusterConfigurationArn:
     Type: String
     Description: MSK Cluster Configuration ARN
@@ -119,6 +139,70 @@ Resources:
       SubnetId: !Ref PrivateSubnetB
       RouteTableId: !Ref PrivateRouteTable
 
+  ActiveMQSecurityGroup:
+    Type: AWS::EC2::SecurityGroup
+    Properties:
+      GroupDescription: Security Group for ActiveMQ
+      VpcId: !Ref VPC
+      SecurityGroupIngress:
+        - IpProtocol: tcp
+          FromPort: 61617
+          ToPort: 61617
+          CidrIp: 0.0.0.0/0
+        - IpProtocol: tcp
+          FromPort: 61614
+          ToPort: 61614
+          CidrIp: 0.0.0.0/0
+
+  ActiveMQBroker:
+    Type: 'AWS::AmazonMQ::Broker'
+    Properties:
+      AutoMinorVersionUpgrade: 'false'
+      BrokerName: !Ref ActiveMQBrokerName
+      DeploymentMode: SINGLE_INSTANCE
+      EngineType: ActiveMQ
+      EngineVersion: '5.15.0'
+      HostInstanceType: mq.t2.micro
+      PubliclyAccessible: 'false'
+      SecurityGroups:
+        - !Ref ActiveMQSecurityGroup
+      SubnetIds:
+        - !Ref PrivateSubnetA
+      Users:
+        - ConsoleAccess: 'true'
+          Password: !Ref ActiveMQPassword
+          Username: !Ref ActiveMQUser
+
+  RabbitMQSecurityGroup:
+    Type: AWS::EC2::SecurityGroup
+    Properties:
+      GroupDescription: Security Group for RabbitMQ
+      VpcId: !Ref VPC
+      SecurityGroupIngress:
+        - IpProtocol: tcp
+          FromPort: 5671
+          ToPort: 5671
+          CidrIp: 0.0.0.0/0
+
+  RabbitMQBroker:
+    Type: 'AWS::AmazonMQ::Broker'
+    Properties:
+      AutoMinorVersionUpgrade: 'false'
+      BrokerName: !Ref RabbitMQBrokerName
+      DeploymentMode: SINGLE_INSTANCE
+      EngineType: RABBITMQ
+      EngineVersion: '3.8.11'
+      HostInstanceType: mq.t3.micro
+      PubliclyAccessible: 'false'
+      SecurityGroups:
+        - !Ref RabbitMQSecurityGroup
+      SubnetIds:
+        - !Ref PrivateSubnetA
+      Users:
+        - ConsoleAccess: 'true'
+          Password: !Ref RabbitMQPassword
+          Username: !Ref RabbitMQUser
+
   MSKCluster:
     Type: 'AWS::MSK::Cluster'
     Properties:
@@ -180,6 +264,30 @@ Outputs:
     Description: Default security for Lambda VPC
     Value: !GetAtt VPC.DefaultSecurityGroup
 
+  ActiveMQBrokerArn:
+    Description: Created ActiveMQ Broker ARN
+    Value: !GetAtt ActiveMQBroker.Arn
+
+  ActiveMQBrokerId:
+    Description: Created ActiveMQ Broker Id
+    Value: !Ref ActiveMQBroker
+
+  ActiveMQSecurityGroup:
+    Description: Security Group for ActiveMQ
+    Value: !Ref ActiveMQSecurityGroup
+
+  RabbitMQBrokerArn:
+    Description: Created RabbitMQ Broker ARN
+    Value: !GetAtt RabbitMQBroker.Arn
+
+  RabbitMQBrokerId:
+    Description: Created RabbitMQ Broker Id
+    Value: !Ref RabbitMQBroker
+
+  RabbitMQSecurityGroup:
+    Description: Security Group for RabbitMQ
+    Value: !Ref RabbitMQSecurityGroup
+
   MSKCluster:
     Description: Created MSK Cluster
     Value: !Ref MSKCluster
diff --git a/scripts/test/integration-setup/index.js b/scripts/test/integration-setup/index.js
index 989be0467d5..2a2266c6477 100755
--- a/scripts/test/integration-setup/index.js
+++ b/scripts/test/integration-setup/index.js
@@ -7,16 +7,62 @@ require('log-node')();
 
 const log = require('log').get('serverless');
 const awsRequest = require('@serverless/test/aws-request');
-const fsPromises = require('fs').promises;
+const fsp = require('fs').promises;
 const path = require('path');
-const { SHARED_INFRA_TESTS_CLOUDFORMATION_STACK } = require('../../../test/utils/cloudformation');
+const {
+  SHARED_INFRA_TESTS_CLOUDFORMATION_STACK,
+  SHARED_INFRA_TESTS_ACTIVE_MQ_CREDENTIALS_NAME,
+  SHARED_INFRA_TESTS_RABBITMQ_CREDENTIALS_NAME,
+} = require('../../../test/utils/cloudformation');
+
+const ensureActiveMQCredentialsSecret = async () => {
+  const ssmMqCredentials = {
+    username: process.env.SLS_INTEGRATION_TESTS_ACTIVE_MQ_USER,
+    password: process.env.SLS_INTEGRATION_TESTS_ACTIVE_MQ_PASSWORD,
+  };
+  log.notice('Creating SecretsManager ActiveMQ Credentials secret...');
+  try {
+    await awsRequest('SecretsManager', 'createSecret', {
+      Name: SHARED_INFRA_TESTS_ACTIVE_MQ_CREDENTIALS_NAME,
+      SecretString: JSON.stringify(ssmMqCredentials),
+    });
+  } catch (e) {
+    if (!e.code === 'ResourceExistsException') {
+      throw e;
+    }
+  }
+};
+
+const ensureRabbitMQCredentialsSecret = async () => {
+  const ssmMqCredentials = {
+    username: process.env.SLS_INTEGRATION_TESTS_RABBITMQ_USER,
+    password: process.env.SLS_INTEGRATION_TESTS_RABBITMQ_PASSWORD,
+  };
+  log.notice('Creating SecretsManager RabbitMQ Credentials secret...');
+  try {
+    await awsRequest('SecretsManager', 'createSecret', {
+      Name: SHARED_INFRA_TESTS_RABBITMQ_CREDENTIALS_NAME,
+      SecretString: JSON.stringify(ssmMqCredentials),
+    });
+  } catch (e) {
+    if (!e.code === 'ResourceExistsException') {
+      throw e;
+    }
+  }
+};
+
+const activeMqBrokerName = 'integration-tests-activemq-broker';
+const rabbitMqBrokerName = 'integration-tests-rabbitmq-broker';
 
 async function handleInfrastructureCreation() {
   const [cfnTemplate, kafkaServerProperties] = await Promise.all([
-    fsPromises.readFile(path.join(__dirname, 'cloudformation.yml'), 'utf8'),
-    fsPromises.readFile(path.join(__dirname, 'kafka.server.properties')),
+    fsp.readFile(path.join(__dirname, 'cloudformation.yml'), 'utf8'),
+    fsp.readFile(path.join(__dirname, 'kafka.server.properties')),
   ]);
 
+  await ensureActiveMQCredentialsSecret();
+  await ensureRabbitMQCredentialsSecret();
+
   const clusterName = 'integration-tests-msk-cluster';
   const clusterConfName = 'integration-tests-msk-cluster-configuration';
 
@@ -36,6 +82,24 @@ async function handleInfrastructureCreation() {
     TemplateBody: cfnTemplate,
     Parameters: [
       { ParameterKey: 'ClusterName', ParameterValue: clusterName },
+      { ParameterKey: 'ActiveMQBrokerName', ParameterValue: activeMqBrokerName },
+      {
+        ParameterKey: 'ActiveMQUser',
+        ParameterValue: process.env.SLS_INTEGRATION_TESTS_ACTIVE_MQ_USER,
+      },
+      {
+        ParameterKey: 'ActiveMQPassword',
+        ParameterValue: process.env.SLS_INTEGRATION_TESTS_ACTIVE_MQ_PASSWORD,
+      },
+      { ParameterKey: 'RabbitMQBrokerName', ParameterValue: rabbitMqBrokerName },
+      {
+        ParameterKey: 'RabbitMQUser',
+        ParameterValue: process.env.SLS_INTEGRATION_TESTS_RABBITMQ_USER,
+      },
+      {
+        ParameterKey: 'RabbitMQPassword',
+        ParameterValue: process.env.SLS_INTEGRATION_TESTS_RABBITMQ_PASSWORD,
+      },
       { ParameterKey: 'ClusterConfigurationArn', ParameterValue: clusterConfigurationArn },
       {
         ParameterKey: 'ClusterConfigurationRevision',
@@ -53,7 +117,10 @@ async function handleInfrastructureCreation() {
 async function handleInfrastructureUpdate() {
   log.notice('Updating integration tests CloudFormation stack...');
 
-  const cfnTemplate = await fsPromises.readFile(path.join(__dirname, 'cloudformation.yml'), 'utf8');
+  await ensureActiveMQCredentialsSecret();
+  await ensureRabbitMQCredentialsSecret();
+
+  const cfnTemplate = await fsp.readFile(path.join(__dirname, 'cloudformation.yml'), 'utf8');
 
   try {
     await awsRequest('CloudFormation', 'updateStack', {
@@ -61,6 +128,24 @@ async function handleInfrastructureUpdate() {
       TemplateBody: cfnTemplate,
       Parameters: [
         { ParameterKey: 'ClusterName', UsePreviousValue: true },
+        { ParameterKey: 'ActiveMQBrokerName', ParameterValue: activeMqBrokerName },
+        {
+          ParameterKey: 'ActiveMQUser',
+          ParameterValue: process.env.SLS_INTEGRATION_TESTS_ACTIVE_MQ_USER,
+        },
+        {
+          ParameterKey: 'ActiveMQPassword',
+          ParameterValue: process.env.SLS_INTEGRATION_TESTS_ACTIVE_MQ_PASSWORD,
+        },
+        { ParameterKey: 'RabbitMQBrokerName', ParameterValue: rabbitMqBrokerName },
+        {
+          ParameterKey: 'RabbitMQUser',
+          ParameterValue: process.env.SLS_INTEGRATION_TESTS_RABBITMQ_USER,
+        },
+        {
+          ParameterKey: 'RabbitMQPassword',
+          ParameterValue: process.env.SLS_INTEGRATION_TESTS_RABBITMQ_PASSWORD,
+        },
         { ParameterKey: 'ClusterConfigurationArn', UsePreviousValue: true },
         {
           ParameterKey: 'ClusterConfigurationRevision',
@@ -85,6 +170,38 @@ async function handleInfrastructureUpdate() {
 (async () => {
   log.notice('Starting setup of integration infrastructure...');
 
+  if (!process.env.SLS_INTEGRATION_TESTS_ACTIVE_MQ_USER) {
+    log.error(
+      '"SLS_INTEGRATION_TESTS_ACTIVE_MQ_USER" env variable has to be set when provisioning integration infrastructure'
+    );
+    process.exitCode = 1;
+    return;
+  }
+
+  if (!process.env.SLS_INTEGRATION_TESTS_ACTIVE_MQ_PASSWORD) {
+    log.error(
+      '"SLS_INTEGRATION_TESTS_ACTIVE_MQ_PASSWORD" env variable has to be set when provisioning integration infrastructure'
+    );
+    process.exitCode = 1;
+    return;
+  }
+
+  if (!process.env.SLS_INTEGRATION_TESTS_RABBITMQ_USER) {
+    log.error(
+      '"SLS_INTEGRATION_TESTS_RABBITMQ_USER" env variable has to be set when provisioning integration infrastructure'
+    );
+    process.exitCode = 1;
+    return;
+  }
+
+  if (!process.env.SLS_INTEGRATION_TESTS_RABBITMQ_PASSWORD) {
+    log.error(
+      '"SLS_INTEGRATION_TESTS_RABBITMQ_PASSWORD" env variable has to be set when provisioning integration infrastructure'
+    );
+    process.exitCode = 1;
+    return;
+  }
+
   let describeResponse;
 
   log.notice('Checking if integration tests CloudFormation stack already exists...');
@@ -103,10 +220,10 @@ async function handleInfrastructureUpdate() {
   if (describeResponse) {
     const stackStatus = describeResponse.Stacks[0].StackStatus;
 
-    if (['CREATE_COMPLETE', 'UPDATE_COMPLETE'].includes(stackStatus)) {
+    if (['CREATE_COMPLETE', 'UPDATE_COMPLETE', 'UPDATE_ROLLBACK_COMPLETE'].includes(stackStatus)) {
       await handleInfrastructureUpdate();
     } else {
-      log.error('Existing stack has status: {stackStatus} and it cannot be updated.');
+      log.error(`Existing stack has status: ${stackStatus} and it cannot be updated.`);
       process.exitCode = 1;
     }
   } else {
diff --git a/test/README.md b/test/README.md
index 0d124be37ca..dfa6118f5bf 100644
--- a/test/README.md
+++ b/test/README.md
@@ -61,15 +61,15 @@ Check existing set of AWS integration tests at [test/integration](./integration)
 Pass test file to Mocha directly as follows
 
 ```
-AWS_ACCESS_KEY_ID=XXX AWS_SECRET_ACCESS_KEY=xxx npx mocha tests/integration/{chosen}.test.js
+AWS_ACCESS_KEY_ID=XXX AWS_SECRET_ACCESS_KEY=xxx npx mocha test/integration/{chosen}.test.js
 ```
 
 ### Tests that depend on shared infrastructure stack
 
 Due to the fact that some of the tests require a bit more complex infrastructure setup which might be lengthy, two additional commands has been made available:
 
-- `integration-test-setup-infrastructure` - used for setting up all needed intrastructure dependencies
-- `integration-test-teardown-infrastructure` - used for tearing down the infrastructure setup by the above command
+- `integration-test-setup` - used for setting up all needed intrastructure dependencies
+- `integration-test-teardown` - used for tearing down the infrastructure setup by the above command
 
 Such tests take advantage of `isDependencyStackAvailable` util to check if all needed dependencies are ready. If not, it skips the given test suite.
 
@@ -90,13 +90,13 @@ To run all integration tests run:
 To run only a specific integration test run:
 
 ```
-tests/templates/integration-test-template TEMPLATE_NAME BUILD_COMMAND
+test/templates/integration-test-template TEMPLATE_NAME BUILD_COMMAND
 ```
 
 so for example:
 
 ```
-tests/templates/integration-test-template aws-java-maven mvn package
+test/templates/integration-test-template aws-java-maven mvn package
 ```
 
 If you add a new template make sure to add it to the `test-all-templates` file and configure the `docker-compose.yml` file for your template.
diff --git a/test/fixtures/cli/configSyntaxError/serverless.yml b/test/fixtures/cli/config-syntax-error/serverless.yml
similarity index 100%
rename from test/fixtures/cli/configSyntaxError/serverless.yml
rename to test/fixtures/cli/config-syntax-error/serverless.yml
diff --git a/test/fixtures/cli/configTypeJsDeferred/serverless.js b/test/fixtures/cli/config-type-js-deferred/serverless.js
similarity index 100%
rename from test/fixtures/cli/configTypeJsDeferred/serverless.js
rename to test/fixtures/cli/config-type-js-deferred/serverless.js
diff --git a/test/fixtures/cli/configTypeJs/serverless.js b/test/fixtures/cli/config-type-js/serverless.js
similarity index 100%
rename from test/fixtures/cli/configTypeJs/serverless.js
rename to test/fixtures/cli/config-type-js/serverless.js
diff --git a/test/fixtures/cli/configTypeJson/serverless.json b/test/fixtures/cli/config-type-json/serverless.json
similarity index 100%
rename from test/fixtures/cli/configTypeJson/serverless.json
rename to test/fixtures/cli/config-type-json/serverless.json
diff --git a/test/fixtures/cli/configTypeNonObject/serverless.json b/test/fixtures/cli/config-type-non-object/serverless.json
similarity index 100%
rename from test/fixtures/cli/configTypeNonObject/serverless.json
rename to test/fixtures/cli/config-type-non-object/serverless.json
diff --git a/test/fixtures/cli/configTypeYaml/serverless.yaml b/test/fixtures/cli/config-type-yaml/serverless.yaml
similarity index 100%
rename from test/fixtures/cli/configTypeYaml/serverless.yaml
rename to test/fixtures/cli/config-type-yaml/serverless.yaml
diff --git a/test/fixtures/cli/configTypeYmlAndJson/serverless.json b/test/fixtures/cli/config-type-yml-and-json/serverless.json
similarity index 100%
rename from test/fixtures/cli/configTypeYmlAndJson/serverless.json
rename to test/fixtures/cli/config-type-yml-and-json/serverless.json
diff --git a/test/fixtures/cli/configTypeYml/serverless.yml b/test/fixtures/cli/config-type-yml-and-json/serverless.yml
similarity index 100%
rename from test/fixtures/cli/configTypeYml/serverless.yml
rename to test/fixtures/cli/config-type-yml-and-json/serverless.yml
diff --git a/test/fixtures/cli/configTypeYmlAndJson/serverless.yml b/test/fixtures/cli/config-type-yml/serverless.yml
similarity index 100%
rename from test/fixtures/cli/configTypeYmlAndJson/serverless.yml
rename to test/fixtures/cli/config-type-yml/serverless.yml
diff --git a/test/fixtures/cli/serverlessTs/serverless.ts b/test/fixtures/cli/serverless-ts/serverless.ts
similarity index 100%
rename from test/fixtures/cli/serverlessTs/serverless.ts
rename to test/fixtures/cli/serverless-ts/serverless.ts
diff --git a/test/fixtures/cli/uncaughtException/plugin.js b/test/fixtures/cli/uncaught-exception/plugin.js
similarity index 100%
rename from test/fixtures/cli/uncaughtException/plugin.js
rename to test/fixtures/cli/uncaught-exception/plugin.js
diff --git a/test/fixtures/cli/uncaughtException/serverless.yml b/test/fixtures/cli/uncaught-exception/serverless.yml
similarity index 100%
rename from test/fixtures/cli/uncaughtException/serverless.yml
rename to test/fixtures/cli/uncaught-exception/serverless.yml
diff --git a/test/fixtures/cli/variables/serverless.yml b/test/fixtures/cli/variables/serverless.yml
index 19fd0867ead..ee73048e73d 100644
--- a/test/fixtures/cli/variables/serverless.yml
+++ b/test/fixtures/cli/variables/serverless.yml
@@ -1,8 +1,6 @@
 service: service
 configValidationMode: error
 
-variablesResolutionMode: 20210326
-
 provider:
   name: aws
   runtime: nodejs12.x
diff --git a/test/fixtures/programmatic/apiGatewayExtended/core.js b/test/fixtures/programmatic/api-gateway-extended/core.js
similarity index 100%
rename from test/fixtures/programmatic/apiGatewayExtended/core.js
rename to test/fixtures/programmatic/api-gateway-extended/core.js
diff --git a/test/fixtures/programmatic/apiGatewayExtended/helper.js b/test/fixtures/programmatic/api-gateway-extended/helper.js
similarity index 100%
rename from test/fixtures/programmatic/apiGatewayExtended/helper.js
rename to test/fixtures/programmatic/api-gateway-extended/helper.js
diff --git a/test/fixtures/programmatic/apiGatewayExtended/serverless.yml b/test/fixtures/programmatic/api-gateway-extended/serverless.yml
similarity index 96%
rename from test/fixtures/programmatic/apiGatewayExtended/serverless.yml
rename to test/fixtures/programmatic/api-gateway-extended/serverless.yml
index 644130f89c1..2e88bea09ec 100644
--- a/test/fixtures/programmatic/apiGatewayExtended/serverless.yml
+++ b/test/fixtures/programmatic/api-gateway-extended/serverless.yml
@@ -54,7 +54,8 @@ functions:
       - http:
           path: custom-auth
           method: GET
-          authorizer: authorizer
+          authorizer:
+            name: authorizer
   apiKeys:
     handler: core.apiKeys
     events:
diff --git a/test/fixtures/programmatic/apiGateway/index.js b/test/fixtures/programmatic/api-gateway/index.js
similarity index 100%
rename from test/fixtures/programmatic/apiGateway/index.js
rename to test/fixtures/programmatic/api-gateway/index.js
diff --git a/test/fixtures/programmatic/apiGateway/serverless.yml b/test/fixtures/programmatic/api-gateway/serverless.yml
similarity index 94%
rename from test/fixtures/programmatic/apiGateway/serverless.yml
rename to test/fixtures/programmatic/api-gateway/serverless.yml
index 2d7e1f9b0a2..3af9f6033cd 100644
--- a/test/fixtures/programmatic/apiGateway/serverless.yml
+++ b/test/fixtures/programmatic/api-gateway/serverless.yml
@@ -5,7 +5,7 @@ frameworkVersion: '*'
 
 provider:
   name: aws
-  lambdaHashingVersion: 20201221
+  runtime: nodejs12.x
   apiGateway:
     shouldStartNameWithService: true
 
diff --git a/test/fixtures/programmatic/aws-loggedin-monitored-service/.serverlessrc b/test/fixtures/programmatic/aws-loggedin-monitored-service/.serverlessrc
new file mode 100644
index 00000000000..c28f097c827
--- /dev/null
+++ b/test/fixtures/programmatic/aws-loggedin-monitored-service/.serverlessrc
@@ -0,0 +1,31 @@
+{
+  "frameworkId": "00000000-0000-0000-0000-000000000000",
+  "meta": {
+    "created_at": 1560000000,
+    "updated_at": 1560000000
+  },
+  "userId": "testinteractivecli",
+  "users": {
+    "testinteractivecli": {
+      "userId": "testinteractivecli",
+      "name": "Testing Interactive Cli",
+      "email": "test-interactive-cli@interactive.cli",
+      "username": "testinteractivecli",
+      "dashboard": {
+        "refreshToken": "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
+        "accessToken": "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
+        "idToken": "eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiIsImtpZCI6Ik56azVNREl5TVRnNFJqWTBORGswT0VJM1JrRXpORGN4UmtVMU1FWXdNemczT1VKQlFqRTBNZyJ9.eyJuaWNrbmFtZSI6InRlc3QtaW50ZXJhY3RpdmUtY2xpIiwibmFtZSI6IlRlc3RpbmcgSW50ZXJhY3RpdmUgQ2xpIiwicGljdHVyZSI6Imh0dHBzOi8vaW50ZXJhdGNpdmUuY2xpL3Rlc3RpbmcucG5nIiwidXBkYXRlZF9hdCI6IjIwMTktMDktMTZUMTU6MTg6NDMuOTk5WiIsImVtYWlsIjoidGVzdGluZ0BpbnRlcmFjdGl2ZS5jbGkiLCJlbWFpbF92ZXJpZmllZCI6dHJ1ZSwiaXNzIjoiaHR0cHM6Ly9zZXJ2ZXJsZXNzaW5jLmF1dGgwLmNvbS8iLCJzdWIiOiJ0ZXN0LWludGVyYWN0aXZlLWNsaSIsImF1ZCI6IlhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYIiwiaWF0IjoxNTYwMDAwMDAwLCJleHAiOjMwMDAwMDAwMDB9.GcNQtWSxv9CHTABw-HIjYSvRxTEapDUDqIIWRGmz01XmShQxRGOHRuUg1NKU4w9MpOlB6txHKs8UWd2eZkzw_Z4QmIuLyAVhVklpWP2-xeysPLUyqVTgqAg8kgIUAwdKjmrdpQqHhGd-Q1BIX62-E-qKKx8prmADSw_hgmuvlMuSCa1ajCnfyUXycQxDmbFrvjd24lJER0FSpB2nWWW3KxZ_UBX-TuVmiEtRXg9GYeSv6oIU78PrIhYgJ0QjERRF1yAYamIXNRs-KZ7Z4YiFNC4uKzFH1524pZkS4Q0-pweIvBrrsjekz-vEYcbaVG1zAxDu_yNrYPk5phCy8MHTrQ",
+        "expiresAt": 3000000000000,
+        "username": "testinteractivecli",
+        "accessKeys": {
+          "testinteractivecli": "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"
+        }
+      },
+      "enterprise": {
+        "versionSDK": "2.1.1",
+        "timeLastLogin": 1560000000,
+        "timeLastLogout": 1560000000
+      }
+    }
+  }
+}
diff --git a/test/fixtures/programmatic/aws-loggedin-monitored-service/serverless.yml b/test/fixtures/programmatic/aws-loggedin-monitored-service/serverless.yml
new file mode 100644
index 00000000000..9b6fa32d41f
--- /dev/null
+++ b/test/fixtures/programmatic/aws-loggedin-monitored-service/serverless.yml
@@ -0,0 +1,5 @@
+service: 'some-aws-service'
+provider: 'aws'
+
+org: 'testinteractivecli'
+app: 'some-aws-service-app'
diff --git a/test/fixtures/programmatic/aws-loggedin-noapp-service/.serverlessrc b/test/fixtures/programmatic/aws-loggedin-noapp-service/.serverlessrc
new file mode 100644
index 00000000000..c28f097c827
--- /dev/null
+++ b/test/fixtures/programmatic/aws-loggedin-noapp-service/.serverlessrc
@@ -0,0 +1,31 @@
+{
+  "frameworkId": "00000000-0000-0000-0000-000000000000",
+  "meta": {
+    "created_at": 1560000000,
+    "updated_at": 1560000000
+  },
+  "userId": "testinteractivecli",
+  "users": {
+    "testinteractivecli": {
+      "userId": "testinteractivecli",
+      "name": "Testing Interactive Cli",
+      "email": "test-interactive-cli@interactive.cli",
+      "username": "testinteractivecli",
+      "dashboard": {
+        "refreshToken": "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
+        "accessToken": "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
+        "idToken": "eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiIsImtpZCI6Ik56azVNREl5TVRnNFJqWTBORGswT0VJM1JrRXpORGN4UmtVMU1FWXdNemczT1VKQlFqRTBNZyJ9.eyJuaWNrbmFtZSI6InRlc3QtaW50ZXJhY3RpdmUtY2xpIiwibmFtZSI6IlRlc3RpbmcgSW50ZXJhY3RpdmUgQ2xpIiwicGljdHVyZSI6Imh0dHBzOi8vaW50ZXJhdGNpdmUuY2xpL3Rlc3RpbmcucG5nIiwidXBkYXRlZF9hdCI6IjIwMTktMDktMTZUMTU6MTg6NDMuOTk5WiIsImVtYWlsIjoidGVzdGluZ0BpbnRlcmFjdGl2ZS5jbGkiLCJlbWFpbF92ZXJpZmllZCI6dHJ1ZSwiaXNzIjoiaHR0cHM6Ly9zZXJ2ZXJsZXNzaW5jLmF1dGgwLmNvbS8iLCJzdWIiOiJ0ZXN0LWludGVyYWN0aXZlLWNsaSIsImF1ZCI6IlhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYIiwiaWF0IjoxNTYwMDAwMDAwLCJleHAiOjMwMDAwMDAwMDB9.GcNQtWSxv9CHTABw-HIjYSvRxTEapDUDqIIWRGmz01XmShQxRGOHRuUg1NKU4w9MpOlB6txHKs8UWd2eZkzw_Z4QmIuLyAVhVklpWP2-xeysPLUyqVTgqAg8kgIUAwdKjmrdpQqHhGd-Q1BIX62-E-qKKx8prmADSw_hgmuvlMuSCa1ajCnfyUXycQxDmbFrvjd24lJER0FSpB2nWWW3KxZ_UBX-TuVmiEtRXg9GYeSv6oIU78PrIhYgJ0QjERRF1yAYamIXNRs-KZ7Z4YiFNC4uKzFH1524pZkS4Q0-pweIvBrrsjekz-vEYcbaVG1zAxDu_yNrYPk5phCy8MHTrQ",
+        "expiresAt": 3000000000000,
+        "username": "testinteractivecli",
+        "accessKeys": {
+          "testinteractivecli": "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"
+        }
+      },
+      "enterprise": {
+        "versionSDK": "2.1.1",
+        "timeLastLogin": 1560000000,
+        "timeLastLogout": 1560000000
+      }
+    }
+  }
+}
diff --git a/test/unit/lib/plugins/interactiveCli/fixtures/some-aws-service/serverless.yml b/test/fixtures/programmatic/aws-loggedin-noapp-service/serverless.yml
similarity index 61%
rename from test/unit/lib/plugins/interactiveCli/fixtures/some-aws-service/serverless.yml
rename to test/fixtures/programmatic/aws-loggedin-noapp-service/serverless.yml
index 6d6f420b4a5..7600e51819d 100644
--- a/test/unit/lib/plugins/interactiveCli/fixtures/some-aws-service/serverless.yml
+++ b/test/fixtures/programmatic/aws-loggedin-noapp-service/serverless.yml
@@ -1,2 +1,4 @@
 service: 'some-aws-service'
 provider: 'aws'
+
+org: 'testinteractivecli'
diff --git a/test/fixtures/programmatic/aws-loggedin-service/.serverlessrc b/test/fixtures/programmatic/aws-loggedin-service/.serverlessrc
new file mode 100644
index 00000000000..c28f097c827
--- /dev/null
+++ b/test/fixtures/programmatic/aws-loggedin-service/.serverlessrc
@@ -0,0 +1,31 @@
+{
+  "frameworkId": "00000000-0000-0000-0000-000000000000",
+  "meta": {
+    "created_at": 1560000000,
+    "updated_at": 1560000000
+  },
+  "userId": "testinteractivecli",
+  "users": {
+    "testinteractivecli": {
+      "userId": "testinteractivecli",
+      "name": "Testing Interactive Cli",
+      "email": "test-interactive-cli@interactive.cli",
+      "username": "testinteractivecli",
+      "dashboard": {
+        "refreshToken": "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
+        "accessToken": "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
+        "idToken": "eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiIsImtpZCI6Ik56azVNREl5TVRnNFJqWTBORGswT0VJM1JrRXpORGN4UmtVMU1FWXdNemczT1VKQlFqRTBNZyJ9.eyJuaWNrbmFtZSI6InRlc3QtaW50ZXJhY3RpdmUtY2xpIiwibmFtZSI6IlRlc3RpbmcgSW50ZXJhY3RpdmUgQ2xpIiwicGljdHVyZSI6Imh0dHBzOi8vaW50ZXJhdGNpdmUuY2xpL3Rlc3RpbmcucG5nIiwidXBkYXRlZF9hdCI6IjIwMTktMDktMTZUMTU6MTg6NDMuOTk5WiIsImVtYWlsIjoidGVzdGluZ0BpbnRlcmFjdGl2ZS5jbGkiLCJlbWFpbF92ZXJpZmllZCI6dHJ1ZSwiaXNzIjoiaHR0cHM6Ly9zZXJ2ZXJsZXNzaW5jLmF1dGgwLmNvbS8iLCJzdWIiOiJ0ZXN0LWludGVyYWN0aXZlLWNsaSIsImF1ZCI6IlhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYIiwiaWF0IjoxNTYwMDAwMDAwLCJleHAiOjMwMDAwMDAwMDB9.GcNQtWSxv9CHTABw-HIjYSvRxTEapDUDqIIWRGmz01XmShQxRGOHRuUg1NKU4w9MpOlB6txHKs8UWd2eZkzw_Z4QmIuLyAVhVklpWP2-xeysPLUyqVTgqAg8kgIUAwdKjmrdpQqHhGd-Q1BIX62-E-qKKx8prmADSw_hgmuvlMuSCa1ajCnfyUXycQxDmbFrvjd24lJER0FSpB2nWWW3KxZ_UBX-TuVmiEtRXg9GYeSv6oIU78PrIhYgJ0QjERRF1yAYamIXNRs-KZ7Z4YiFNC4uKzFH1524pZkS4Q0-pweIvBrrsjekz-vEYcbaVG1zAxDu_yNrYPk5phCy8MHTrQ",
+        "expiresAt": 3000000000000,
+        "username": "testinteractivecli",
+        "accessKeys": {
+          "testinteractivecli": "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"
+        }
+      },
+      "enterprise": {
+        "versionSDK": "2.1.1",
+        "timeLastLogin": 1560000000,
+        "timeLastLogout": 1560000000
+      }
+    }
+  }
+}
diff --git a/lib/plugins/aws/invokeLocal/fixture/__init__.py b/test/fixtures/programmatic/aws-loggedin-service/index.js
similarity index 100%
rename from lib/plugins/aws/invokeLocal/fixture/__init__.py
rename to test/fixtures/programmatic/aws-loggedin-service/index.js
diff --git a/test/fixtures/programmatic/aws-loggedin-service/serverless.yml b/test/fixtures/programmatic/aws-loggedin-service/serverless.yml
new file mode 100644
index 00000000000..25542cc316b
--- /dev/null
+++ b/test/fixtures/programmatic/aws-loggedin-service/serverless.yml
@@ -0,0 +1,10 @@
+service: 'some-aws-service'
+provider: 'aws'
+
+functions:
+  app:
+    handler: index.handler
+    foo: bar
+  org:
+    handler: index.handler
+    foo: bar
diff --git a/test/fixtures/programmatic/aws-loggedin-wrongapp-service/.serverlessrc b/test/fixtures/programmatic/aws-loggedin-wrongapp-service/.serverlessrc
new file mode 100644
index 00000000000..c28f097c827
--- /dev/null
+++ b/test/fixtures/programmatic/aws-loggedin-wrongapp-service/.serverlessrc
@@ -0,0 +1,31 @@
+{
+  "frameworkId": "00000000-0000-0000-0000-000000000000",
+  "meta": {
+    "created_at": 1560000000,
+    "updated_at": 1560000000
+  },
+  "userId": "testinteractivecli",
+  "users": {
+    "testinteractivecli": {
+      "userId": "testinteractivecli",
+      "name": "Testing Interactive Cli",
+      "email": "test-interactive-cli@interactive.cli",
+      "username": "testinteractivecli",
+      "dashboard": {
+        "refreshToken": "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
+        "accessToken": "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
+        "idToken": "eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiIsImtpZCI6Ik56azVNREl5TVRnNFJqWTBORGswT0VJM1JrRXpORGN4UmtVMU1FWXdNemczT1VKQlFqRTBNZyJ9.eyJuaWNrbmFtZSI6InRlc3QtaW50ZXJhY3RpdmUtY2xpIiwibmFtZSI6IlRlc3RpbmcgSW50ZXJhY3RpdmUgQ2xpIiwicGljdHVyZSI6Imh0dHBzOi8vaW50ZXJhdGNpdmUuY2xpL3Rlc3RpbmcucG5nIiwidXBkYXRlZF9hdCI6IjIwMTktMDktMTZUMTU6MTg6NDMuOTk5WiIsImVtYWlsIjoidGVzdGluZ0BpbnRlcmFjdGl2ZS5jbGkiLCJlbWFpbF92ZXJpZmllZCI6dHJ1ZSwiaXNzIjoiaHR0cHM6Ly9zZXJ2ZXJsZXNzaW5jLmF1dGgwLmNvbS8iLCJzdWIiOiJ0ZXN0LWludGVyYWN0aXZlLWNsaSIsImF1ZCI6IlhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYIiwiaWF0IjoxNTYwMDAwMDAwLCJleHAiOjMwMDAwMDAwMDB9.GcNQtWSxv9CHTABw-HIjYSvRxTEapDUDqIIWRGmz01XmShQxRGOHRuUg1NKU4w9MpOlB6txHKs8UWd2eZkzw_Z4QmIuLyAVhVklpWP2-xeysPLUyqVTgqAg8kgIUAwdKjmrdpQqHhGd-Q1BIX62-E-qKKx8prmADSw_hgmuvlMuSCa1ajCnfyUXycQxDmbFrvjd24lJER0FSpB2nWWW3KxZ_UBX-TuVmiEtRXg9GYeSv6oIU78PrIhYgJ0QjERRF1yAYamIXNRs-KZ7Z4YiFNC4uKzFH1524pZkS4Q0-pweIvBrrsjekz-vEYcbaVG1zAxDu_yNrYPk5phCy8MHTrQ",
+        "expiresAt": 3000000000000,
+        "username": "testinteractivecli",
+        "accessKeys": {
+          "testinteractivecli": "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"
+        }
+      },
+      "enterprise": {
+        "versionSDK": "2.1.1",
+        "timeLastLogin": 1560000000,
+        "timeLastLogout": 1560000000
+      }
+    }
+  }
+}
diff --git a/test/fixtures/programmatic/aws-loggedin-wrongapp-service/serverless.yml b/test/fixtures/programmatic/aws-loggedin-wrongapp-service/serverless.yml
new file mode 100644
index 00000000000..560c7b02e7b
--- /dev/null
+++ b/test/fixtures/programmatic/aws-loggedin-wrongapp-service/serverless.yml
@@ -0,0 +1,5 @@
+service: 'some-aws-service'
+provider: 'aws'
+
+org: 'testinteractivecli'
+app: 'not-created-app'
diff --git a/test/fixtures/programmatic/aws-loggedin-wrongorg-service/.serverlessrc b/test/fixtures/programmatic/aws-loggedin-wrongorg-service/.serverlessrc
new file mode 100644
index 00000000000..c28f097c827
--- /dev/null
+++ b/test/fixtures/programmatic/aws-loggedin-wrongorg-service/.serverlessrc
@@ -0,0 +1,31 @@
+{
+  "frameworkId": "00000000-0000-0000-0000-000000000000",
+  "meta": {
+    "created_at": 1560000000,
+    "updated_at": 1560000000
+  },
+  "userId": "testinteractivecli",
+  "users": {
+    "testinteractivecli": {
+      "userId": "testinteractivecli",
+      "name": "Testing Interactive Cli",
+      "email": "test-interactive-cli@interactive.cli",
+      "username": "testinteractivecli",
+      "dashboard": {
+        "refreshToken": "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
+        "accessToken": "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
+        "idToken": "eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiIsImtpZCI6Ik56azVNREl5TVRnNFJqWTBORGswT0VJM1JrRXpORGN4UmtVMU1FWXdNemczT1VKQlFqRTBNZyJ9.eyJuaWNrbmFtZSI6InRlc3QtaW50ZXJhY3RpdmUtY2xpIiwibmFtZSI6IlRlc3RpbmcgSW50ZXJhY3RpdmUgQ2xpIiwicGljdHVyZSI6Imh0dHBzOi8vaW50ZXJhdGNpdmUuY2xpL3Rlc3RpbmcucG5nIiwidXBkYXRlZF9hdCI6IjIwMTktMDktMTZUMTU6MTg6NDMuOTk5WiIsImVtYWlsIjoidGVzdGluZ0BpbnRlcmFjdGl2ZS5jbGkiLCJlbWFpbF92ZXJpZmllZCI6dHJ1ZSwiaXNzIjoiaHR0cHM6Ly9zZXJ2ZXJsZXNzaW5jLmF1dGgwLmNvbS8iLCJzdWIiOiJ0ZXN0LWludGVyYWN0aXZlLWNsaSIsImF1ZCI6IlhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYIiwiaWF0IjoxNTYwMDAwMDAwLCJleHAiOjMwMDAwMDAwMDB9.GcNQtWSxv9CHTABw-HIjYSvRxTEapDUDqIIWRGmz01XmShQxRGOHRuUg1NKU4w9MpOlB6txHKs8UWd2eZkzw_Z4QmIuLyAVhVklpWP2-xeysPLUyqVTgqAg8kgIUAwdKjmrdpQqHhGd-Q1BIX62-E-qKKx8prmADSw_hgmuvlMuSCa1ajCnfyUXycQxDmbFrvjd24lJER0FSpB2nWWW3KxZ_UBX-TuVmiEtRXg9GYeSv6oIU78PrIhYgJ0QjERRF1yAYamIXNRs-KZ7Z4YiFNC4uKzFH1524pZkS4Q0-pweIvBrrsjekz-vEYcbaVG1zAxDu_yNrYPk5phCy8MHTrQ",
+        "expiresAt": 3000000000000,
+        "username": "testinteractivecli",
+        "accessKeys": {
+          "testinteractivecli": "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"
+        }
+      },
+      "enterprise": {
+        "versionSDK": "2.1.1",
+        "timeLastLogin": 1560000000,
+        "timeLastLogout": 1560000000
+      }
+    }
+  }
+}
diff --git a/test/fixtures/programmatic/aws-loggedin-wrongorg-service/serverless.yml b/test/fixtures/programmatic/aws-loggedin-wrongorg-service/serverless.yml
new file mode 100644
index 00000000000..146e5545d06
--- /dev/null
+++ b/test/fixtures/programmatic/aws-loggedin-wrongorg-service/serverless.yml
@@ -0,0 +1,5 @@
+service: 'some-aws-service'
+provider: 'aws'
+
+org: 'some-other'
+app: 'some-aws-service-app'
diff --git a/test/fixtures/programmatic/checkForChanges/artifact.zip b/test/fixtures/programmatic/check-for-changes/artifact.zip
similarity index 100%
rename from test/fixtures/programmatic/checkForChanges/artifact.zip
rename to test/fixtures/programmatic/check-for-changes/artifact.zip
diff --git a/test/fixtures/programmatic/checkForChanges/fn.js b/test/fixtures/programmatic/check-for-changes/fn-individually.js
similarity index 100%
rename from test/fixtures/programmatic/checkForChanges/fn.js
rename to test/fixtures/programmatic/check-for-changes/fn-individually.js
diff --git a/test/fixtures/programmatic/checkForChanges/fnIndividually.js b/test/fixtures/programmatic/check-for-changes/fn.js
similarity index 100%
rename from test/fixtures/programmatic/checkForChanges/fnIndividually.js
rename to test/fixtures/programmatic/check-for-changes/fn.js
diff --git a/test/fixtures/programmatic/checkForChanges/serverless.yml b/test/fixtures/programmatic/check-for-changes/serverless.yml
similarity index 68%
rename from test/fixtures/programmatic/checkForChanges/serverless.yml
rename to test/fixtures/programmatic/check-for-changes/serverless.yml
index b5133b429e1..dcef99ca5c6 100644
--- a/test/fixtures/programmatic/checkForChanges/serverless.yml
+++ b/test/fixtures/programmatic/check-for-changes/serverless.yml
@@ -5,7 +5,7 @@ frameworkVersion: '*'
 
 provider:
   name: aws
-  lambdaHashingVersion: 20201221
+  runtime: nodejs12.x
 
 functions:
   fn1:
@@ -13,6 +13,6 @@ functions:
   fn2:
     handler: fn.handler
   fnIndividually:
-    handler: fnIndividually.handler
+    handler: fn-individually.handler
     package:
-      exclude: fn.js
+      patterns: '!fn.js'
diff --git a/test/fixtures/programmatic/cognitoUserPool/core.js b/test/fixtures/programmatic/cognito-user-pool/core.js
similarity index 100%
rename from test/fixtures/programmatic/cognitoUserPool/core.js
rename to test/fixtures/programmatic/cognito-user-pool/core.js
diff --git a/test/fixtures/programmatic/cognitoUserPool/serverless.yml b/test/fixtures/programmatic/cognito-user-pool/serverless.yml
similarity index 100%
rename from test/fixtures/programmatic/cognitoUserPool/serverless.yml
rename to test/fixtures/programmatic/cognito-user-pool/serverless.yml
diff --git a/test/fixtures/programmatic/cognitoUserPool/utils.js b/test/fixtures/programmatic/cognito-user-pool/utils.js
similarity index 100%
rename from test/fixtures/programmatic/cognitoUserPool/utils.js
rename to test/fixtures/programmatic/cognito-user-pool/utils.js
diff --git a/test/fixtures/programmatic/configInvalid/serverless.yml b/test/fixtures/programmatic/config-invalid/serverless.yml
similarity index 100%
rename from test/fixtures/programmatic/configInvalid/serverless.yml
rename to test/fixtures/programmatic/config-invalid/serverless.yml
diff --git a/test/fixtures/programmatic/configSchemaExtensionsError/serverless.yml b/test/fixtures/programmatic/config-schema-extensions-error/serverless.yml
similarity index 89%
rename from test/fixtures/programmatic/configSchemaExtensionsError/serverless.yml
rename to test/fixtures/programmatic/config-schema-extensions-error/serverless.yml
index 852effa65c0..ce65b8062d6 100644
--- a/test/fixtures/programmatic/configSchemaExtensionsError/serverless.yml
+++ b/test/fixtures/programmatic/config-schema-extensions-error/serverless.yml
@@ -2,6 +2,7 @@ service: configSchemaExtensionsError
 
 provider:
   name: someProvider
+  runtime: nodejs12.x
 
 configValidationMode: error
 frameworkVersion: '*'
diff --git a/test/fixtures/programmatic/configSchemaExtensionsError/test-plugin-with-colliding-custom-property.js b/test/fixtures/programmatic/config-schema-extensions-error/test-plugin-with-colliding-custom-property.js
similarity index 100%
rename from test/fixtures/programmatic/configSchemaExtensionsError/test-plugin-with-colliding-custom-property.js
rename to test/fixtures/programmatic/config-schema-extensions-error/test-plugin-with-colliding-custom-property.js
diff --git a/test/fixtures/programmatic/configSchemaExtensionsError/test-plugin-with-colliding-function-event-property.js b/test/fixtures/programmatic/config-schema-extensions-error/test-plugin-with-colliding-function-event-property.js
similarity index 100%
rename from test/fixtures/programmatic/configSchemaExtensionsError/test-plugin-with-colliding-function-event-property.js
rename to test/fixtures/programmatic/config-schema-extensions-error/test-plugin-with-colliding-function-event-property.js
diff --git a/test/fixtures/programmatic/configSchemaExtensionsError/test-plugin-with-colliding-function-event.js b/test/fixtures/programmatic/config-schema-extensions-error/test-plugin-with-colliding-function-event.js
similarity index 100%
rename from test/fixtures/programmatic/configSchemaExtensionsError/test-plugin-with-colliding-function-event.js
rename to test/fixtures/programmatic/config-schema-extensions-error/test-plugin-with-colliding-function-event.js
diff --git a/test/fixtures/programmatic/configSchemaExtensionsError/test-plugin-with-colliding-function-property.js b/test/fixtures/programmatic/config-schema-extensions-error/test-plugin-with-colliding-function-property.js
similarity index 100%
rename from test/fixtures/programmatic/configSchemaExtensionsError/test-plugin-with-colliding-function-property.js
rename to test/fixtures/programmatic/config-schema-extensions-error/test-plugin-with-colliding-function-property.js
diff --git a/test/fixtures/programmatic/configSchemaExtensionsError/test-plugin-with-colliding-provider-property-in-function.js b/test/fixtures/programmatic/config-schema-extensions-error/test-plugin-with-colliding-provider-property-in-function.js
similarity index 100%
rename from test/fixtures/programmatic/configSchemaExtensionsError/test-plugin-with-colliding-provider-property-in-function.js
rename to test/fixtures/programmatic/config-schema-extensions-error/test-plugin-with-colliding-provider-property-in-function.js
diff --git a/test/fixtures/programmatic/configSchemaExtensionsError/test-plugin-with-colliding-provider-property-in-provider.js b/test/fixtures/programmatic/config-schema-extensions-error/test-plugin-with-colliding-provider-property-in-provider.js
similarity index 100%
rename from test/fixtures/programmatic/configSchemaExtensionsError/test-plugin-with-colliding-provider-property-in-provider.js
rename to test/fixtures/programmatic/config-schema-extensions-error/test-plugin-with-colliding-provider-property-in-provider.js
diff --git a/test/fixtures/programmatic/configSchemaExtensionsError/test-plugin-with-colliding-top-level-property.js b/test/fixtures/programmatic/config-schema-extensions-error/test-plugin-with-colliding-top-level-property.js
similarity index 100%
rename from test/fixtures/programmatic/configSchemaExtensionsError/test-plugin-with-colliding-top-level-property.js
rename to test/fixtures/programmatic/config-schema-extensions-error/test-plugin-with-colliding-top-level-property.js
diff --git a/test/fixtures/programmatic/configSchemaExtensionsError/test-plugin-with-complex-event-without-object-definition.js b/test/fixtures/programmatic/config-schema-extensions-error/test-plugin-with-complex-event-without-object-definition.js
similarity index 100%
rename from test/fixtures/programmatic/configSchemaExtensionsError/test-plugin-with-complex-event-without-object-definition.js
rename to test/fixtures/programmatic/config-schema-extensions-error/test-plugin-with-complex-event-without-object-definition.js
diff --git a/test/fixtures/programmatic/configSchemaExtensionsError/test-plugin-with-non-existing-event-error.js b/test/fixtures/programmatic/config-schema-extensions-error/test-plugin-with-non-existing-event-error.js
similarity index 100%
rename from test/fixtures/programmatic/configSchemaExtensionsError/test-plugin-with-non-existing-event-error.js
rename to test/fixtures/programmatic/config-schema-extensions-error/test-plugin-with-non-existing-event-error.js
diff --git a/test/fixtures/programmatic/configSchemaExtensions/serverless.yml b/test/fixtures/programmatic/config-schema-extensions/serverless.yml
similarity index 100%
rename from test/fixtures/programmatic/configSchemaExtensions/serverless.yml
rename to test/fixtures/programmatic/config-schema-extensions/serverless.yml
diff --git a/test/fixtures/programmatic/configSchemaExtensions/test-plugin.js b/test/fixtures/programmatic/config-schema-extensions/test-plugin.js
similarity index 100%
rename from test/fixtures/programmatic/configSchemaExtensions/test-plugin.js
rename to test/fixtures/programmatic/config-schema-extensions/test-plugin.js
diff --git a/test/fixtures/programmatic/curated-plugins-python/_setup.js b/test/fixtures/programmatic/curated-plugins-python/_setup.js
new file mode 100644
index 00000000000..fb374507b1c
--- /dev/null
+++ b/test/fixtures/programmatic/curated-plugins-python/_setup.js
@@ -0,0 +1,9 @@
+'use strict';
+
+const path = require('path');
+const fsp = require('fs').promises;
+
+const slsDependencyDir = path.resolve(__dirname, 'node_modules/serverless');
+
+// Ensure to remove "serverless" installed as peer-dependency to avoid local fallback
+module.exports = async () => fsp.rm(slsDependencyDir, { recursive: true, force: true });
diff --git a/test/fixtures/programmatic/curated-plugins-python/handler.py b/test/fixtures/programmatic/curated-plugins-python/handler.py
new file mode 100644
index 00000000000..accfab5dd07
--- /dev/null
+++ b/test/fixtures/programmatic/curated-plugins-python/handler.py
@@ -0,0 +1,5 @@
+
+import requests
+
+def hello(event, context):
+    return requests.get('https://httpbin.org/get').json()
diff --git a/test/fixtures/programmatic/curated-plugins-python/package.json b/test/fixtures/programmatic/curated-plugins-python/package.json
new file mode 100755
index 00000000000..0ac277e91d2
--- /dev/null
+++ b/test/fixtures/programmatic/curated-plugins-python/package.json
@@ -0,0 +1,5 @@
+{
+  "devDependencies": {
+    "serverless-python-requirements": "5.1.1"
+  }
+}
diff --git a/test/fixtures/programmatic/curated-plugins-python/requirements.txt b/test/fixtures/programmatic/curated-plugins-python/requirements.txt
new file mode 100644
index 00000000000..f2293605cf1
--- /dev/null
+++ b/test/fixtures/programmatic/curated-plugins-python/requirements.txt
@@ -0,0 +1 @@
+requests
diff --git a/test/fixtures/programmatic/curated-plugins-python/serverless.yml b/test/fixtures/programmatic/curated-plugins-python/serverless.yml
new file mode 100644
index 00000000000..29c044bb37f
--- /dev/null
+++ b/test/fixtures/programmatic/curated-plugins-python/serverless.yml
@@ -0,0 +1,12 @@
+service: service
+
+configValidationMode: error
+frameworkVersion: '*'
+
+provider:
+  name: aws
+  runtime: python3.8
+
+functions:
+  function:
+    handler: handler.hello
diff --git a/test/fixtures/programmatic/curated-plugins/.env b/test/fixtures/programmatic/curated-plugins/.env
new file mode 100644
index 00000000000..1e307a9198c
--- /dev/null
+++ b/test/fixtures/programmatic/curated-plugins/.env
@@ -0,0 +1,2 @@
+DOTENV_PLUGIN_TEST=passed
+
diff --git a/test/fixtures/programmatic/curated-plugins/_setup.js b/test/fixtures/programmatic/curated-plugins/_setup.js
new file mode 100644
index 00000000000..f075ebc2aa8
--- /dev/null
+++ b/test/fixtures/programmatic/curated-plugins/_setup.js
@@ -0,0 +1,14 @@
+'use strict';
+
+const path = require('path');
+const fsp = require('fs').promises;
+
+const nodeModulesDir = path.resolve(__dirname, 'node_modules');
+
+// Ensure to remove "serverless" installed as peer-dependency to avoid local fallback
+module.exports = async () =>
+  Promise.all([
+    fsp.rm(path.resolve(nodeModulesDir, 'serverless'), { recursive: true, force: true }),
+    fsp.unlink(path.resolve(nodeModulesDir, '.bin/serverless')).catch(() => {}),
+    fsp.unlink(path.resolve(nodeModulesDir, '.bin/sls')).catch(() => {}),
+  ]);
diff --git a/test/fixtures/programmatic/curated-plugins/index-ts.ts b/test/fixtures/programmatic/curated-plugins/index-ts.ts
new file mode 100644
index 00000000000..a0f5fd412ed
--- /dev/null
+++ b/test/fixtures/programmatic/curated-plugins/index-ts.ts
@@ -0,0 +1,13 @@
+interface TestData {
+  value: string;
+}
+
+// Exported to confirm in tests we've received compiled module
+export const testData: TestData = { value: 'test-ts-compilation' };
+
+export const handler = (event, context, callback) => {
+  callback(null, {
+    statusCode: 200,
+    body: JSON.stringify({ message: 'Regular lambda test', input: event }, null, 2),
+  });
+};
diff --git a/test/fixtures/programmatic/curated-plugins/index.js b/test/fixtures/programmatic/curated-plugins/index.js
new file mode 100644
index 00000000000..76d27d5b0a6
--- /dev/null
+++ b/test/fixtures/programmatic/curated-plugins/index.js
@@ -0,0 +1,8 @@
+'use strict';
+
+module.exports.handler = (event, context, callback) => {
+  callback(null, {
+    statusCode: 200,
+    body: JSON.stringify({ message: 'Test', input: event }, null, 2),
+  });
+};
diff --git a/test/fixtures/programmatic/curated-plugins/package.json b/test/fixtures/programmatic/curated-plugins/package.json
new file mode 100755
index 00000000000..d445ba75c64
--- /dev/null
+++ b/test/fixtures/programmatic/curated-plugins/package.json
@@ -0,0 +1,14 @@
+{
+  "devDependencies": {
+    "serverless-offline": "8.3.1",
+    "webpack": "5.66.0",
+    "serverless-webpack": "5.6.0",
+    "serverless-domain-manager": "5.3.0",
+    "serverless-prune-plugin": "2.0.1",
+    "serverless-dotenv-plugin": "3.12.2",
+    "serverless-iam-roles-per-function": "3.2.0",
+    "serverless-plugin-typescript": "2.1.0",
+    "typescript": "4.5.4",
+    "serverless-step-functions": "3.5.1"
+  }
+}
diff --git a/test/fixtures/programmatic/curated-plugins/serverless.yml b/test/fixtures/programmatic/curated-plugins/serverless.yml
new file mode 100644
index 00000000000..f93463dc0a2
--- /dev/null
+++ b/test/fixtures/programmatic/curated-plugins/serverless.yml
@@ -0,0 +1,24 @@
+service: service
+
+configValidationMode: error
+frameworkVersion: '*'
+useDotenv: true
+
+custom:
+  customDomain:
+    domainName: api.example.com
+
+provider:
+  name: aws
+  runtime: nodejs14.x
+
+functions:
+  function:
+    handler: index.handler
+    events:
+      - http:
+          path: foo
+          method: GET
+      - http:
+          path: foo
+          method: POST
diff --git a/test/fixtures/programmatic/curated-plugins/webpack.config.js b/test/fixtures/programmatic/curated-plugins/webpack.config.js
new file mode 100644
index 00000000000..3c2e9769bef
--- /dev/null
+++ b/test/fixtures/programmatic/curated-plugins/webpack.config.js
@@ -0,0 +1,3 @@
+'use strict';
+
+module.exports = { entry: './index.js', target: 'node', mode: 'production' };
diff --git a/test/fixtures/programmatic/customProvider/customProvider.js b/test/fixtures/programmatic/custom-provider/custom-provider.js
similarity index 100%
rename from test/fixtures/programmatic/customProvider/customProvider.js
rename to test/fixtures/programmatic/custom-provider/custom-provider.js
diff --git a/test/fixtures/programmatic/customProvider/serverless.yml b/test/fixtures/programmatic/custom-provider/serverless.yml
similarity index 91%
rename from test/fixtures/programmatic/customProvider/serverless.yml
rename to test/fixtures/programmatic/custom-provider/serverless.yml
index a30812b4a62..78d5790c007 100644
--- a/test/fixtures/programmatic/customProvider/serverless.yml
+++ b/test/fixtures/programmatic/custom-provider/serverless.yml
@@ -7,7 +7,7 @@ provider:
   runtime: foo
 
 plugins:
-  - ./customProvider
+  - ./custom-provider
 
 functions:
   someFunction:
diff --git a/test/fixtures/programmatic/ecr/serverless.yml b/test/fixtures/programmatic/ecr/serverless.yml
index 1e14efb7b62..462121bf222 100644
--- a/test/fixtures/programmatic/ecr/serverless.yml
+++ b/test/fixtures/programmatic/ecr/serverless.yml
@@ -5,6 +5,7 @@ frameworkVersion: '*'
 
 provider:
   name: aws
+  runtime: nodejs12.x
   ecr:
     images:
       baseimage:
diff --git a/test/fixtures/programmatic/eventBridge/core.js b/test/fixtures/programmatic/event-bridge/core.js
similarity index 100%
rename from test/fixtures/programmatic/eventBridge/core.js
rename to test/fixtures/programmatic/event-bridge/core.js
diff --git a/test/fixtures/programmatic/eventBridge/serverless.yml b/test/fixtures/programmatic/event-bridge/serverless.yml
similarity index 100%
rename from test/fixtures/programmatic/eventBridge/serverless.yml
rename to test/fixtures/programmatic/event-bridge/serverless.yml
diff --git a/test/fixtures/programmatic/eventBridge/utils.js b/test/fixtures/programmatic/event-bridge/utils.js
similarity index 100%
rename from test/fixtures/programmatic/eventBridge/utils.js
rename to test/fixtures/programmatic/event-bridge/utils.js
diff --git a/test/fixtures/programmatic/function-active-mq/core.js b/test/fixtures/programmatic/function-active-mq/core.js
new file mode 100644
index 00000000000..4ffe1870c7f
--- /dev/null
+++ b/test/fixtures/programmatic/function-active-mq/core.js
@@ -0,0 +1,53 @@
+'use strict';
+
+// NOTE: `stompit` is bundled into the deployment package
+// eslint-disable-next-line import/no-unresolved
+const stompit = require('stompit');
+
+function consumer(event, context, callback) {
+  const functionName = 'consumer';
+  const messages = event.messages.map((message) => Buffer.from(message.data, 'base64').toString());
+  // eslint-disable-next-line no-console
+  console.log(functionName, JSON.stringify(messages));
+  return callback(null, event);
+}
+
+async function producer() {
+  const connectOptions = {
+    host: process.env.MQ_HOST,
+    port: 61614,
+    ssl: true,
+    connectHeaders: {
+      login: process.env.MQ_USERNAME,
+      passcode: process.env.MQ_PASSWORD,
+    },
+  };
+  const queueName = process.env.QUEUE_NAME;
+
+  const sendPromise = new Promise((resolve, reject) => {
+    stompit.connect(connectOptions, (error, client) => {
+      if (error) {
+        console.log(`connect error ${error.message}`);
+        reject(error);
+      }
+
+      const frame = client.send({
+        'destination': queueName,
+        'content-type': 'text/plain',
+      });
+      frame.write('Hello from Apache MQ Integration test!');
+      frame.end();
+
+      client.disconnect();
+      resolve();
+    });
+  });
+
+  await sendPromise;
+
+  return {
+    statusCode: 200,
+  };
+}
+
+module.exports = { producer, consumer };
diff --git a/test/fixtures/programmatic/function-active-mq/package.json b/test/fixtures/programmatic/function-active-mq/package.json
new file mode 100644
index 00000000000..0400a991498
--- /dev/null
+++ b/test/fixtures/programmatic/function-active-mq/package.json
@@ -0,0 +1,5 @@
+{
+  "dependencies": {
+    "stompit": "^1.0.0"
+  }
+}
diff --git a/test/fixtures/programmatic/function-active-mq/serverless.yml b/test/fixtures/programmatic/function-active-mq/serverless.yml
new file mode 100644
index 00000000000..ce4f94dddd0
--- /dev/null
+++ b/test/fixtures/programmatic/function-active-mq/serverless.yml
@@ -0,0 +1,18 @@
+service: service
+
+configValidationMode: error
+frameworkVersion: '*'
+
+# VPC and Events configuration is added dynamically during test run
+# Because it has to be provisioned separately via CloudFormation stack
+
+provider:
+  name: aws
+  runtime: nodejs14.x
+  versionFunctions: false
+
+functions:
+  producer:
+    handler: core.producer
+  consumer:
+    handler: core.consumer
diff --git a/test/fixtures/programmatic/functionCloudFront/index.js b/test/fixtures/programmatic/function-cloud-front/index.js
similarity index 100%
rename from test/fixtures/programmatic/functionCloudFront/index.js
rename to test/fixtures/programmatic/function-cloud-front/index.js
diff --git a/test/fixtures/programmatic/functionCloudFront/serverless.yml b/test/fixtures/programmatic/function-cloud-front/serverless.yml
similarity index 88%
rename from test/fixtures/programmatic/functionCloudFront/serverless.yml
rename to test/fixtures/programmatic/function-cloud-front/serverless.yml
index be9ba4592b1..e39c570bb22 100644
--- a/test/fixtures/programmatic/functionCloudFront/serverless.yml
+++ b/test/fixtures/programmatic/function-cloud-front/serverless.yml
@@ -5,7 +5,7 @@ frameworkVersion: '*'
 
 provider:
   name: aws
-  lambdaHashingVersion: 20201221
+  runtime: nodejs12.x
 
 functions:
   foo:
diff --git a/test/fixtures/programmatic/functionEfs/core.js b/test/fixtures/programmatic/function-efs/core.js
similarity index 100%
rename from test/fixtures/programmatic/functionEfs/core.js
rename to test/fixtures/programmatic/function-efs/core.js
diff --git a/test/fixtures/programmatic/functionEfs/serverless.yml b/test/fixtures/programmatic/function-efs/serverless.yml
similarity index 100%
rename from test/fixtures/programmatic/functionEfs/serverless.yml
rename to test/fixtures/programmatic/function-efs/serverless.yml
diff --git a/test/fixtures/programmatic/functionLayers/extra_layers/testLayerSourceChange/index.js b/test/fixtures/programmatic/function-layers/extra-layers/test-layer-source-change/index.js
similarity index 100%
rename from test/fixtures/programmatic/functionLayers/extra_layers/testLayerSourceChange/index.js
rename to test/fixtures/programmatic/function-layers/extra-layers/test-layer-source-change/index.js
diff --git a/test/fixtures/programmatic/function/index.js b/test/fixtures/programmatic/function-layers/index.js
similarity index 100%
rename from test/fixtures/programmatic/function/index.js
rename to test/fixtures/programmatic/function-layers/index.js
diff --git a/test/fixtures/programmatic/functionLayers/serverless.yml b/test/fixtures/programmatic/function-layers/serverless.yml
similarity index 85%
rename from test/fixtures/programmatic/functionLayers/serverless.yml
rename to test/fixtures/programmatic/function-layers/serverless.yml
index d3fd805bb14..4bc10e2d2c5 100644
--- a/test/fixtures/programmatic/functionLayers/serverless.yml
+++ b/test/fixtures/programmatic/function-layers/serverless.yml
@@ -1,24 +1,24 @@
 service: service
 provider:
   name: aws
-  lambdaHashingVersion: 20201221
+  runtime: nodejs12.x
 
 layers:
   testLayer:
     name: default_test_layer
-    path: testLayer
+    path: test-layer
     description: 'test layer'
 
   TestLayerWithCapitals:
     name: capitalized_test_layer
-    path: testLayer
+    path: test-layer
 
   testLayerWithNoName:
-    path: testLayer
+    path: test-layer
 
 package:
-  exclude:
-    - extra_layers/**
+  patterns:
+    - '!extra-layers/**'
 
 functions:
   layerFunc:
diff --git a/test/fixtures/programmatic/functionLayers/testLayer/index.js b/test/fixtures/programmatic/function-layers/test-layer/index.js
similarity index 100%
rename from test/fixtures/programmatic/functionLayers/testLayer/index.js
rename to test/fixtures/programmatic/function-layers/test-layer/index.js
diff --git a/test/fixtures/programmatic/functionMsk/core.js b/test/fixtures/programmatic/function-msk/core.js
similarity index 100%
rename from test/fixtures/programmatic/functionMsk/core.js
rename to test/fixtures/programmatic/function-msk/core.js
diff --git a/test/fixtures/programmatic/functionMsk/package.json b/test/fixtures/programmatic/function-msk/package.json
similarity index 100%
rename from test/fixtures/programmatic/functionMsk/package.json
rename to test/fixtures/programmatic/function-msk/package.json
diff --git a/test/fixtures/programmatic/functionMsk/serverless.yml b/test/fixtures/programmatic/function-msk/serverless.yml
similarity index 100%
rename from test/fixtures/programmatic/functionMsk/serverless.yml
rename to test/fixtures/programmatic/function-msk/serverless.yml
diff --git a/test/fixtures/programmatic/function-rabbit-mq/core.js b/test/fixtures/programmatic/function-rabbit-mq/core.js
new file mode 100644
index 00000000000..4c823006610
--- /dev/null
+++ b/test/fixtures/programmatic/function-rabbit-mq/core.js
@@ -0,0 +1,43 @@
+'use strict';
+
+// NOTE: `amqplib` is bundled into the deployment package
+// eslint-disable-next-line import/no-unresolved
+const amqp = require('amqplib');
+
+function consumer(event, context, callback) {
+  const functionName = 'consumer';
+  const messages = [];
+
+  Object.keys(event.rmqMessagesByQueue).forEach((queueKey) => {
+    const queue = event.rmqMessagesByQueue[queueKey];
+    queue.forEach((message) => {
+      messages.push(Buffer.from(message.data, 'base64').toString());
+    });
+  });
+  // eslint-disable-next-line no-console
+  console.log(functionName, JSON.stringify(messages));
+
+  return callback(null, event);
+}
+
+async function producer() {
+  const connectOptions = {
+    protocol: 'amqps',
+    hostname: process.env.RABBITMQ_HOST,
+    port: 5671,
+    username: process.env.RABBITMQ_USERNAME,
+    password: process.env.RABBITMQ_PASSWORD,
+  };
+
+  const connection = await amqp.connect(connectOptions);
+  const channel = await connection.createChannel();
+  const queueName = process.env.QUEUE_NAME;
+  await channel.assertQueue(queueName);
+  await channel.sendToQueue(queueName, Buffer.from('Hello from RabbitMQ Integration test!'));
+
+  return {
+    statusCode: 200,
+  };
+}
+
+module.exports = { producer, consumer };
diff --git a/test/fixtures/programmatic/function-rabbit-mq/package.json b/test/fixtures/programmatic/function-rabbit-mq/package.json
new file mode 100644
index 00000000000..0a22a3db431
--- /dev/null
+++ b/test/fixtures/programmatic/function-rabbit-mq/package.json
@@ -0,0 +1,5 @@
+{
+  "dependencies": {
+    "amqplib": "^0.8.0"
+  }
+}
diff --git a/test/fixtures/programmatic/function-rabbit-mq/serverless.yml b/test/fixtures/programmatic/function-rabbit-mq/serverless.yml
new file mode 100644
index 00000000000..ce4f94dddd0
--- /dev/null
+++ b/test/fixtures/programmatic/function-rabbit-mq/serverless.yml
@@ -0,0 +1,18 @@
+service: service
+
+configValidationMode: error
+frameworkVersion: '*'
+
+# VPC and Events configuration is added dynamically during test run
+# Because it has to be provisioned separately via CloudFormation stack
+
+provider:
+  name: aws
+  runtime: nodejs14.x
+  versionFunctions: false
+
+functions:
+  producer:
+    handler: core.producer
+  consumer:
+    handler: core.consumer
diff --git a/test/fixtures/programmatic/function/basic.js b/test/fixtures/programmatic/function/basic.js
new file mode 100644
index 00000000000..0d9a6df74e8
--- /dev/null
+++ b/test/fixtures/programmatic/function/basic.js
@@ -0,0 +1,7 @@
+'use strict';
+
+module.exports.handler = (event, context, callback) =>
+  callback(null, {
+    statusCode: 200,
+    body: JSON.stringify({ message: 'Basic', input: event }),
+  });
diff --git a/test/fixtures/programmatic/function/other.js b/test/fixtures/programmatic/function/other.js
new file mode 100644
index 00000000000..a6ae9a6c1c2
--- /dev/null
+++ b/test/fixtures/programmatic/function/other.js
@@ -0,0 +1,7 @@
+'use strict';
+
+module.exports.handler = (event, context, callback) =>
+  callback(null, {
+    statusCode: 200,
+    body: JSON.stringify({ message: 'Other', input: event }),
+  });
diff --git a/test/fixtures/programmatic/function/serverless.yml b/test/fixtures/programmatic/function/serverless.yml
index 889ae366dbf..8225e60810a 100644
--- a/test/fixtures/programmatic/function/serverless.yml
+++ b/test/fixtures/programmatic/function/serverless.yml
@@ -5,10 +5,9 @@ frameworkVersion: '*'
 
 provider:
   name: aws
-  lambdaHashingVersion: 20201221
 
 functions:
-  foo:
-    handler: index.handler
+  basic:
+    handler: basic.handler
   other:
-    handler: index.handler
+    handler: other.handler
diff --git a/test/fixtures/programmatic/functionDestinations/target.js b/test/fixtures/programmatic/function/target.js
similarity index 100%
rename from test/fixtures/programmatic/functionDestinations/target.js
rename to test/fixtures/programmatic/function/target.js
diff --git a/test/fixtures/programmatic/functionDestinations/trigger.js b/test/fixtures/programmatic/function/trigger.js
similarity index 100%
rename from test/fixtures/programmatic/functionDestinations/trigger.js
rename to test/fixtures/programmatic/function/trigger.js
diff --git a/test/fixtures/programmatic/functionDestinations/serverless.yml b/test/fixtures/programmatic/functionDestinations/serverless.yml
deleted file mode 100644
index 1f37be3ba35..00000000000
--- a/test/fixtures/programmatic/functionDestinations/serverless.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-service: service
-
-configValidationMode: error
-frameworkVersion: '*'
-
-provider:
-  name: aws
-  lambdaHashingVersion: 20201221
-
-functions:
-  target:
-    handler: target.handler
-  trigger:
-    handler: trigger.handler
-    destinations:
-      onSuccess: target
diff --git a/test/fixtures/programmatic/httpApiCatchAll/index.js b/test/fixtures/programmatic/http-api-catch-all/index.js
similarity index 100%
rename from test/fixtures/programmatic/httpApiCatchAll/index.js
rename to test/fixtures/programmatic/http-api-catch-all/index.js
diff --git a/test/fixtures/programmatic/httpApiCatchAll/serverless.yml b/test/fixtures/programmatic/http-api-catch-all/serverless.yml
similarity index 90%
rename from test/fixtures/programmatic/httpApiCatchAll/serverless.yml
rename to test/fixtures/programmatic/http-api-catch-all/serverless.yml
index 28a5ebb31f4..5e85f556cad 100644
--- a/test/fixtures/programmatic/httpApiCatchAll/serverless.yml
+++ b/test/fixtures/programmatic/http-api-catch-all/serverless.yml
@@ -5,7 +5,7 @@ frameworkVersion: '*'
 
 provider:
   name: aws
-  lambdaHashingVersion: 20201221
+  runtime: nodejs12.x
 
 functions:
   foo:
diff --git a/test/fixtures/programmatic/httpApiExport/serverless.yml b/test/fixtures/programmatic/http-api-export/serverless.yml
similarity index 93%
rename from test/fixtures/programmatic/httpApiExport/serverless.yml
rename to test/fixtures/programmatic/http-api-export/serverless.yml
index 66fdbafd507..23360190fd1 100644
--- a/test/fixtures/programmatic/httpApiExport/serverless.yml
+++ b/test/fixtures/programmatic/http-api-export/serverless.yml
@@ -5,7 +5,7 @@ frameworkVersion: '*'
 
 provider:
   name: aws
-  lambdaHashingVersion: 20201221
+  runtime: nodejs12.x
 
 resources:
   Resources:
diff --git a/test/fixtures/programmatic/httpApi/authorizers.js b/test/fixtures/programmatic/http-api/authorizers.js
similarity index 100%
rename from test/fixtures/programmatic/httpApi/authorizers.js
rename to test/fixtures/programmatic/http-api/authorizers.js
diff --git a/test/fixtures/programmatic/httpApi/index.js b/test/fixtures/programmatic/http-api/index.js
similarity index 100%
rename from test/fixtures/programmatic/httpApi/index.js
rename to test/fixtures/programmatic/http-api/index.js
diff --git a/test/fixtures/programmatic/httpApi/serverless.yml b/test/fixtures/programmatic/http-api/serverless.yml
similarity index 95%
rename from test/fixtures/programmatic/httpApi/serverless.yml
rename to test/fixtures/programmatic/http-api/serverless.yml
index cd79952109f..22bd5f88166 100644
--- a/test/fixtures/programmatic/httpApi/serverless.yml
+++ b/test/fixtures/programmatic/http-api/serverless.yml
@@ -5,8 +5,8 @@ frameworkVersion: '*'
 
 provider:
   name: aws
+  runtime: nodejs12.x
   logRetentionInDays: 14
-  lambdaHashingVersion: 20201221
 
 functions:
   foo:
diff --git a/test/fixtures/programmatic/invocation/class.rb b/test/fixtures/programmatic/invocation/class.rb
new file mode 100644
index 00000000000..a21ce74f05e
--- /dev/null
+++ b/test/fixtures/programmatic/invocation/class.rb
@@ -0,0 +1,7 @@
+module MyModule
+  class MyClass
+    def self.my_class_method(event:, context:)
+      {"source" => "rubyclass"}
+    end
+  end
+end
diff --git a/test/fixtures/programmatic/invocation/deadline_ms.rb b/test/fixtures/programmatic/invocation/deadline_ms.rb
new file mode 100644
index 00000000000..2f9b3556e81
--- /dev/null
+++ b/test/fixtures/programmatic/invocation/deadline_ms.rb
@@ -0,0 +1,4 @@
+def handler(event:, context:)
+  {"deadlineMs" => context.deadline_ms}
+end
+
diff --git a/test/fixtures/programmatic/invocation/handler.py b/test/fixtures/programmatic/invocation/handler.py
new file mode 100644
index 00000000000..96767b26d6f
--- /dev/null
+++ b/test/fixtures/programmatic/invocation/handler.py
@@ -0,0 +1,12 @@
+import json
+import os
+
+
+def handler(event, context):
+    return {
+        "statusCode": 200,
+        "body": json.dumps({
+            "message": "Invoked",
+            "env": dict(os.environ)
+        })
+    }
diff --git a/test/fixtures/programmatic/invocation/handler.rb b/test/fixtures/programmatic/invocation/handler.rb
new file mode 100644
index 00000000000..fb6b78590e8
--- /dev/null
+++ b/test/fixtures/programmatic/invocation/handler.rb
@@ -0,0 +1,6 @@
+require 'json'
+
+def handler(event:, context:)
+  {"statusCode" => 200, "body" => {"message" => "Invoked", "env" => ENV.to_hash}.to_json }
+end
+
diff --git a/test/fixtures/programmatic/invocation/remaining-time.js b/test/fixtures/programmatic/invocation/remaining-time.js
index 6e6352d6320..2028d1ff421 100644
--- a/test/fixtures/programmatic/invocation/remaining-time.js
+++ b/test/fixtures/programmatic/invocation/remaining-time.js
@@ -1,15 +1,15 @@
 'use strict';
 
 module.exports.handler = (event, context, callback) => {
-  const data = [context.remainingTimeInMillis()];
+  const data = [context.getRemainingTimeInMillis()];
   setTimeout(() => {
-    data.push(context.remainingTimeInMillis());
+    data.push(context.getRemainingTimeInMillis());
     setTimeout(() => {
-      data.push(context.remainingTimeInMillis());
+      data.push(context.getRemainingTimeInMillis());
       callback(null, {
         statusCode: 200,
         body: JSON.stringify({ data }),
       });
     });
-  }, 1000);
+  }, 100);
 };
diff --git a/lib/plugins/aws/invokeLocal/fixture/handler.py b/test/fixtures/programmatic/invocation/remaining_time.py
similarity index 77%
rename from lib/plugins/aws/invokeLocal/fixture/handler.py
rename to test/fixtures/programmatic/invocation/remaining_time.py
index 13ffcf9f995..25fffc7ed4d 100644
--- a/lib/plugins/aws/invokeLocal/fixture/handler.py
+++ b/test/fixtures/programmatic/invocation/remaining_time.py
@@ -1,9 +1,9 @@
 from time import sleep
 
 
-def withRemainingTime(event, context):
+def handler(event, context):
     start = context.get_remaining_time_in_millis()
-    sleep(0.001)
+    sleep(0.1)
     stop = context.get_remaining_time_in_millis()
 
     return {
diff --git a/test/fixtures/programmatic/invocation/remaining_time.rb b/test/fixtures/programmatic/invocation/remaining_time.rb
new file mode 100644
index 00000000000..1ed784a06ec
--- /dev/null
+++ b/test/fixtures/programmatic/invocation/remaining_time.rb
@@ -0,0 +1,8 @@
+def handler(event:, context:)
+  start = context.get_remaining_time_in_millis()
+  sleep(0.1)
+  stop = context.get_remaining_time_in_millis()
+
+  {"start" => start, "stop" => stop}
+end
+
diff --git a/test/fixtures/programmatic/invocation/serverless.yml b/test/fixtures/programmatic/invocation/serverless.yml
index a2c1b09f301..e1657f10240 100644
--- a/test/fixtures/programmatic/invocation/serverless.yml
+++ b/test/fixtures/programmatic/invocation/serverless.yml
@@ -5,7 +5,7 @@ frameworkVersion: '*'
 
 provider:
   name: aws
-  lambdaHashingVersion: 20201221
+  runtime: nodejs12.x
 
 functions:
   callback:
@@ -27,3 +27,23 @@ functions:
   remainingTime:
     handler: remaining-time.handler
     timeout: 3
+  python:
+    runtime: python3.8
+    handler: handler.handler
+  pythonRemainingTime:
+    runtime: python3.8
+    handler: remaining_time.handler
+    timeout: 3
+  ruby:
+    runtime: ruby2.7
+    handler: handler.handler
+  rubyRemainingTime:
+    runtime: ruby2.7
+    handler: remaining_time.handler
+    timeout: 3
+  rubyDeadline:
+    runtime: ruby2.7
+    handler: deadline_ms.handler
+  rubyClass:
+    runtime: ruby2.7
+    handler: class.MyModule::MyClass.my_class_method
diff --git a/test/fixtures/programmatic/iotFleetProvisioning/hook.js b/test/fixtures/programmatic/iot-fleet-provisioning/hook.js
similarity index 100%
rename from test/fixtures/programmatic/iotFleetProvisioning/hook.js
rename to test/fixtures/programmatic/iot-fleet-provisioning/hook.js
diff --git a/test/fixtures/programmatic/iotFleetProvisioning/package.json b/test/fixtures/programmatic/iot-fleet-provisioning/package.json
similarity index 100%
rename from test/fixtures/programmatic/iotFleetProvisioning/package.json
rename to test/fixtures/programmatic/iot-fleet-provisioning/package.json
diff --git a/test/fixtures/programmatic/iotFleetProvisioning/registerDevice.js b/test/fixtures/programmatic/iot-fleet-provisioning/register-device.js
similarity index 100%
rename from test/fixtures/programmatic/iotFleetProvisioning/registerDevice.js
rename to test/fixtures/programmatic/iot-fleet-provisioning/register-device.js
diff --git a/test/fixtures/programmatic/iotFleetProvisioning/serverless.yml b/test/fixtures/programmatic/iot-fleet-provisioning/serverless.yml
similarity index 87%
rename from test/fixtures/programmatic/iotFleetProvisioning/serverless.yml
rename to test/fixtures/programmatic/iot-fleet-provisioning/serverless.yml
index eada68f71cd..2344917715c 100644
--- a/test/fixtures/programmatic/iotFleetProvisioning/serverless.yml
+++ b/test/fixtures/programmatic/iot-fleet-provisioning/serverless.yml
@@ -10,11 +10,12 @@ provider:
 
 functions:
   registerDevice:
-    handler: registerDevice.main
+    handler: register-device.main
+    timeout: 30
     environment:
       TEMPLATE_NAME:
-        Ref: IotFleetProvisioningBasicIotProvisioningTemplate
-  iotFleetProvisioningBasic:
+        Ref: BasicIotProvisioningTemplate
+  basic:
     handler: hook.main
     events:
       - iotFleetProvisioning:
@@ -52,7 +53,7 @@ resources:
   Outputs:
     ProvisioningTemplateName:
       Value:
-        Ref: IotFleetProvisioningBasicIotProvisioningTemplate
+        Ref: BasicIotProvisioningTemplate
     IoTPolicyName:
       Value:
         Ref: IoTPolicy
diff --git a/test/fixtures/programmatic/iotFleetProvisioning/template.json b/test/fixtures/programmatic/iot-fleet-provisioning/template.json
similarity index 100%
rename from test/fixtures/programmatic/iotFleetProvisioning/template.json
rename to test/fixtures/programmatic/iot-fleet-provisioning/template.json
diff --git a/test/fixtures/programmatic/layer/serverless.yml b/test/fixtures/programmatic/layer/serverless.yml
index 550975f5dd8..ce3c9a46348 100644
--- a/test/fixtures/programmatic/layer/serverless.yml
+++ b/test/fixtures/programmatic/layer/serverless.yml
@@ -5,7 +5,7 @@ frameworkVersion: '*'
 
 provider:
   name: aws
-  lambdaHashingVersion: 20201221
+  runtime: nodejs12.x
 
 functions:
   function:
diff --git a/test/fixtures/programmatic/locallyInstalledServerless/_setup.js b/test/fixtures/programmatic/locally-installed-serverless/_setup.js
similarity index 85%
rename from test/fixtures/programmatic/locallyInstalledServerless/_setup.js
rename to test/fixtures/programmatic/locally-installed-serverless/_setup.js
index 08248290f87..79685ec05d9 100644
--- a/test/fixtures/programmatic/locallyInstalledServerless/_setup.js
+++ b/test/fixtures/programmatic/locally-installed-serverless/_setup.js
@@ -4,7 +4,7 @@ const fs = require('fs');
 const path = require('path');
 
 const fixturePath = path.resolve(__dirname, 'node_modules/serverless');
-const fixtureModulePath = path.resolve(fixturePath, 'index.js');
+const fixtureModulePath = path.resolve(fixturePath, 'bin/serverless.js');
 
 module.exports = (originalFixturePath) => {
   const content = fs.readFileSync(fixtureModulePath);
diff --git a/test/fixtures/programmatic/locally-installed-serverless/node_modules/serverless/bin/serverless.js b/test/fixtures/programmatic/locally-installed-serverless/node_modules/serverless/bin/serverless.js
new file mode 100644
index 00000000000..8b3d1a27b9f
--- /dev/null
+++ b/test/fixtures/programmatic/locally-installed-serverless/node_modules/serverless/bin/serverless.js
@@ -0,0 +1,4 @@
+'use strict';
+
+// eslint-disable-next-line no-undef
+require($SERVERLESS_PATH);
diff --git a/test/fixtures/programmatic/locally-installed-serverless/node_modules/serverless/lib/serverless.js b/test/fixtures/programmatic/locally-installed-serverless/node_modules/serverless/lib/serverless.js
new file mode 100644
index 00000000000..ad9a93a7c16
--- /dev/null
+++ b/test/fixtures/programmatic/locally-installed-serverless/node_modules/serverless/lib/serverless.js
@@ -0,0 +1 @@
+'use strict';
diff --git a/test/fixtures/programmatic/locally-installed-serverless/node_modules/serverless/package.json b/test/fixtures/programmatic/locally-installed-serverless/node_modules/serverless/package.json
new file mode 100644
index 00000000000..27f17035532
--- /dev/null
+++ b/test/fixtures/programmatic/locally-installed-serverless/node_modules/serverless/package.json
@@ -0,0 +1 @@
+{ "main": "lib/serverless.js", "version": "2.0.0-local" }
diff --git a/test/fixtures/programmatic/locallyInstalledServerless/serverless.yml b/test/fixtures/programmatic/locally-installed-serverless/serverless.yml
similarity index 100%
rename from test/fixtures/programmatic/locallyInstalledServerless/serverless.yml
rename to test/fixtures/programmatic/locally-installed-serverless/serverless.yml
diff --git a/test/fixtures/programmatic/locallyInstalledServerless/node_modules/serverless/index.js b/test/fixtures/programmatic/locallyInstalledServerless/node_modules/serverless/index.js
deleted file mode 100644
index c27790f0783..00000000000
--- a/test/fixtures/programmatic/locallyInstalledServerless/node_modules/serverless/index.js
+++ /dev/null
@@ -1,21 +0,0 @@
-'use strict';
-
-// eslint-disable-next-line no-undef
-const SERVERLESS_PATH = $SERVERLESS_PATH;
-
-const Serverless = require(SERVERLESS_PATH);
-
-class LocalServerless extends Serverless {
-  constructor(config) {
-    super(config);
-    this.isLocalStub = true;
-  }
-  eventuallyFallbackToLocal() {
-    this.isLocallyInstalled = true;
-    return Promise.resolve();
-  }
-};
-
-LocalServerless.SERVERLESS_PATH = SERVERLESS_PATH;
-
-module.exports = LocalServerless;
diff --git a/test/fixtures/programmatic/locallyInstalledServerless/node_modules/serverless/lib/cli/commands-schema.js b/test/fixtures/programmatic/locallyInstalledServerless/node_modules/serverless/lib/cli/commands-schema.js
deleted file mode 100644
index 91fd86eb0ba..00000000000
--- a/test/fixtures/programmatic/locallyInstalledServerless/node_modules/serverless/lib/cli/commands-schema.js
+++ /dev/null
@@ -1,5 +0,0 @@
-'use strict';
-
-const path = require('path');
-
-module.exports = require(path.resolve(require('../../').SERVERLESS_PATH, 'lib/cli/commands-schema'));
diff --git a/test/fixtures/programmatic/locallyInstalledServerless/node_modules/serverless/lib/cli/resolve-configuration-path.js b/test/fixtures/programmatic/locallyInstalledServerless/node_modules/serverless/lib/cli/resolve-configuration-path.js
deleted file mode 100644
index 3aa0d60cb8c..00000000000
--- a/test/fixtures/programmatic/locallyInstalledServerless/node_modules/serverless/lib/cli/resolve-configuration-path.js
+++ /dev/null
@@ -1,5 +0,0 @@
-'use strict';
-
-const path = require('path');
-
-module.exports = require(path.resolve(require('../..').SERVERLESS_PATH, 'lib/cli/resolve-configuration-path'));
diff --git a/test/fixtures/programmatic/locallyInstalledServerless/node_modules/serverless/lib/cli/resolve-input.js b/test/fixtures/programmatic/locallyInstalledServerless/node_modules/serverless/lib/cli/resolve-input.js
deleted file mode 100644
index f7907d4db55..00000000000
--- a/test/fixtures/programmatic/locallyInstalledServerless/node_modules/serverless/lib/cli/resolve-input.js
+++ /dev/null
@@ -1,5 +0,0 @@
-'use strict';
-
-const path = require('path');
-
-module.exports = require(path.resolve(require('../..').SERVERLESS_PATH, 'lib/cli/resolve-input'));
diff --git a/test/fixtures/programmatic/locallyInstalledServerless/node_modules/serverless/lib/configuration/read.js b/test/fixtures/programmatic/locallyInstalledServerless/node_modules/serverless/lib/configuration/read.js
deleted file mode 100644
index f0c2a10a275..00000000000
--- a/test/fixtures/programmatic/locallyInstalledServerless/node_modules/serverless/lib/configuration/read.js
+++ /dev/null
@@ -1,5 +0,0 @@
-'use strict';
-
-const path = require('path');
-
-module.exports = require(path.resolve(require('../..').SERVERLESS_PATH, 'lib/configuration/read'));
diff --git a/test/fixtures/programmatic/locallyInstalledServerless/node_modules/serverless/lib/configuration/variables.js b/test/fixtures/programmatic/locallyInstalledServerless/node_modules/serverless/lib/configuration/variables.js
deleted file mode 100644
index 01bb118433f..00000000000
--- a/test/fixtures/programmatic/locallyInstalledServerless/node_modules/serverless/lib/configuration/variables.js
+++ /dev/null
@@ -1,5 +0,0 @@
-'use strict';
-
-const path = require('path');
-
-module.exports = require(path.resolve(require('../..').SERVERLESS_PATH, 'lib/configuration/variables'));
diff --git a/test/fixtures/programmatic/locallyInstalledServerless/node_modules/serverless/lib/utils/analytics/areDisabled.js b/test/fixtures/programmatic/locallyInstalledServerless/node_modules/serverless/lib/utils/analytics/areDisabled.js
deleted file mode 100644
index 96911ec718f..00000000000
--- a/test/fixtures/programmatic/locallyInstalledServerless/node_modules/serverless/lib/utils/analytics/areDisabled.js
+++ /dev/null
@@ -1,3 +0,0 @@
-// Patch to ensure that runServerless won't crash on enforcing disabling of analytics
-
-'use strict';
diff --git a/test/fixtures/programmatic/multi-service/file.json b/test/fixtures/programmatic/multi-service/file.json
new file mode 100644
index 00000000000..c8c4105eb57
--- /dev/null
+++ b/test/fixtures/programmatic/multi-service/file.json
@@ -0,0 +1,3 @@
+{
+  "foo": "bar"
+}
diff --git a/test/fixtures/programmatic/functionLayers/index.js b/test/fixtures/programmatic/multi-service/service-a/index.js
similarity index 100%
rename from test/fixtures/programmatic/functionLayers/index.js
rename to test/fixtures/programmatic/multi-service/service-a/index.js
diff --git a/test/fixtures/programmatic/multi-service/service-a/serverless.yml b/test/fixtures/programmatic/multi-service/service-a/serverless.yml
new file mode 100644
index 00000000000..df2d1797e9e
--- /dev/null
+++ b/test/fixtures/programmatic/multi-service/service-a/serverless.yml
@@ -0,0 +1,21 @@
+service: service
+
+configValidationMode: error
+frameworkVersion: '*'
+
+provider:
+  name: aws
+  runtime: nodejs12.x
+
+custom:
+  env: ${env:ENV_SOURCE_TEST, null}
+  file: ${file(../file.json)}
+  opt: ${opt:stage, null}
+  self: ${self:custom.file.foo}
+  strToBool: ${strToBool('false')}
+
+functions:
+  foo:
+    handler: index.handler
+  other:
+    handler: index.handler
diff --git a/test/fixtures/programmatic/packageArtifactInServerlessDir/my-own.zip b/test/fixtures/programmatic/package-artifact-in-serverless-dir/my-own.zip
similarity index 100%
rename from test/fixtures/programmatic/packageArtifactInServerlessDir/my-own.zip
rename to test/fixtures/programmatic/package-artifact-in-serverless-dir/my-own.zip
diff --git a/test/fixtures/programmatic/packageArtifactInServerlessDir/package-artifact-plugin.js b/test/fixtures/programmatic/package-artifact-in-serverless-dir/package-artifact-plugin.js
similarity index 100%
rename from test/fixtures/programmatic/packageArtifactInServerlessDir/package-artifact-plugin.js
rename to test/fixtures/programmatic/package-artifact-in-serverless-dir/package-artifact-plugin.js
diff --git a/test/fixtures/programmatic/packageArtifactInServerlessDir/serverless.yml b/test/fixtures/programmatic/package-artifact-in-serverless-dir/serverless.yml
similarity index 89%
rename from test/fixtures/programmatic/packageArtifactInServerlessDir/serverless.yml
rename to test/fixtures/programmatic/package-artifact-in-serverless-dir/serverless.yml
index 097748ccf09..e953856575b 100644
--- a/test/fixtures/programmatic/packageArtifactInServerlessDir/serverless.yml
+++ b/test/fixtures/programmatic/package-artifact-in-serverless-dir/serverless.yml
@@ -5,7 +5,7 @@ frameworkVersion: '*'
 
 provider:
   name: aws
-  lambdaHashingVersion: 20201221
+  runtime: nodejs12.x
 
 plugins:
   # Mutates `package.artifact` to point to copied `.serverless/NAME.zip`
diff --git a/test/fixtures/programmatic/packageArtifact/absoluteArtifact.zip b/test/fixtures/programmatic/package-artifact/absolute-artifact.zip
similarity index 100%
rename from test/fixtures/programmatic/packageArtifact/absoluteArtifact.zip
rename to test/fixtures/programmatic/package-artifact/absolute-artifact.zip
diff --git a/test/fixtures/programmatic/packageArtifact/artifact-function.zip b/test/fixtures/programmatic/package-artifact/artifact-function.zip
similarity index 100%
rename from test/fixtures/programmatic/packageArtifact/artifact-function.zip
rename to test/fixtures/programmatic/package-artifact/artifact-function.zip
diff --git a/test/fixtures/programmatic/packageArtifact/artifact.zip b/test/fixtures/programmatic/package-artifact/artifact.zip
similarity index 100%
rename from test/fixtures/programmatic/packageArtifact/artifact.zip
rename to test/fixtures/programmatic/package-artifact/artifact.zip
diff --git a/test/fixtures/programmatic/packageArtifact/index.js b/test/fixtures/programmatic/package-artifact/index.js
similarity index 100%
rename from test/fixtures/programmatic/packageArtifact/index.js
rename to test/fixtures/programmatic/package-artifact/index.js
diff --git a/test/fixtures/programmatic/packageArtifact/serverless.yml b/test/fixtures/programmatic/package-artifact/serverless.yml
similarity index 88%
rename from test/fixtures/programmatic/packageArtifact/serverless.yml
rename to test/fixtures/programmatic/package-artifact/serverless.yml
index 57307593bdc..07a5bfb4a32 100644
--- a/test/fixtures/programmatic/packageArtifact/serverless.yml
+++ b/test/fixtures/programmatic/package-artifact/serverless.yml
@@ -5,7 +5,7 @@ frameworkVersion: '*'
 
 provider:
   name: aws
-  lambdaHashingVersion: 20201221
+  runtime: nodejs12.x
 
 package:
   artifact: artifact.zip
diff --git a/test/fixtures/programmatic/packaging/custom-plugins/plugin-2/index.js b/test/fixtures/programmatic/packaging/custom-plugins/plugin-2/index.js
new file mode 100644
index 00000000000..2f63a91388c
--- /dev/null
+++ b/test/fixtures/programmatic/packaging/custom-plugins/plugin-2/index.js
@@ -0,0 +1,3 @@
+'use strict';
+
+module.exports = function SomePlugin() {};
diff --git a/test/fixtures/programmatic/packaging/custom-plugins/plugin-3/package.json b/test/fixtures/programmatic/packaging/custom-plugins/plugin-3/package.json
new file mode 100644
index 00000000000..7847c0fa914
--- /dev/null
+++ b/test/fixtures/programmatic/packaging/custom-plugins/plugin-3/package.json
@@ -0,0 +1,3 @@
+{
+  "main": "src/main.js"
+}
diff --git a/test/fixtures/programmatic/packaging/custom-plugins/plugin-3/src/main.js b/test/fixtures/programmatic/packaging/custom-plugins/plugin-3/src/main.js
new file mode 100644
index 00000000000..2f63a91388c
--- /dev/null
+++ b/test/fixtures/programmatic/packaging/custom-plugins/plugin-3/src/main.js
@@ -0,0 +1,3 @@
+'use strict';
+
+module.exports = function SomePlugin() {};
diff --git a/test/fixtures/programmatic/packaging/custom-plugins/plugin-4/index.js b/test/fixtures/programmatic/packaging/custom-plugins/plugin-4/index.js
new file mode 100644
index 00000000000..2f63a91388c
--- /dev/null
+++ b/test/fixtures/programmatic/packaging/custom-plugins/plugin-4/index.js
@@ -0,0 +1,3 @@
+'use strict';
+
+module.exports = function SomePlugin() {};
diff --git a/test/fixtures/programmatic/packaging/serverless.yml b/test/fixtures/programmatic/packaging/serverless.yml
index bf6e0073b68..34320d253a3 100644
--- a/test/fixtures/programmatic/packaging/serverless.yml
+++ b/test/fixtures/programmatic/packaging/serverless.yml
@@ -2,10 +2,11 @@ service: service
 
 configValidationMode: error
 frameworkVersion: '*'
+disabledDeprecations: LOAD_VARIABLES_FROM_ENV_FILES
 
 provider:
   name: aws
-  lambdaHashingVersion: 20201221
+  runtime: nodejs12.x
 
 functions:
   fnService:
diff --git a/test/fixtures/programmatic/plugin/plugin.js b/test/fixtures/programmatic/plugin/plugin.js
index 53945e6470a..6e8a0d2381c 100644
--- a/test/fixtures/programmatic/plugin/plugin.js
+++ b/test/fixtures/programmatic/plugin/plugin.js
@@ -1,7 +1,10 @@
 'use strict';
 
-module.exports = class Plugin {
-  constructor() {
+module.exports = class TestPlugin {
+  constructor(serverless, options, utils) {
+    this.serverless = serverless;
+    this.options = options;
+    this.utils = utils;
     this.commands = {
       customCommand: {
         usage: 'Description of custom command',
diff --git a/test/fixtures/programmatic/plugin/serverless.yml b/test/fixtures/programmatic/plugin/serverless.yml
index 43d21b831ec..e36e6d08362 100644
--- a/test/fixtures/programmatic/plugin/serverless.yml
+++ b/test/fixtures/programmatic/plugin/serverless.yml
@@ -5,7 +5,7 @@ frameworkVersion: '*'
 
 provider:
   name: aws
-  lambdaHashingVersion: 20201221
+  runtime: nodejs12.x
 
 plugins:
   - ./plugin
diff --git a/test/fixtures/programmatic/provisionedConcurrency/core.js b/test/fixtures/programmatic/provisioned-concurrency/core.js
similarity index 100%
rename from test/fixtures/programmatic/provisionedConcurrency/core.js
rename to test/fixtures/programmatic/provisioned-concurrency/core.js
diff --git a/test/fixtures/programmatic/provisionedConcurrency/serverless.yml b/test/fixtures/programmatic/provisioned-concurrency/serverless.yml
similarity index 100%
rename from test/fixtures/programmatic/provisionedConcurrency/serverless.yml
rename to test/fixtures/programmatic/provisioned-concurrency/serverless.yml
diff --git a/test/fixtures/programmatic/request-parameters/serverless.yml b/test/fixtures/programmatic/request-parameters/serverless.yml
new file mode 100644
index 00000000000..cebec66e7e2
--- /dev/null
+++ b/test/fixtures/programmatic/request-parameters/serverless.yml
@@ -0,0 +1,82 @@
+service: service
+
+provider:
+  name: aws
+  runtime: nodejs12.x
+
+functions:
+  target:
+    handler: target.handler
+    events:
+      - http:
+          path: no-params
+          method: get
+      - http:
+          path: querystrings-not-required
+          method: get
+          request:
+            parameters:
+              querystrings:
+                url: false
+      - http:
+          path: querystrings-required
+          method: get
+          request:
+            parameters:
+              querystrings:
+                url: true
+      - http:
+          path: headers-not-required
+          method: get
+          request:
+            parameters:
+              headers:
+                foo: false
+      - http:
+          path: headers-required
+          method: get
+          request:
+            parameters:
+              headers:
+                foo: true
+      - http:
+          path: paths-not-required
+          method: get
+          request:
+            parameters:
+              paths:
+                bar: false
+      - http:
+          path: paths-not-required-object
+          method: get
+          request:
+            parameters:
+              paths:
+                bar:
+                  required: false
+      - http:
+          path: paths-required
+          method: get
+          request:
+            parameters:
+              paths:
+                bar: true
+      - http:
+          path: no-params-with-schema
+          method: get
+          request:
+            schemas:
+              application/json:
+                schema:
+                  $schema: http://json-schema.org/schema#
+      - http:
+          path: params-with-schema
+          method: get
+          request:
+            schemas:
+              application/json:
+                schema:
+                  $schema: http://json-schema.org/schema#
+            parameters:
+              querystrings:
+                url: true
diff --git a/test/fixtures/programmatic/requestSchema/target.js b/test/fixtures/programmatic/request-parameters/target.js
similarity index 100%
rename from test/fixtures/programmatic/requestSchema/target.js
rename to test/fixtures/programmatic/request-parameters/target.js
diff --git a/test/fixtures/programmatic/requestSchema/dummySchema.json b/test/fixtures/programmatic/request-schema/dummy-schema.json
similarity index 100%
rename from test/fixtures/programmatic/requestSchema/dummySchema.json
rename to test/fixtures/programmatic/request-schema/dummy-schema.json
diff --git a/test/fixtures/programmatic/requestSchema/serverless.yml b/test/fixtures/programmatic/request-schema/serverless.yml
similarity index 61%
rename from test/fixtures/programmatic/requestSchema/serverless.yml
rename to test/fixtures/programmatic/request-schema/serverless.yml
index 7b321bcc466..50858274661 100644
--- a/test/fixtures/programmatic/requestSchema/serverless.yml
+++ b/test/fixtures/programmatic/request-schema/serverless.yml
@@ -2,20 +2,20 @@ service: service
 
 provider:
   name: aws
-  lambdaHashingVersion: 20201221
+  runtime: nodejs12.x
   apiGateway:
     request:
       schemas:
         test-model:
           name: 'TestModel'
           description: 'Test Description'
-          schema: '${file(dummySchema.json)}'
+          schema: '${file(dummy-schema.json)}'
         test-model-simple:
-          schema: '${file(dummySchema.json)}'
+          schema: '${file(dummy-schema.json)}'
         unused-model:
           name: 'UnusedModel'
           description: 'I should not be created'
-          schema: '${file(dummySchema.json)}'
+          schema: '${file(dummy-schema.json)}'
 
 functions:
   target:
@@ -38,7 +38,7 @@ functions:
           method: get
           request:
             schemas:
-              application/json: '${file(dummySchema.json)}'
+              application/json: '${file(dummy-schema.json)}'
       - http:
           path: test-direct-full
           method: get
@@ -47,24 +47,11 @@ functions:
               application/json:
                 name: TestMethodModel
                 description: 'Test Method Model Desc'
-                schema: '${file(dummySchema.json)}'
-      - http:
-          path: test-deprecated-simple
-          method: get
-          request:
-            schema:
-              application/json: '${file(dummySchema.json)}'
+                schema: '${file(dummy-schema.json)}'
       - http:
           path: test-multiple
           method: get
           request:
             schemas:
-              application/json: '${file(dummySchema.json)}'
-              text/plain: 'foo'
-      - http:
-          path: test-deprecated-multiple
-          method: get
-          request:
-            schema:
-              application/json: '${file(dummySchema.json)}'
+              application/json: '${file(dummy-schema.json)}'
               text/plain: 'foo'
diff --git a/test/fixtures/programmatic/request-schema/target.js b/test/fixtures/programmatic/request-schema/target.js
new file mode 100644
index 00000000000..bf64b17e8de
--- /dev/null
+++ b/test/fixtures/programmatic/request-schema/target.js
@@ -0,0 +1,8 @@
+'use strict';
+
+module.exports.handler = () => {
+  return {
+    statusCode: 200,
+    body: 'OK',
+  };
+};
diff --git a/test/fixtures/programmatic/schedule/core.js b/test/fixtures/programmatic/schedule/core.js
index fa3f5a33e9e..1c58c5eab22 100644
--- a/test/fixtures/programmatic/schedule/core.js
+++ b/test/fixtures/programmatic/schedule/core.js
@@ -16,4 +16,10 @@ function scheduleExtended(event, context, callback) {
   return callback(null, event);
 }
 
-module.exports = { scheduleMinimal, scheduleExtended };
+function scheduleExtendedArray(event, context, callback) {
+  const functionName = 'scheduleExtendedArray';
+  log(functionName, JSON.stringify(event));
+  return callback(null, event);
+}
+
+module.exports = { scheduleMinimal, scheduleExtended, scheduleExtendedArray };
diff --git a/test/fixtures/programmatic/schedule/serverless.yml b/test/fixtures/programmatic/schedule/serverless.yml
index d405b9f7d11..9f8ce98fbd8 100644
--- a/test/fixtures/programmatic/schedule/serverless.yml
+++ b/test/fixtures/programmatic/schedule/serverless.yml
@@ -21,3 +21,13 @@ functions:
             inputPathsMap:
               eventTime: '$.time'
             inputTemplate: '{"time": <eventTime>, "name": "transformedInput"}'
+  scheduleExtendedArray:
+    handler: core.scheduleExtendedArray
+    events:
+      - schedule:
+          rate:
+            - cron(* * * * ? *)
+          inputTransformer:
+            inputPathsMap:
+              eventTime: '$.time'
+            inputTemplate: '{"time": <eventTime>, "name": "transformedInput"}'
diff --git a/test/integrationBasic.test.js b/test/integration-basic.test.js
similarity index 97%
rename from test/integrationBasic.test.js
rename to test/integration-basic.test.js
index b9ada1425cf..62989207aa7 100644
--- a/test/integrationBasic.test.js
+++ b/test/integration-basic.test.js
@@ -12,7 +12,7 @@ const hasFailed = require('@serverless/test/has-failed');
 const awsRequest = require('@serverless/test/aws-request');
 const { getTmpDirPath } = require('./utils/fs');
 
-const serverlessExec = require('./serverlessBinary');
+const serverlessExec = require('./serverless-binary');
 
 describe('Service Lifecyle Integration Test', function () {
   this.timeout(1000 * 60 * 10); // Involves time-taking deploys
@@ -111,7 +111,7 @@ describe('Service Lifecyle Integration Test', function () {
       spawnOptions
     );
     const output = stripAnsi(listDeploys.toString());
-    const match = output.match(new RegExp('Datetime: (.+)'));
+    const match = output.match(new RegExp('Timestamp: (.+)'));
     if (match) {
       timestamp = match[1];
     }
diff --git a/test/integrationPackage/cloudformation.tests.js b/test/integration-package/cloudformation.tests.js
similarity index 97%
rename from test/integrationPackage/cloudformation.tests.js
rename to test/integration-package/cloudformation.tests.js
index 7726636d577..164eaa478f8 100644
--- a/test/integrationPackage/cloudformation.tests.js
+++ b/test/integration-package/cloudformation.tests.js
@@ -4,8 +4,8 @@ const fs = require('fs');
 const path = require('path');
 const { expect } = require('chai');
 const fse = require('fs-extra');
-const { execSync } = require('../utils/childProcess');
-const serverlessExec = require('../serverlessBinary');
+const { execSync } = require('../utils/child-process');
+const serverlessExec = require('../serverless-binary');
 const { getTmpDirPath } = require('../utils/fs');
 
 const fixturePaths = {
diff --git a/test/integrationPackage/fixtures/artifact/artifact.zip b/test/integration-package/fixtures/artifact/artifact.zip
similarity index 100%
rename from test/integrationPackage/fixtures/artifact/artifact.zip
rename to test/integration-package/fixtures/artifact/artifact.zip
diff --git a/test/integrationPackage/fixtures/artifact/handler.js b/test/integration-package/fixtures/artifact/handler.js
similarity index 100%
rename from test/integrationPackage/fixtures/artifact/handler.js
rename to test/integration-package/fixtures/artifact/handler.js
diff --git a/test/integrationPackage/fixtures/artifact/serverless.yml b/test/integration-package/fixtures/artifact/serverless.yml
similarity index 84%
rename from test/integrationPackage/fixtures/artifact/serverless.yml
rename to test/integration-package/fixtures/artifact/serverless.yml
index afdb2ec60a0..57c66f926e8 100644
--- a/test/integrationPackage/fixtures/artifact/serverless.yml
+++ b/test/integration-package/fixtures/artifact/serverless.yml
@@ -5,7 +5,6 @@ configValidationMode: error
 provider:
   name: aws
   runtime: nodejs12.x
-  lambdaHashingVersion: 20201221
 
 functions:
   hello:
diff --git a/test/integrationPackage/fixtures/individually-function/handler.js b/test/integration-package/fixtures/individually-function/handler.js
similarity index 100%
rename from test/integrationPackage/fixtures/individually-function/handler.js
rename to test/integration-package/fixtures/individually-function/handler.js
diff --git a/test/integrationPackage/fixtures/individually-function/handler2.js b/test/integration-package/fixtures/individually-function/handler2.js
similarity index 100%
rename from test/integrationPackage/fixtures/individually-function/handler2.js
rename to test/integration-package/fixtures/individually-function/handler2.js
diff --git a/test/integrationPackage/fixtures/individually-function/serverless.yml b/test/integration-package/fixtures/individually-function/serverless.yml
similarity index 68%
rename from test/integrationPackage/fixtures/individually-function/serverless.yml
rename to test/integration-package/fixtures/individually-function/serverless.yml
index aba9cf5d283..a32f27072a3 100644
--- a/test/integrationPackage/fixtures/individually-function/serverless.yml
+++ b/test/integration-package/fixtures/individually-function/serverless.yml
@@ -5,22 +5,19 @@ configValidationMode: error
 provider:
   name: aws
   runtime: nodejs12.x
-  lambdaHashingVersion: 20201221
 
 functions:
   hello:
     handler: handler.hello
     package:
       individually: true
-      include:
+      patterns:
         - handler.js
-      exclude:
-        - handler2.js
+        - '!handler2.js'
   hello2:
     handler: handler2.hello
     package:
       individually: true
-      include:
+      patterns:
         - handler2.js
-      exclude:
-        - handler.js
+        - '!handler.js'
diff --git a/test/integrationPackage/fixtures/individually/handler.js b/test/integration-package/fixtures/individually/handler.js
similarity index 100%
rename from test/integrationPackage/fixtures/individually/handler.js
rename to test/integration-package/fixtures/individually/handler.js
diff --git a/test/integrationPackage/fixtures/individually/handler2.js b/test/integration-package/fixtures/individually/handler2.js
similarity index 100%
rename from test/integrationPackage/fixtures/individually/handler2.js
rename to test/integration-package/fixtures/individually/handler2.js
diff --git a/test/integrationPackage/fixtures/individually/serverless.yml b/test/integration-package/fixtures/individually/serverless.yml
similarity index 67%
rename from test/integrationPackage/fixtures/individually/serverless.yml
rename to test/integration-package/fixtures/individually/serverless.yml
index 68377a33170..70a1c6e4c7e 100644
--- a/test/integrationPackage/fixtures/individually/serverless.yml
+++ b/test/integration-package/fixtures/individually/serverless.yml
@@ -5,7 +5,6 @@ configValidationMode: error
 provider:
   name: aws
   runtime: nodejs12.x
-  lambdaHashingVersion: 20201221
 
 package:
   individually: true
@@ -14,14 +13,12 @@ functions:
   hello:
     handler: handler.hello
     package:
-      include:
+      patterns:
         - handler.js
-      exclude:
-        - handler2.js
+        - '!handler2.js'
   hello2:
     handler: handler2.hello
     package:
-      include:
+      patterns:
         - handler2.js
-      exclude:
-        - handler.js
+        - '!handler.js'
diff --git a/test/integrationPackage/fixtures/regular/handler.js b/test/integration-package/fixtures/regular/handler.js
similarity index 100%
rename from test/integrationPackage/fixtures/regular/handler.js
rename to test/integration-package/fixtures/regular/handler.js
diff --git a/test/integrationPackage/fixtures/regular/serverless.yml b/test/integration-package/fixtures/regular/serverless.yml
similarity index 89%
rename from test/integrationPackage/fixtures/regular/serverless.yml
rename to test/integration-package/fixtures/regular/serverless.yml
index 8e99372996b..8208d3a5829 100644
--- a/test/integrationPackage/fixtures/regular/serverless.yml
+++ b/test/integration-package/fixtures/regular/serverless.yml
@@ -5,7 +5,6 @@ configValidationMode: error
 provider:
   name: aws
   runtime: nodejs12.x
-  lambdaHashingVersion: 20201221
 
 functions:
   hello:
diff --git a/test/integrationPackage/lambda-files.tests.js b/test/integration-package/lambda-files.tests.js
similarity index 86%
rename from test/integrationPackage/lambda-files.tests.js
rename to test/integration-package/lambda-files.tests.js
index 962257fd74b..9d63898998e 100644
--- a/test/integrationPackage/lambda-files.tests.js
+++ b/test/integration-package/lambda-files.tests.js
@@ -5,7 +5,7 @@ const { expect } = require('chai');
 const fs = require('fs').promises;
 const fse = require('fs-extra');
 const spawn = require('child-process-ext/spawn');
-const serverlessExec = require('../serverlessBinary');
+const serverlessExec = require('../serverless-binary');
 const { getTmpDirPath, listZipFiles } = require('../utils/fs');
 
 const fixturePaths = {
@@ -38,8 +38,9 @@ describe('Integration test - Packaging - Lambda Files', function () {
     const nodeModules = new Set(
       zipfiles.filter((f) => f.startsWith('node_modules')).map((f) => f.split(path.sep)[1])
     );
+    nodeModules.delete('.package-lock.json');
     const nonNodeModulesFiles = zipfiles.filter((f) => !f.startsWith('node_modules'));
-    expect(nodeModules).to.deep.equal(new Set(['lodash']));
+    expect(Array.from(nodeModules)).to.deep.equal(['lodash']);
     expect(nonNodeModulesFiles).to.deep.equal(['handler.js', 'package-lock.json', 'package.json']);
   });
 
@@ -52,8 +53,9 @@ describe('Integration test - Packaging - Lambda Files', function () {
     const nodeModules = new Set(
       zipfiles.filter((f) => f.startsWith('node_modules')).map((f) => f.split(path.sep)[1])
     );
+    nodeModules.delete('.package-lock.json');
     const nonNodeModulesFiles = zipfiles.filter((f) => !f.startsWith('node_modules'));
-    expect(nodeModules).to.deep.equal(new Set([]));
+    expect(Array.from(nodeModules)).to.deep.equal([]);
     expect(nonNodeModulesFiles).to.deep.equal(['handler.js', 'package-lock.json', 'package.json']);
   });
 
@@ -62,7 +64,7 @@ describe('Integration test - Packaging - Lambda Files', function () {
     await spawn('npm', ['init', '--yes'], { cwd });
     await fs.appendFile(
       path.resolve(cwd, 'serverless.yml'),
-      '\npackage: {exclude: ["package*.json"]}\n'
+      '\npackage: {patterns: ["!package*.json"]}\n'
     );
     await spawn('npm', ['i', 'lodash'], { cwd });
     await spawn(serverlessExec, ['package'], { cwd });
@@ -70,12 +72,13 @@ describe('Integration test - Packaging - Lambda Files', function () {
     const nodeModules = new Set(
       zipfiles.filter((f) => f.startsWith('node_modules')).map((f) => f.split(path.sep)[1])
     );
+    nodeModules.delete('.package-lock.json');
     const nonNodeModulesFiles = zipfiles.filter((f) => !f.startsWith('node_modules'));
-    expect(nodeModules).to.deep.equal(new Set(['lodash']));
+    expect(Array.from(nodeModules)).to.deep.equal(['lodash']);
     expect(nonNodeModulesFiles).to.deep.equal(['handler.js']);
   });
 
-  it('handles package individually with include/excludes correctly', async () => {
+  it('handles package individually with patterns correctly', async () => {
     await fse.copy(fixturePaths.individually, cwd);
     await spawn(serverlessExec, ['package'], { cwd });
     expect(await listZipFiles(path.join(cwd, '.serverless/hello.zip'))).to.deep.equal([
@@ -86,7 +89,7 @@ describe('Integration test - Packaging - Lambda Files', function () {
     ]);
   });
 
-  it('handles package individually on function level with include/excludes correctly', async () => {
+  it('handles package individually on function level with patterns correctly', async () => {
     await fse.copy(fixturePaths.individuallyFunction, cwd);
     await spawn(serverlessExec, ['package'], { cwd });
     expect(await listZipFiles(path.join(cwd, '.serverless/hello.zip'))).to.deep.equal([
diff --git a/test/integration/apiGatewayExternal.test.js b/test/integration/aws/api-gateway-external.test.js
similarity index 91%
rename from test/integration/apiGatewayExternal.test.js
rename to test/integration/aws/api-gateway-external.test.js
index 1dffef68e42..f396df5d644 100644
--- a/test/integration/apiGatewayExternal.test.js
+++ b/test/integration/aws/api-gateway-external.test.js
@@ -3,10 +3,10 @@
 const { expect } = require('chai');
 const log = require('log').get('serverless:test');
 const awsRequest = require('@serverless/test/aws-request');
-const fixtures = require('../fixtures/programmatic');
+const fixtures = require('../../fixtures/programmatic');
 
-const { deployService, removeService, fetch } = require('../utils/integration');
-const { createRestApi, deleteRestApi, getResources } = require('../utils/apiGateway');
+const { deployService, removeService, fetch } = require('../../utils/integration');
+const { createRestApi, deleteRestApi, getResources } = require('../../utils/api-gateway');
 
 describe('AWS - API Gateway with External REST API Integration Test', function () {
   this.timeout(1000 * 60 * 10); // Involves time-taking deploys
@@ -27,7 +27,7 @@ describe('AWS - API Gateway with External REST API Integration Test', function (
   };
 
   before(async () => {
-    const serviceData = await fixtures.setup('apiGateway');
+    const serviceData = await fixtures.setup('api-gateway');
     ({ servicePath: serviceDir, updateConfig } = serviceData);
     const serviceName = serviceData.serviceConfig.service;
     const externalRestApiName = `${stage}-${serviceName}-ext-api`;
diff --git a/test/integration/apiGateway.test.js b/test/integration/aws/api-gateway.test.js
similarity index 96%
rename from test/integration/apiGateway.test.js
rename to test/integration/aws/api-gateway.test.js
index 9d1dab2e9ff..6b9d8da13a4 100644
--- a/test/integration/apiGateway.test.js
+++ b/test/integration/aws/api-gateway.test.js
@@ -3,10 +3,10 @@
 const { expect } = require('chai');
 const log = require('log').get('serverless:test');
 const awsRequest = require('@serverless/test/aws-request');
-const fixtures = require('../fixtures/programmatic');
+const fixtures = require('../../fixtures/programmatic');
 
-const { confirmCloudWatchLogs } = require('../utils/misc');
-const { deployService, removeService, fetch } = require('../utils/integration');
+const { confirmCloudWatchLogs } = require('../../utils/misc');
+const { deployService, removeService, fetch } = require('../../utils/integration');
 
 describe('AWS - API Gateway Integration Test', function () {
   this.timeout(1000 * 60 * 10); // Involves time-taking deploys
@@ -28,7 +28,7 @@ describe('AWS - API Gateway Integration Test', function () {
   };
 
   before(async () => {
-    const serviceData = await fixtures.setup('apiGatewayExtended');
+    const serviceData = await fixtures.setup('api-gateway-extended');
     ({ servicePath: serviceDir, updateConfig } = serviceData);
     serviceName = serviceData.serviceConfig.service;
     apiKey = `${serviceName}-api-key-1`;
diff --git a/test/integration/cognitoUserPool.test.js b/test/integration/aws/cognito-user-pool.test.js
similarity index 95%
rename from test/integration/cognitoUserPool.test.js
rename to test/integration/aws/cognito-user-pool.test.js
index 16dcd7bdae9..bbf98d230e0 100644
--- a/test/integration/cognitoUserPool.test.js
+++ b/test/integration/aws/cognito-user-pool.test.js
@@ -4,7 +4,7 @@ const BbPromise = require('bluebird');
 const { expect } = require('chai');
 const log = require('log').get('serverless:test');
 const hasFailed = require('@serverless/test/has-failed');
-const fixtures = require('../fixtures/programmatic');
+const fixtures = require('../../fixtures/programmatic');
 
 const {
   createUserPool,
@@ -15,9 +15,9 @@ const {
   createUserPoolClient,
   setUserPassword,
   initiateAuth,
-} = require('../utils/cognito');
-const { deployService, removeService } = require('../utils/integration');
-const { confirmCloudWatchLogs } = require('../utils/misc');
+} = require('../../utils/cognito');
+const { deployService, removeService } = require('../../utils/integration');
+const { confirmCloudWatchLogs } = require('../../utils/misc');
 
 describe('AWS - Cognito User Pool Integration Test', function () {
   this.timeout(1000 * 60 * 10); // Involves time-taking deploys
@@ -30,7 +30,7 @@ describe('AWS - Cognito User Pool Integration Test', function () {
   const stage = 'dev';
 
   before(async () => {
-    const serviceData = await fixtures.setup('cognitoUserPool');
+    const serviceData = await fixtures.setup('cognito-user-pool');
     ({ servicePath: serviceDir } = serviceData);
     const serviceName = serviceData.serviceConfig.service;
     stackName = `${serviceName}-${stage}`;
diff --git a/test/integration/aws/custom-deployment-bucket.test.js b/test/integration/aws/custom-deployment-bucket.test.js
new file mode 100644
index 00000000000..56a06213d29
--- /dev/null
+++ b/test/integration/aws/custom-deployment-bucket.test.js
@@ -0,0 +1,36 @@
+'use strict';
+
+const uuid = require('uuid');
+const { expect } = require('chai');
+const fixtures = require('../../fixtures/programmatic');
+const awsRequest = require('@serverless/test/aws-request');
+const { deployService, removeService } = require('../../utils/integration');
+const { createBucket, deleteBucket } = require('../../utils/s3');
+
+describe('Base AWS provider test', function () {
+  this.timeout(1000 * 60 * 10);
+
+  const bucketName = `serverless-test-${uuid.v4()}`;
+  let serviceDir;
+
+  before(async () => {
+    await createBucket(bucketName);
+    ({ servicePath: serviceDir } = await fixtures.setup('function', {
+      configExt: { provider: { deploymentBucket: { name: bucketName } } },
+    }));
+    await deployService(serviceDir);
+  });
+
+  it('should deploy in the configured aws bucket', async () => {
+    // we cannot deploy an empty fixture like aws so we go for a small one
+    const res = await awsRequest('S3', 'listObjects', { Bucket: bucketName });
+    expect(
+      res.Contents.filter((obj) => /compiled-cloudformation-template.json$/.test(obj.Key)).length
+    ).to.equal(1);
+  });
+
+  after(async () => {
+    await removeService(serviceDir);
+    await deleteBucket(bucketName);
+  });
+});
diff --git a/test/integration/eventBridge.test.js b/test/integration/aws/event-bridge.test.js
similarity index 95%
rename from test/integration/eventBridge.test.js
rename to test/integration/aws/event-bridge.test.js
index f24d993b7e2..e5c2f8c7a62 100644
--- a/test/integration/eventBridge.test.js
+++ b/test/integration/aws/event-bridge.test.js
@@ -2,17 +2,17 @@
 
 const { expect } = require('chai');
 const log = require('log').get('serverless:test');
-const fixtures = require('../fixtures/programmatic');
+const fixtures = require('../../fixtures/programmatic');
 
-const { confirmCloudWatchLogs } = require('../utils/misc');
+const { confirmCloudWatchLogs } = require('../../utils/misc');
 const {
   createEventBus,
   putEvents,
   deleteEventBus,
   describeEventBus,
-} = require('../utils/eventBridge');
+} = require('../../utils/event-bridge');
 
-const { deployService, removeService, getMarkers } = require('../utils/integration');
+const { deployService, removeService, getMarkers } = require('../../utils/integration');
 
 describe('AWS - Event Bridge Integration Test', () => {
   describe('Using deprecated CustomResource deployment pattern', function () {
@@ -34,7 +34,7 @@ describe('AWS - Event Bridge Integration Test', () => {
     ];
 
     before(async () => {
-      const serviceData = await fixtures.setup('eventBridge');
+      const serviceData = await fixtures.setup('event-bridge');
       ({ servicePath: serviceDir } = serviceData);
       serviceName = serviceData.serviceConfig.service;
 
@@ -50,6 +50,12 @@ describe('AWS - Event Bridge Integration Test', () => {
       arnEventBusArn = (await createEventBus(arnEventBusName)).EventBusArn;
       // update the YAML file with the arn
       await serviceData.updateConfig({
+        disabledDeprecations: ['AWS_EVENT_BRIDGE_CUSTOM_RESOURCE_LEGACY_OPT_IN'],
+        provider: {
+          eventBridge: {
+            useCloudFormation: false,
+          },
+        },
         functions: {
           eventBusDefaultArn: {
             events: [
@@ -167,7 +173,7 @@ describe('AWS - Event Bridge Integration Test', () => {
     ];
 
     before(async () => {
-      const serviceData = await fixtures.setup('eventBridge');
+      const serviceData = await fixtures.setup('event-bridge');
       ({ servicePath: serviceDir } = serviceData);
       serviceName = serviceData.serviceConfig.service;
 
@@ -182,11 +188,6 @@ describe('AWS - Event Bridge Integration Test', () => {
       // NOTE: deployment can only be done once the Event Bus is created
       arnEventBusArn = (await createEventBus(arnEventBusName)).EventBusArn;
       await serviceData.updateConfig({
-        provider: {
-          eventBridge: {
-            useCloudFormation: true,
-          },
-        },
         functions: {
           eventBusDefaultArn: {
             events: [
diff --git a/test/integration/aws/function.test.js b/test/integration/aws/function.test.js
new file mode 100644
index 00000000000..f3c10989789
--- /dev/null
+++ b/test/integration/aws/function.test.js
@@ -0,0 +1,72 @@
+'use strict';
+
+const { expect } = require('chai');
+const awsRequest = require('@serverless/test/aws-request');
+const fixtures = require('../../fixtures/programmatic');
+const { confirmCloudWatchLogs } = require('../../utils/misc');
+
+const { deployService, removeService } = require('../../utils/integration');
+
+describe('test/integration/aws/function.test.js', function () {
+  this.timeout(1000 * 60 * 20); // Involves time-taking deploys
+  let stackName;
+  let serviceDir;
+  const stage = 'dev';
+
+  before(async () => {
+    const serviceData = await fixtures.setup('function', {
+      configExt: {
+        functions: {
+          arch: {
+            handler: 'basic.handler',
+            architecture: 'arm64',
+          },
+          target: {
+            handler: 'target.handler',
+          },
+          trigger: {
+            handler: 'trigger.handler',
+            destinations: { onSuccess: 'target' },
+          },
+        },
+      },
+    });
+    ({ servicePath: serviceDir } = serviceData);
+    const serviceName = serviceData.serviceConfig.service;
+    stackName = `${serviceName}-${stage}`;
+    await deployService(serviceDir);
+  });
+
+  after(async () => {
+    if (!serviceDir) return;
+    await removeService(serviceDir);
+  });
+
+  it('should invoke destination target on async invocation', async () => {
+    const events = await confirmCloudWatchLogs(
+      `/aws/lambda/${stackName}-target`,
+      async () => {
+        await awsRequest('Lambda', 'invoke', {
+          FunctionName: `${stackName}-trigger`,
+          InvocationType: 'Event',
+        });
+      },
+      { checkIsComplete: (soFarEvents) => soFarEvents.length }
+    );
+    expect(events.length > 0).to.equal(true);
+  });
+
+  it('should run lambda in `arm64` architecture', async () => {
+    const events = await confirmCloudWatchLogs(
+      `/aws/lambda/${stackName}-arch`,
+      async () => {
+        await awsRequest('Lambda', 'invoke', {
+          FunctionName: `${stackName}-arch`,
+          InvocationType: 'Event',
+        });
+      },
+      { checkIsComplete: (soFarEvents) => soFarEvents.length }
+    );
+    expect(events.length > 0).to.equal(true);
+  });
+});
diff --git a/test/integration/httpApi.test.js b/test/integration/aws/http-api.test.js
similarity index 95%
rename from test/integration/httpApi.test.js
rename to test/integration/aws/http-api.test.js
index 770f1f8a7e9..7279ce9ff80 100644
--- a/test/integration/httpApi.test.js
+++ b/test/integration/aws/http-api.test.js
@@ -3,10 +3,10 @@
 const { expect } = require('chai');
 const log = require('log').get('serverless:test');
 const awsRequest = require('@serverless/test/aws-request');
-const fixtures = require('../fixtures/programmatic');
-const { confirmCloudWatchLogs } = require('../utils/misc');
+const fixtures = require('../../fixtures/programmatic');
+const { confirmCloudWatchLogs } = require('../../utils/misc');
 
-const { deployService, removeService, fetch } = require('../utils/integration');
+const { deployService, removeService, fetch } = require('../../utils/integration');
 
 describe('HTTP API Integration Test', function () {
   this.timeout(1000 * 60 * 20); // Involves time-taking deploys
@@ -55,7 +55,7 @@ describe('HTTP API Integration Test', function () {
         ),
       ]);
 
-      const serviceData = await fixtures.setup('httpApi', {
+      const serviceData = await fixtures.setup('http-api', {
         configExt: {
           provider: {
             httpApi: {
@@ -246,7 +246,7 @@ describe('HTTP API Integration Test', function () {
 
   describe('Catch-all endpoints', () => {
     before(async () => {
-      const serviceData = await fixtures.setup('httpApiCatchAll');
+      const serviceData = await fixtures.setup('http-api-catch-all');
       ({ servicePath: serviceDir } = serviceData);
       const serviceName = serviceData.serviceConfig.service;
       stackName = `${serviceName}-${stage}`;
@@ -255,8 +255,6 @@ describe('HTTP API Integration Test', function () {
     });
 
     after(async function () {
-      // Added temporarily to inspect random fails
-      // TODO: Remove once properly diagnosed
       if (this.test.parent.tests.some((test) => test.state === 'failed')) return;
       log.notice('Removing service...');
       await removeService(serviceDir);
@@ -292,7 +290,7 @@ describe('HTTP API Integration Test', function () {
     let serviceName;
 
     before(async () => {
-      const exportServiceData = await fixtures.setup('httpApiExport');
+      const exportServiceData = await fixtures.setup('http-api-export');
       ({ servicePath: exportServicePath } = exportServiceData);
       const exportServiceName = exportServiceData.serviceConfig.service;
       await deployService(exportServicePath);
@@ -303,7 +301,7 @@ describe('HTTP API Integration Test', function () {
       ).Stacks[0].Outputs[0].OutputValue;
       endpoint = (await awsRequest('ApiGatewayV2', 'getApi', { ApiId: httpApiId })).ApiEndpoint;
 
-      const serviceData = await fixtures.setup('httpApi', {
+      const serviceData = await fixtures.setup('http-api', {
         configExt: {
           provider: { httpApi: { id: httpApiId } },
         },
diff --git a/test/integration/aws/infra-dependent/active-mq.test.js b/test/integration/aws/infra-dependent/active-mq.test.js
new file mode 100644
index 00000000000..6a2723f64f1
--- /dev/null
+++ b/test/integration/aws/infra-dependent/active-mq.test.js
@@ -0,0 +1,112 @@
+'use strict';
+
+const { expect } = require('chai');
+const log = require('log').get('serverless:test');
+const fixtures = require('../../../fixtures/programmatic');
+const { confirmCloudWatchLogs } = require('../../../utils/misc');
+const {
+  isDependencyStackAvailable,
+  getDependencyStackOutputMap,
+  SHARED_INFRA_TESTS_ACTIVE_MQ_CREDENTIALS_NAME,
+} = require('../../../utils/cloudformation');
+
+const awsRequest = require('@serverless/test/aws-request');
+const crypto = require('crypto');
+const { deployService, removeService } = require('../../../utils/integration');
+
+describe.skip('AWS - Active MQ Integration Test', function () {
+  this.timeout(1000 * 60 * 100); // Involves time-taking deploys
+  let stackName;
+  let serviceDir;
+  const stage = 'dev';
+
+  const queueName = `testqueue${crypto.randomBytes(8).toString('hex')}`;
+
+  before(async () => {
+    const isDepsStackAvailable = await isDependencyStackAvailable();
+    if (!isDepsStackAvailable) {
+      throw new Error('CloudFormation stack with integration test dependencies not found.');
+    }
+
+    const outputMap = await getDependencyStackOutputMap();
+
+    log.notice('Getting Active MQ Credentials ARN');
+    const getSecretValueResponse = await awsRequest('SecretsManager', 'getSecretValue', {
+      SecretId: SHARED_INFRA_TESTS_ACTIVE_MQ_CREDENTIALS_NAME,
+    });
+    const { username: mqUsername, password: mqPassword } = JSON.parse(
+      getSecretValueResponse.SecretString
+    );
+
+    const describeBrokerResponse = await awsRequest('MQ', 'describeBroker', {
+      BrokerId: outputMap.get('ActiveMQBrokerId'),
+    });
+    const stompEndpoint = describeBrokerResponse.BrokerInstances[0].Endpoints.find((endpoint) =>
+      endpoint.startsWith('stomp')
+    );
+
+    const serviceData = await fixtures.setup('function-active-mq', {
+      configExt: {
+        functions: {
+          producer: {
+            vpc: {
+              subnetIds: [outputMap.get('PrivateSubnetA')],
+              securityGroupIds: [outputMap.get('ActiveMQSecurityGroup')],
+            },
+            environment: {
+              QUEUE_NAME: queueName,
+              MQ_PASSWORD: mqPassword,
+              MQ_USERNAME: mqUsername,
+              MQ_HOST: stompEndpoint.split(':')[1].slice(2),
+            },
+          },
+          consumer: {
+            events: [
+              {
+                activemq: {
+                  arn: outputMap.get('ActiveMQBrokerArn'),
+                  queue: queueName,
+                  basicAuthArn: getSecretValueResponse.ARN,
+                },
+              },
+            ],
+          },
+        },
+      },
+    });
+
+    ({ servicePath: serviceDir } = serviceData);
+
+    const serviceName = serviceData.serviceConfig.service;
+    stackName = `${serviceName}-${stage}`;
+    await deployService(serviceDir);
+  });
+
+  after(async () => {
+    if (serviceDir) {
+      await removeService(serviceDir);
+    }
+  });
+
+  it('correctly processes messages from Active MQ queue', async () => {
+    const functionName = 'consumer';
+    const message = 'Hello from Apache MQ Integration test!';
+
+    const events = await confirmCloudWatchLogs(
+      `/aws/lambda/${stackName}-${functionName}`,
+      async () =>
+        await awsRequest('Lambda', 'invoke', {
+          FunctionName: `${stackName}-producer`,
+          InvocationType: 'RequestResponse',
+        }),
+      {
+        checkIsComplete: (soFarEvents) =>
+          soFarEvents.reduce((data, event) => data + event.message, '').includes(message),
+      }
+    );
+
+    const logs = events.reduce((data, event) => data + event.message, '');
+    expect(logs).to.include(functionName);
+    expect(logs).to.include(message);
+  });
+});
diff --git a/test/integration/infra-dependent/fileSystemConfig.test.js b/test/integration/aws/infra-dependent/file-system-config.test.js
similarity index 91%
rename from test/integration/infra-dependent/fileSystemConfig.test.js
rename to test/integration/aws/infra-dependent/file-system-config.test.js
index 0a28b3aef8e..dc17dd82302 100644
--- a/test/integration/infra-dependent/fileSystemConfig.test.js
+++ b/test/integration/aws/infra-dependent/file-system-config.test.js
@@ -2,15 +2,15 @@
 
 const { expect } = require('chai');
 const log = require('log').get('serverless:test');
-const fixtures = require('../../fixtures/programmatic');
+const fixtures = require('../../../fixtures/programmatic');
 
 const awsRequest = require('@serverless/test/aws-request');
 const crypto = require('crypto');
-const { deployService, removeService } = require('../../utils/integration');
+const { deployService, removeService } = require('../../../utils/integration');
 const {
   isDependencyStackAvailable,
   getDependencyStackOutputMap,
-} = require('../../utils/cloudformation');
+} = require('../../../utils/cloudformation');
 
 const EFS_MAX_PROPAGATION_TIME = 1000 * 60 * 5;
 
@@ -41,7 +41,7 @@ describe('AWS - FileSystemConfig Integration Test', function () {
       arn: outputMap.get('EFSAccessPointARN'),
     };
 
-    const serviceData = await fixtures.setup('functionEfs', {
+    const serviceData = await fixtures.setup('function-efs', {
       configExt: {
         provider: {
           vpc: {
diff --git a/test/integration/infra-dependent/msk.test.js b/test/integration/aws/infra-dependent/msk.test.js
similarity index 82%
rename from test/integration/infra-dependent/msk.test.js
rename to test/integration/aws/infra-dependent/msk.test.js
index e49549202fd..399ad42719a 100644
--- a/test/integration/infra-dependent/msk.test.js
+++ b/test/integration/aws/infra-dependent/msk.test.js
@@ -2,16 +2,16 @@
 
 const { expect } = require('chai');
 const log = require('log').get('serverless:test');
-const fixtures = require('../../fixtures/programmatic');
-const { confirmCloudWatchLogs } = require('../../utils/misc');
+const fixtures = require('../../../fixtures/programmatic');
+const { confirmCloudWatchLogs } = require('../../../utils/misc');
 const {
   isDependencyStackAvailable,
   getDependencyStackOutputMap,
-} = require('../../utils/cloudformation');
+} = require('../../../utils/cloudformation');
 
 const awsRequest = require('@serverless/test/aws-request');
 const crypto = require('crypto');
-const { deployService, removeService } = require('../../utils/integration');
+const { deployService, removeService } = require('../../../utils/integration');
 
 describe('AWS - MSK Integration Test', function () {
   this.timeout(1000 * 60 * 100); // Involves time-taking deploys
@@ -35,7 +35,7 @@ describe('AWS - MSK Integration Test', function () {
     });
     const brokerUrls = getBootstrapBrokersResponse.BootstrapBrokerStringTls;
 
-    const serviceData = await fixtures.setup('functionMsk', {
+    const serviceData = await fixtures.setup('function-msk', {
       configExt: {
         functions: {
           producer: {
@@ -54,6 +54,8 @@ describe('AWS - MSK Integration Test', function () {
                 msk: {
                   arn: outputMap.get('MSKCluster'),
                   topic: topicName,
+                  batchSize: 100,
+                  maximumBatchingWindow: 3,
                 },
               },
             ],
@@ -86,7 +88,10 @@ describe('AWS - MSK Integration Test', function () {
           FunctionName: `${stackName}-producer`,
           InvocationType: 'RequestResponse',
         }),
-      { timeout: 120 * 1000 }
+      {
+        checkIsComplete: (soFarEvents) =>
+          soFarEvents.reduce((data, event) => data + event.message, '').includes(message),
+      }
     );
 
     const logs = events.reduce((data, event) => data + event.message, '');
diff --git a/test/integration/aws/infra-dependent/rabbit-mq.test.js b/test/integration/aws/infra-dependent/rabbit-mq.test.js
new file mode 100644
index 00000000000..af84cc2f1ef
--- /dev/null
+++ b/test/integration/aws/infra-dependent/rabbit-mq.test.js
@@ -0,0 +1,116 @@
+'use strict';
+
+const { expect } = require('chai');
+const log = require('log').get('serverless:test');
+const fixtures = require('../../../fixtures/programmatic');
+const { confirmCloudWatchLogs } = require('../../../utils/misc');
+const {
+  isDependencyStackAvailable,
+  getDependencyStackOutputMap,
+  SHARED_INFRA_TESTS_RABBITMQ_CREDENTIALS_NAME,
+} = require('../../../utils/cloudformation');
+
+const awsRequest = require('@serverless/test/aws-request');
+const crypto = require('crypto');
+const { deployService, removeService } = require('../../../utils/integration');
+
+describe.skip('AWS - RabbitMQ Integration Test', function () {
+  this.timeout(1000 * 60 * 100); // Involves time-taking deploys
+  let stackName;
+  let serviceDir;
+  const stage = 'dev';
+
+  const queueName = `testqueue${crypto.randomBytes(8).toString('hex')}`;
+
+  before(async () => {
+    const isDepsStackAvailable = await isDependencyStackAvailable();
+    if (!isDepsStackAvailable) {
+      throw new Error('CloudFormation stack with integration test dependencies not found.');
+    }
+
+    const outputMap = await getDependencyStackOutputMap();
+
+    log.notice('Getting RabbitMQ Credentials ARN');
+    const getSecretValueResponse = await awsRequest('SecretsManager', 'getSecretValue', {
+      SecretId: SHARED_INFRA_TESTS_RABBITMQ_CREDENTIALS_NAME,
+    });
+    const { username: mqUsername, password: mqPassword } = JSON.parse(
+      getSecretValueResponse.SecretString
+    );
+
+    const describeBrokerResponse = await awsRequest('MQ', 'describeBroker', {
+      BrokerId: outputMap.get('RabbitMQBrokerId'),
+    });
+    const amqpEndpoint = describeBrokerResponse.BrokerInstances[0].Endpoints.find((endpoint) =>
+      endpoint.startsWith('amqp')
+    );
+
+    const serviceData = await fixtures.setup('function-rabbit-mq', {
+      configExt: {
+        functions: {
+          producer: {
+            vpc: {
+              subnetIds: [outputMap.get('PrivateSubnetA')],
+              securityGroupIds: [outputMap.get('RabbitMQSecurityGroup')],
+            },
+            environment: {
+              QUEUE_NAME: queueName,
+              RABBITMQ_PASSWORD: mqPassword,
+              RABBITMQ_USERNAME: mqUsername,
+              RABBITMQ_HOST: amqpEndpoint.split(':')[1].slice(2),
+            },
+          },
+          consumer: {
+            vpc: {
+              subnetIds: [outputMap.get('PrivateSubnetA')],
+              securityGroupIds: [outputMap.get('RabbitMQSecurityGroup')],
+            },
+            events: [
+              {
+                rabbitmq: {
+                  arn: outputMap.get('RabbitMQBrokerArn'),
+                  queue: queueName,
+                  basicAuthArn: getSecretValueResponse.ARN,
+                },
+              },
+            ],
+          },
+        },
+      },
+    });
+
+    ({ servicePath: serviceDir } = serviceData);
+
+    const serviceName = serviceData.serviceConfig.service;
+    stackName = `${serviceName}-${stage}`;
+    await deployService(serviceDir);
+  });
+
+  after(async () => {
+    if (serviceDir) {
+      await removeService(serviceDir);
+    }
+  });
+
+  it('correctly processes messages from RabbitMQ queue', async () => {
+    const functionName = 'consumer';
+    const message = 'Hello from RabbitMQ Integration test!';
+
+    const events = await confirmCloudWatchLogs(
+      `/aws/lambda/${stackName}-${functionName}`,
+      async () =>
+        await awsRequest('Lambda', 'invoke', {
+          FunctionName: `${stackName}-producer`,
+          InvocationType: 'RequestResponse',
+        }),
+      {
+        checkIsComplete: (soFarEvents) =>
+          soFarEvents.reduce((data, event) => data + event.message, '').includes(message),
+      }
+    );
+
+    const logs = events.reduce((data, event) => data + event.message, '');
+    expect(logs).to.include(functionName);
+    expect(logs).to.include(message);
+  });
+});
diff --git a/test/integration/iotFleetProvisioning.test.js b/test/integration/aws/iot-fleet-provisioning.test.js
similarity index 54%
rename from test/integration/iotFleetProvisioning.test.js
rename to test/integration/aws/iot-fleet-provisioning.test.js
index d78fd46d401..333927a355c 100644
--- a/test/integration/iotFleetProvisioning.test.js
+++ b/test/integration/aws/iot-fleet-provisioning.test.js
@@ -1,12 +1,13 @@
 'use strict';
 
 const awsRequest = require('@serverless/test/aws-request');
+const hasFailed = require('@serverless/test/has-failed');
 const { expect } = require('chai');
-const fixtures = require('../fixtures/programmatic');
-const { deployService, removeService } = require('../utils/integration');
-const { resolveIotEndpoint } = require('../utils/iot');
+const fixtures = require('../../fixtures/programmatic');
+const { deployService, removeService } = require('../../utils/integration');
+const { resolveIotEndpoint } = require('../../utils/iot');
 
-describe('test/integration/iotFleetProvisioning.test.js', function () {
+describe('test/integration/aws/iotFleetProvisioning.test.js', function () {
   this.timeout(1000 * 60 * 100); // Involves time-taking deploys
   const thingName = 'IotDevice';
   const stage = 'dev';
@@ -29,53 +30,55 @@ describe('test/integration/iotFleetProvisioning.test.js', function () {
 
   before(async () => {
     let serviceConfig;
-    ({ serviceConfig, servicePath: serviceDir } = await fixtures.setup('iotFleetProvisioning'));
+    ({ serviceConfig, servicePath: serviceDir } = await fixtures.setup('iot-fleet-provisioning'));
     const serviceName = serviceConfig.service;
     stackName = `${serviceName}-${stage}`;
     await deployService(serviceDir);
     isDeployed = true;
   });
 
-  after(async () => {
+  after(async function () {
     if (!isDeployed) return;
-    const [
-      {
-        certificateDescription: { certificateArn },
-      },
-      policyName,
-    ] = await Promise.all([
-      awsRequest('Iot', 'describeCertificate', {
-        certificateId,
-      }),
-      resolveIoTPolicyName(),
-    ]);
-    await Promise.all([
-      awsRequest('Iot', 'detachThingPrincipal', {
-        thingName,
-        principal: certificateArn,
-      }),
-      awsRequest('Iot', 'detachPolicy', {
+    if (hasFailed(this.test.parent)) return;
+    if (certificateId) {
+      const [
+        {
+          certificateDescription: { certificateArn },
+        },
         policyName,
-        target: certificateArn,
-      }),
-      awsRequest('Iot', 'updateCertificate', {
-        certificateId,
-        newStatus: 'INACTIVE',
-      }),
-    ]);
-    await Promise.all([
-      awsRequest('Iot', 'deleteThing', {
-        thingName,
-      }),
-      awsRequest('Iot', 'deleteCertificate', {
-        certificateId,
-      }),
-    ]);
+      ] = await Promise.all([
+        awsRequest('Iot', 'describeCertificate', {
+          certificateId,
+        }),
+        resolveIoTPolicyName(),
+      ]);
+      await Promise.all([
+        awsRequest('Iot', 'detachThingPrincipal', {
+          thingName,
+          principal: certificateArn,
+        }),
+        awsRequest('Iot', 'detachPolicy', {
+          policyName,
+          target: certificateArn,
+        }),
+        awsRequest('Iot', 'updateCertificate', {
+          certificateId,
+          newStatus: 'INACTIVE',
+        }),
+      ]);
+      await Promise.all([
+        awsRequest('Iot', 'deleteThing', {
+          thingName,
+        }),
+        awsRequest('Iot', 'deleteCertificate', {
+          certificateId,
+        }),
+      ]);
+    }
     await removeService(serviceDir);
   });
 
   it('setup a new IoT Thing with the provisioning template', async () => {
-    let provisionnedThingName;
     const [{ certificatePem, keyPair }, iotEndpoint] = await Promise.all([
       awsRequest('Iot', 'createProvisioningClaim', {
         templateName: await resolveTemplateName(),
@@ -92,7 +95,11 @@ describe('test/integration/iotFleetProvisioning.test.js', function () {
         privateKey: keyPair.PrivateKey,
       }),
     });
-    ({ thingName: provisionnedThingName, certificateId } = JSON.parse(Payload));
+
+    const payload = JSON.parse(Payload);
+    ({ certificateId } = payload);
+    const { thingName: provisionnedThingName, errorMessage } = payload;
+    if (errorMessage) throw new Error(`Invocation errored with: ${errorMessage}`);
 
     expect(provisionnedThingName).to.equal(thingName);
   });
diff --git a/test/integration/iot.test.js b/test/integration/aws/iot.test.js
similarity index 83%
rename from test/integration/iot.test.js
rename to test/integration/aws/iot.test.js
index 7b07b8ad6ca..3eab6fb592f 100644
--- a/test/integration/iot.test.js
+++ b/test/integration/aws/iot.test.js
@@ -1,11 +1,11 @@
 'use strict';
 
 const { expect } = require('chai');
-const fixtures = require('../fixtures/programmatic');
+const fixtures = require('../../fixtures/programmatic');
 
-const { publishIotData } = require('../utils/iot');
-const { confirmCloudWatchLogs } = require('../utils/misc');
-const { deployService, removeService } = require('../utils/integration');
+const { publishIotData } = require('../../utils/iot');
+const { confirmCloudWatchLogs } = require('../../utils/misc');
+const { deployService, removeService } = require('../../utils/integration');
 
 describe('AWS - IoT Integration Test', function () {
   this.timeout(1000 * 60 * 100); // Involves time-taking deploys
diff --git a/test/integration/provisionedConcurrency.test.js b/test/integration/aws/provisioned-concurrency.test.js
similarity index 85%
rename from test/integration/provisionedConcurrency.test.js
rename to test/integration/aws/provisioned-concurrency.test.js
index e7ad8e04b4e..c5d35f3857a 100644
--- a/test/integration/provisionedConcurrency.test.js
+++ b/test/integration/aws/provisioned-concurrency.test.js
@@ -2,12 +2,16 @@
 
 const { expect } = require('chai');
 const log = require('log').get('serverless:test');
-const fixtures = require('../fixtures/programmatic');
+const fixtures = require('../../fixtures/programmatic');
 
-const { createKinesisStream, deleteKinesisStream, putKinesisRecord } = require('../utils/kinesis');
-const { createSqsQueue, deleteSqsQueue, sendSqsMessage } = require('../utils/sqs');
-const { confirmCloudWatchLogs } = require('../utils/misc');
-const { deployService, removeService } = require('../utils/integration');
+const {
+  createKinesisStream,
+  deleteKinesisStream,
+  putKinesisRecord,
+} = require('../../utils/kinesis');
+const { createSqsQueue, deleteSqsQueue, sendSqsMessage } = require('../../utils/sqs');
+const { confirmCloudWatchLogs } = require('../../utils/misc');
+const { deployService, removeService } = require('../../utils/integration');
 
 describe('AWS - Provisioned Concurrency Integration Test', function () {
   this.timeout(1000 * 60 * 100); // Involves time-taking deploys
@@ -18,7 +22,7 @@ describe('AWS - Provisioned Concurrency Integration Test', function () {
   const stage = 'dev';
 
   before(async () => {
-    const serviceData = await fixtures.setup('provisionedConcurrency');
+    const serviceData = await fixtures.setup('provisioned-concurrency');
     ({ servicePath: serviceDir } = serviceData);
     const serviceName = serviceData.serviceConfig.service;
 
diff --git a/test/integration/s3.test.js b/test/integration/aws/s3.test.js
similarity index 60%
rename from test/integration/s3.test.js
rename to test/integration/aws/s3.test.js
index 51d4573b969..c023fe64bc2 100644
--- a/test/integration/s3.test.js
+++ b/test/integration/aws/s3.test.js
@@ -3,11 +3,11 @@
 const BbPromise = require('bluebird');
 const { expect } = require('chai');
 const log = require('log').get('serverless:test');
-const fixtures = require('../fixtures/programmatic');
+const fixtures = require('../../fixtures/programmatic');
 
-const { createBucket, createAndRemoveInBucket, deleteBucket } = require('../utils/s3');
-const { deployService, removeService } = require('../utils/integration');
-const { confirmCloudWatchLogs } = require('../utils/misc');
+const { createBucket, createAndRemoveInBucket, deleteBucket } = require('../../utils/s3');
+const { deployService, removeService } = require('../../utils/integration');
+const { confirmCloudWatchLogs } = require('../../utils/misc');
 
 describe('AWS - S3 Integration Test', function () {
   this.timeout(1000 * 60 * 10); // Involves time-taking deploys
@@ -54,8 +54,15 @@ describe('AWS - S3 Integration Test', function () {
       const functionName = 'minimal';
       const expectedMessage = `Hello from S3! - (${functionName})`;
 
-      return confirmCloudWatchLogs(`/aws/lambda/${stackName}-${functionName}`, () =>
-        createAndRemoveInBucket(bucketMinimalSetup)
+      return confirmCloudWatchLogs(
+        `/aws/lambda/${stackName}-${functionName}`,
+        () => createAndRemoveInBucket(bucketMinimalSetup),
+        {
+          checkIsComplete: (soFarEvents) => {
+            const logs = soFarEvents.reduce((data, event) => data + event.message, '');
+            return logs.includes('ObjectCreated:Put');
+          },
+        }
       ).then((events) => {
         const logs = events.reduce((data, event) => data + event.message, '');
         expect(/aws:s3/g.test(logs)).to.equal(true);
@@ -70,8 +77,15 @@ describe('AWS - S3 Integration Test', function () {
       const functionName = 'extended';
       const expectedMessage = `Hello from S3! - (${functionName})`;
 
-      return confirmCloudWatchLogs(`/aws/lambda/${stackName}-${functionName}`, () =>
-        createAndRemoveInBucket(bucketExtendedSetup, { prefix: 'photos/', suffix: '.jpg' })
+      return confirmCloudWatchLogs(
+        `/aws/lambda/${stackName}-${functionName}`,
+        () => createAndRemoveInBucket(bucketExtendedSetup, { prefix: 'photos/', suffix: '.jpg' }),
+        {
+          checkIsComplete: (soFarEvents) => {
+            const logs = soFarEvents.reduce((data, event) => data + event.message, '');
+            return logs.includes('ObjectRemoved:Delete');
+          },
+        }
       ).then((events) => {
         const logs = events.reduce((data, event) => data + event.message, '');
         expect(/aws:s3/g.test(logs)).to.equal(true);
@@ -86,8 +100,15 @@ describe('AWS - S3 Integration Test', function () {
       const functionName = 'custom';
       const expectedMessage = `Hello from S3! - (${functionName})`;
 
-      return confirmCloudWatchLogs(`/aws/lambda/${stackName}-${functionName}`, () =>
-        createAndRemoveInBucket(bucketCustomName)
+      return confirmCloudWatchLogs(
+        `/aws/lambda/${stackName}-${functionName}`,
+        () => createAndRemoveInBucket(bucketCustomName),
+        {
+          checkIsComplete: (soFarEvents) => {
+            const logs = soFarEvents.reduce((data, event) => data + event.message, '');
+            return logs.includes('ObjectCreated:Put');
+          },
+        }
       ).then((events) => {
         const logs = events.reduce((data, event) => data + event.message, '');
         expect(/aws:s3/g.test(logs)).to.equal(true);
@@ -103,11 +124,19 @@ describe('AWS - S3 Integration Test', function () {
         const functionName = 'existing';
         const expectedMessage = `Hello from S3! - (${functionName})`;
 
-        return confirmCloudWatchLogs(`/aws/lambda/${stackName}-${functionName}`, () =>
-          createAndRemoveInBucket(bucketExistingSimpleSetup, {
-            prefix: 'Files/',
-            suffix: '.TXT',
-          })
+        return confirmCloudWatchLogs(
+          `/aws/lambda/${stackName}-${functionName}`,
+          () =>
+            createAndRemoveInBucket(bucketExistingSimpleSetup, {
+              prefix: 'Files/',
+              suffix: '.TXT',
+            }),
+          {
+            checkIsComplete: (soFarEvents) => {
+              const logs = soFarEvents.reduce((data, event) => data + event.message, '');
+              return logs.includes('ObjectCreated:Put');
+            },
+          }
         ).then((events) => {
           const logs = events.reduce((data, event) => data + event.message, '');
           expect(/aws:s3/g.test(logs)).to.equal(true);
@@ -122,11 +151,19 @@ describe('AWS - S3 Integration Test', function () {
         const functionName = 'existingCreated';
         const expectedMessage = `Hello from S3! - (${functionName})`;
 
-        return confirmCloudWatchLogs(`/aws/lambda/${stackName}-${functionName}`, () =>
-          createAndRemoveInBucket(bucketExistingComplexSetup, {
-            prefix: 'photos',
-            suffix: '.jpg',
-          })
+        return confirmCloudWatchLogs(
+          `/aws/lambda/${stackName}-${functionName}`,
+          () =>
+            createAndRemoveInBucket(bucketExistingComplexSetup, {
+              prefix: 'photos',
+              suffix: '.jpg',
+            }),
+          {
+            checkIsComplete: (soFarEvents) => {
+              const logs = soFarEvents.reduce((data, event) => data + event.message, '');
+              return logs.includes('ObjectCreated:Put');
+            },
+          }
         ).then((events) => {
           const logs = events.reduce((data, event) => data + event.message, '');
           expect(/aws:s3/g.test(logs)).to.equal(true);
@@ -138,11 +175,19 @@ describe('AWS - S3 Integration Test', function () {
         const functionName = 'existingRemoved';
         const expectedMessage = `Hello from S3! - (${functionName})`;
 
-        return confirmCloudWatchLogs(`/aws/lambda/${stackName}-${functionName}`, () =>
-          createAndRemoveInBucket(bucketExistingComplexSetup, {
-            prefix: 'photos',
-            suffix: '.jpg',
-          })
+        return confirmCloudWatchLogs(
+          `/aws/lambda/${stackName}-${functionName}`,
+          () =>
+            createAndRemoveInBucket(bucketExistingComplexSetup, {
+              prefix: 'photos',
+              suffix: '.jpg',
+            }),
+          {
+            checkIsComplete: (soFarEvents) => {
+              const logs = soFarEvents.reduce((data, event) => data + event.message, '');
+              return logs.includes('ObjectRemoved:Delete');
+            },
+          }
         ).then((events) => {
           const logs = events.reduce((data, event) => data + event.message, '');
           expect(/aws:s3/g.test(logs)).to.equal(true);
@@ -154,11 +199,19 @@ describe('AWS - S3 Integration Test', function () {
         const functionName = 'existingCreated';
         const expectedMessage = `Hello from S3! - (${functionName})`;
 
-        return confirmCloudWatchLogs(`/aws/lambda/${stackName}-${functionName}`, () =>
-          createAndRemoveInBucket(bucketExistingComplexSetup, {
-            prefix: 'photos',
-            suffix: '.png',
-          })
+        return confirmCloudWatchLogs(
+          `/aws/lambda/${stackName}-${functionName}`,
+          () =>
+            createAndRemoveInBucket(bucketExistingComplexSetup, {
+              prefix: 'photos',
+              suffix: '.png',
+            }),
+          {
+            checkIsComplete: (soFarEvents) => {
+              const logs = soFarEvents.reduce((data, event) => data + event.message, '');
+              return logs.includes('ObjectCreated:Put');
+            },
+          }
         ).then((events) => {
           const logs = events.reduce((data, event) => data + event.message, '');
           expect(/aws:s3/g.test(logs)).to.equal(true);
@@ -170,11 +223,19 @@ describe('AWS - S3 Integration Test', function () {
         const functionName = 'existingRemoved';
         const expectedMessage = `Hello from S3! - (${functionName})`;
 
-        return confirmCloudWatchLogs(`/aws/lambda/${stackName}-${functionName}`, () =>
-          createAndRemoveInBucket(bucketExistingComplexSetup, {
-            prefix: 'photos',
-            suffix: '.png',
-          })
+        return confirmCloudWatchLogs(
+          `/aws/lambda/${stackName}-${functionName}`,
+          () =>
+            createAndRemoveInBucket(bucketExistingComplexSetup, {
+              prefix: 'photos',
+              suffix: '.png',
+            }),
+          {
+            checkIsComplete: (soFarEvents) => {
+              const logs = soFarEvents.reduce((data, event) => data + event.message, '');
+              return logs.includes('ObjectRemoved:Delete');
+            },
+          }
         ).then((events) => {
           const logs = events.reduce((data, event) => data + event.message, '');
           expect(/aws:s3/g.test(logs)).to.equal(true);
diff --git a/test/integration/schedule.test.js b/test/integration/aws/schedule.test.js
similarity index 66%
rename from test/integration/schedule.test.js
rename to test/integration/aws/schedule.test.js
index 221fa7a30a2..dc361bd4fa5 100644
--- a/test/integration/schedule.test.js
+++ b/test/integration/aws/schedule.test.js
@@ -1,10 +1,10 @@
 'use strict';
 
 const { expect } = require('chai');
-const fixtures = require('../fixtures/programmatic');
+const fixtures = require('../../fixtures/programmatic');
 
-const { deployService, removeService } = require('../utils/integration');
-const { confirmCloudWatchLogs } = require('../utils/misc');
+const { deployService, removeService } = require('../../utils/integration');
+const { confirmCloudWatchLogs } = require('../../utils/misc');
 
 describe('AWS - Schedule Integration Test', function () {
   this.timeout(1000 * 60 * 100); // Involves time-taking deploys
@@ -54,4 +54,21 @@ describe('AWS - Schedule Integration Test', function () {
       });
     });
   });
+
+  describe('Extended Setup (array)', () => {
+    it('should invoke every minute with transformed input', () => {
+      const functionName = 'scheduleExtendedArray';
+
+      return confirmCloudWatchLogs(`/aws/lambda/${stackName}-${functionName}`, async () => {}, {
+        checkIsComplete: (soFarEvents) => {
+          const logs = soFarEvents.reduce((data, event) => data + event.message, '');
+          return logs.includes('transformedInput');
+        },
+      }).then((events) => {
+        const logs = events.reduce((data, event) => data + event.message, '');
+        expect(logs).to.include(functionName);
+        expect(logs).to.include('transformedInput');
+      });
+    });
+  });
 });
diff --git a/test/integration/sns.test.js b/test/integration/aws/sns.test.js
similarity index 57%
rename from test/integration/sns.test.js
rename to test/integration/aws/sns.test.js
index 218288bf483..daaa5473acf 100644
--- a/test/integration/sns.test.js
+++ b/test/integration/aws/sns.test.js
@@ -1,13 +1,12 @@
 'use strict';
 
-const BbPromise = require('bluebird');
 const { expect } = require('chai');
 const log = require('log').get('serverless:test');
-const fixtures = require('../fixtures/programmatic');
+const fixtures = require('../../fixtures/programmatic');
 
-const { confirmCloudWatchLogs } = require('../utils/misc');
-const { createSnsTopic, removeSnsTopic, publishSnsMessage } = require('../utils/sns');
-const { deployService, removeService } = require('../utils/integration');
+const { confirmCloudWatchLogs } = require('../../utils/misc');
+const { createSnsTopic, removeSnsTopic, publishSnsMessage } = require('../../utils/sns');
+const { deployService, removeService } = require('../../utils/integration');
 
 describe('AWS - SNS Integration Test', function () {
   this.timeout(1000 * 60 * 100); // Involves time-taking deploys
@@ -31,9 +30,8 @@ describe('AWS - SNS Integration Test', function () {
     // create "existing" SNS topics
     // NOTE: deployment can only be done once the SNS topics are created
     log.notice(`Creating SNS topic "${existingTopicName}"...`);
-    return createSnsTopic(existingTopicName).then(() => {
-      return deployService(serviceDir);
-    });
+    await createSnsTopic(existingTopicName);
+    return deployService(serviceDir);
   });
 
   after(async () => {
@@ -43,11 +41,11 @@ describe('AWS - SNS Integration Test', function () {
   });
 
   describe('Minimal Setup', () => {
-    it('should invoke on a topic message', () => {
+    it('should invoke on a topic message', async () => {
       const functionName = 'snsMinimal';
       const message = 'Hello from SNS!';
 
-      return confirmCloudWatchLogs(
+      const events = await confirmCloudWatchLogs(
         `/aws/lambda/${stackName}-${functionName}`,
         () => publishSnsMessage(minimalTopicName, message),
         {
@@ -56,15 +54,14 @@ describe('AWS - SNS Integration Test', function () {
             return logs.includes(message);
           },
         }
-      ).then((events) => {
-        const logs = events.reduce((data, event) => data + event.message, '');
-        expect(logs).to.include(functionName);
-        expect(logs).to.include(message);
-      });
+      );
+      const logs = events.reduce((data, event) => data + event.message, '');
+      expect(logs).to.include(functionName);
+      expect(logs).to.include(message);
     });
   });
 
-  describe('Multiple and Filtered Setup', () => {
+  describe('Multiple and Filtered Setup', async () => {
     it('should invoke on a topic message that matches filter', () => {
       const leftFunctionName = 'snsMultipleFilteredLeft';
       const rightFunctionName = 'snsMultipleFilteredRight';
@@ -75,21 +72,35 @@ describe('AWS - SNS Integration Test', function () {
       const middleAttributes = { side: { DataType: 'String', StringValue: 'middle' } };
       const rightAttributes = { side: { DataType: 'String', StringValue: 'right' } };
 
-      return BbPromise.all([
-        confirmCloudWatchLogs(`/aws/lambda/${stackName}-${leftFunctionName}`, async () => {
-          await publishSnsMessage(filteredTopicName, middleMessage, middleAttributes);
-          await publishSnsMessage(filteredTopicName, leftMessage, leftAttributes);
-        }).then((events) => {
+      return Promise.all([
+        confirmCloudWatchLogs(
+          `/aws/lambda/${stackName}-${leftFunctionName}`,
+          async () => {
+            await publishSnsMessage(filteredTopicName, middleMessage, middleAttributes);
+            await publishSnsMessage(filteredTopicName, leftMessage, leftAttributes);
+          },
+          {
+            checkIsComplete: (events) =>
+              events.reduce((data, event) => data + event.message, '').includes(leftMessage),
+          }
+        ).then((events) => {
           const logs = events.reduce((data, event) => data + event.message, '');
           expect(logs).to.include(leftFunctionName);
           expect(logs).to.include(leftMessage);
           expect(logs).not.to.include(middleMessage);
           expect(logs).not.to.include(rightMessage);
         }),
-        confirmCloudWatchLogs(`/aws/lambda/${stackName}-${rightFunctionName}`, async () => {
-          await publishSnsMessage(filteredTopicName, middleMessage, middleAttributes);
-          await publishSnsMessage(filteredTopicName, rightMessage, rightAttributes);
-        }).then((events) => {
+        confirmCloudWatchLogs(
+          `/aws/lambda/${stackName}-${rightFunctionName}`,
+          async () => {
+            await publishSnsMessage(filteredTopicName, middleMessage, middleAttributes);
+            await publishSnsMessage(filteredTopicName, rightMessage, rightAttributes);
+          },
+          {
+            checkIsComplete: (events) =>
+              events.reduce((data, event) => data + event.message, '').includes(rightMessage),
+          }
+        ).then((events) => {
           const logs = events.reduce((data, event) => data + event.message, '');
           expect(logs).to.include(rightFunctionName);
           expect(logs).not.to.include(leftMessage);
@@ -101,17 +112,21 @@ describe('AWS - SNS Integration Test', function () {
   });
 
   describe('Existing Setup', () => {
-    it('should invoke on an existing topic message', () => {
+    it('should invoke on an existing topic message', async () => {
       const functionName = 'snsExisting';
       const message = 'Hello from an existing SNS!';
 
-      return confirmCloudWatchLogs(`/aws/lambda/${stackName}-${functionName}`, () =>
-        publishSnsMessage(existingTopicName, message)
-      ).then((events) => {
-        const logs = events.reduce((data, event) => data + event.message, '');
-        expect(logs).to.include(functionName);
-        expect(logs).to.include(message);
-      });
+      const events = await confirmCloudWatchLogs(
+        `/aws/lambda/${stackName}-${functionName}`,
+        () => publishSnsMessage(existingTopicName, message),
+        {
+          checkIsComplete: (soFarEvents) =>
+            soFarEvents.reduce((data, event) => data + event.message, '').includes(message),
+        }
+      );
+      const logs = events.reduce((data, event) => data + event.message, '');
+      expect(logs).to.include(functionName);
+      expect(logs).to.include(message);
     });
   });
 });
diff --git a/test/integration/sqs.test.js b/test/integration/aws/sqs.test.js
similarity index 75%
rename from test/integration/sqs.test.js
rename to test/integration/aws/sqs.test.js
index 435187022a8..0709bded92d 100644
--- a/test/integration/sqs.test.js
+++ b/test/integration/aws/sqs.test.js
@@ -3,11 +3,11 @@
 const { expect } = require('chai');
 const hasFailed = require('@serverless/test/has-failed');
 const log = require('log').get('serverless:test');
-const fixtures = require('../fixtures/programmatic');
+const fixtures = require('../../fixtures/programmatic');
 
-const { createSqsQueue, deleteSqsQueue, sendSqsMessage } = require('../utils/sqs');
-const { confirmCloudWatchLogs } = require('../utils/misc');
-const { deployService, removeService } = require('../utils/integration');
+const { createSqsQueue, deleteSqsQueue, sendSqsMessage } = require('../../utils/sqs');
+const { confirmCloudWatchLogs } = require('../../utils/misc');
+const { deployService, removeService } = require('../../utils/integration');
 
 describe('AWS - SQS Integration Test', function () {
   this.timeout(1000 * 60 * 100); // Involves time-taking deploys
@@ -43,8 +43,13 @@ describe('AWS - SQS Integration Test', function () {
       const functionName = 'sqsBasic';
       const message = 'Hello from SQS!';
 
-      return confirmCloudWatchLogs(`/aws/lambda/${stackName}-${functionName}`, () =>
-        sendSqsMessage(queueName, message)
+      return confirmCloudWatchLogs(
+        `/aws/lambda/${stackName}-${functionName}`,
+        () => sendSqsMessage(queueName, message),
+        {
+          checkIsComplete: (events) =>
+            events.reduce((data, event) => data + event.message, '').includes(message),
+        }
       ).then((events) => {
         const logs = events.reduce((data, event) => data + event.message, '');
         expect(logs).to.include(functionName);
diff --git a/test/integration/stream.test.js b/test/integration/aws/stream.test.js
similarity index 82%
rename from test/integration/stream.test.js
rename to test/integration/aws/stream.test.js
index 5055fca1fa6..9bc5e9c999d 100644
--- a/test/integration/stream.test.js
+++ b/test/integration/aws/stream.test.js
@@ -2,12 +2,16 @@
 
 const { expect } = require('chai');
 const log = require('log').get('serverless:test');
-const fixtures = require('../fixtures/programmatic');
+const fixtures = require('../../fixtures/programmatic');
 
-const { createKinesisStream, deleteKinesisStream, putKinesisRecord } = require('../utils/kinesis');
-const { putDynamoDbItem } = require('../utils/dynamodb');
-const { confirmCloudWatchLogs } = require('../utils/misc');
-const { deployService, removeService } = require('../utils/integration');
+const {
+  createKinesisStream,
+  deleteKinesisStream,
+  putKinesisRecord,
+} = require('../../utils/kinesis');
+const { putDynamoDbItem } = require('../../utils/dynamodb');
+const { confirmCloudWatchLogs } = require('../../utils/misc');
+const { deployService, removeService } = require('../../utils/integration');
 
 describe('AWS - Stream Integration Test', function () {
   this.timeout(1000 * 60 * 100); // Involves time-taking deploys
@@ -48,7 +52,10 @@ describe('AWS - Stream Integration Test', function () {
       return confirmCloudWatchLogs(
         `/aws/lambda/${stackName}-${functionName}`,
         () => putKinesisRecord(streamName, message),
-        { timeout: 120 * 1000 }
+        {
+          checkIsComplete: (events) =>
+            events.reduce((data, event) => data + event.message, '').includes(message),
+        }
       ).then((events) => {
         const logs = events.reduce((data, event) => data + event.message, '');
         expect(logs).to.include(functionName);
@@ -61,9 +68,7 @@ describe('AWS - Stream Integration Test', function () {
   describe('DynamoDB Streams', () => {
     it('should invoke on dynamodb messages from the latest position', () => {
       const functionName = 'streamDynamoDb';
-      const item = {
-        id: 'message',
-      };
+      const item = { id: String(Date.now()) };
       return confirmCloudWatchLogs(
         `/aws/lambda/${stackName}-${functionName}`,
         () => {
diff --git a/test/integration/websocket.test.js b/test/integration/aws/websocket.test.js
similarity index 94%
rename from test/integration/websocket.test.js
rename to test/integration/aws/websocket.test.js
index c3fbfe630e1..6789c705b55 100644
--- a/test/integration/websocket.test.js
+++ b/test/integration/aws/websocket.test.js
@@ -5,11 +5,17 @@ const { expect } = require('chai');
 const awsRequest = require('@serverless/test/aws-request');
 const log = require('log').get('serverless:test');
 const wait = require('timers-ext/promise/sleep');
-const fixtures = require('../fixtures/programmatic');
-
-const { confirmCloudWatchLogs } = require('../utils/misc');
-const { deployService, removeService } = require('../utils/integration');
-const { createApi, deleteApi, getRoutes, createStage, deleteStage } = require('../utils/websocket');
+const fixtures = require('../../fixtures/programmatic');
+
+const { confirmCloudWatchLogs } = require('../../utils/misc');
+const { deployService, removeService } = require('../../utils/integration');
+const {
+  createApi,
+  deleteApi,
+  getRoutes,
+  createStage,
+  deleteStage,
+} = require('../../utils/websocket');
 
 describe('AWS - API Gateway Websocket Integration Test', function () {
   this.timeout(1000 * 60 * 10); // Involves time-taking deploys
diff --git a/test/integration/curated-plugins-python.test.js b/test/integration/curated-plugins-python.test.js
new file mode 100644
index 00000000000..adc829ff295
--- /dev/null
+++ b/test/integration/curated-plugins-python.test.js
@@ -0,0 +1,34 @@
+'use strict';
+
+const { expect } = require('chai');
+const path = require('path');
+const spawn = require('child-process-ext/spawn');
+const fixturesEngine = require('../fixtures/programmatic');
+const { listZipFiles } = require('../utils/fs');
+
+const serverlessExec = require('../serverless-binary');
+
+describe('test/integration/curated-plugins-python.test.js', function () {
+  this.timeout(1000 * 60 * 10); // Involves time-taking npm install
+
+  let serviceDir;
+  let updateConfig;
+  let serviceConfig;
+  before(async () => {
+    ({
+      servicePath: serviceDir,
+      updateConfig,
+      serviceConfig,
+    } = await fixturesEngine.setup('curated-plugins-python'));
+  });
+
+  afterEach(async () => updateConfig({ plugins: null }));
+
+  it('should be extended by "serverless-python-requirements"', async () => {
+    await updateConfig({ plugins: ['serverless-python-requirements'] });
+    await spawn(serverlessExec, ['package'], { cwd: serviceDir });
+    const packagePath = path.resolve(serviceDir, '.serverless', `${serviceConfig.service}.zip`);
+    const filesInZip = await listZipFiles(packagePath);
+    expect(filesInZip).to.include('requests/__init__.py');
+  });
+});
diff --git a/test/integration/curated-plugins.test.js b/test/integration/curated-plugins.test.js
new file mode 100644
index 00000000000..e9e54b53688
--- /dev/null
+++ b/test/integration/curated-plugins.test.js
@@ -0,0 +1,214 @@
+'use strict';
+
+const { expect } = require('chai');
+const path = require('path');
+const fsp = require('fs').promises;
+const spawn = require('child-process-ext/spawn');
+const got = require('got');
+const AdmZip = require('adm-zip');
+const { deployService, removeService } = require('../utils/integration');
+const fixturesEngine = require('../fixtures/programmatic');
+
+const serverlessExec = require('../serverless-binary');
+
+describe('test/integration/curated-plugins.test.js', function () {
+  this.timeout(1000 * 60 * 10); // Involves time-taking npm install
+
+  let serviceDir;
+  let updateConfig;
+  let serviceConfig;
+  let isDeployed = false;
+  before(async () => {
+    ({
+      servicePath: serviceDir,
+      updateConfig,
+      serviceConfig,
+    } = await fixturesEngine.setup('curated-plugins'));
+    // Needed to test "serverless-domain-manager"
+    await deployService(serviceDir);
+    isDeployed = true;
+  });
+  after(async () => {
+    if (!isDeployed) return;
+    await removeService(serviceDir);
+  });
+
+  afterEach(async () => updateConfig({ plugins: null }));
+
+  it('should be extended by "serverless-offline"', async () => {
+    await updateConfig({ plugins: ['serverless-offline'] });
+    const slsProcessPromise = spawn(serverlessExec, ['offline'], {
+      cwd: serviceDir,
+    });
+    const slsProcess = slsProcessPromise.child;
+    let output = '';
+    slsProcess.stderr.on('data', function self(data) {
+      output += data;
+      if (output.includes('Server ready:')) {
+        slsProcess.stderr.off('data', self);
+        got('http://localhost:3000/dev/foo')
+          .json()
+          .then(async (responseBody) => {
+            expect(responseBody.message).to.equal('Test');
+          })
+          .finally(() => slsProcess.kill('SIGINT'));
+      }
+    });
+    await slsProcessPromise;
+  });
+
+  it('should be extended by "serverless-webpack"', async () => {
+    await spawn(serverlessExec, ['package'], { cwd: serviceDir });
+    const packagePath = path.resolve(serviceDir, '.serverless', `${serviceConfig.service}.zip`);
+    const originalPackageSize = (await fsp.stat(packagePath)).size;
+    await updateConfig({ plugins: ['serverless-webpack'] });
+    await spawn(serverlessExec, ['package'], { cwd: serviceDir });
+    const bundledPackageSize = (await fsp.stat(packagePath)).size;
+    expect(originalPackageSize / 10).to.be.above(bundledPackageSize);
+  });
+
+  it('should be extended by "serverless-domain-manager"', async () => {
+    await updateConfig({ plugins: ['serverless-domain-manager'] });
+    const { stderrBuffer } = await spawn(serverlessExec, ['info'], { cwd: serviceDir });
+    expect(String(stderrBuffer)).to.include('Serverless Domain Manager:');
+  });
+
+  it('should be extended by "serverless-prune-plugin"', async () => {
+    await updateConfig({ plugins: ['serverless-prune-plugin'] });
+    const { stderrBuffer } = await spawn(serverlessExec, ['prune', '-n', '10'], {
+      cwd: serviceDir,
+    });
+    expect(String(stderrBuffer)).to.include('Pruning of functions complete');
+  });
+
+  it('should be extended by "serverless-dotenv-plugin"', async () => {
+    await updateConfig({ plugins: ['serverless-dotenv-plugin'] });
+    const { stderrBuffer } = await spawn(serverlessExec, ['package'], {
+      cwd: serviceDir,
+    });
+    expect(String(stderrBuffer)).to.include('DOTENV: Loading environment variables');
+    const cfTemplate = JSON.parse(
+      await fsp.readFile(
+        path.resolve(serviceDir, '.serverless/cloudformation-template-update-stack.json')
+      )
+    );
+    expect(
+      cfTemplate.Resources.FunctionLambdaFunction.Properties.Environment.Variables
+        .DOTENV_PLUGIN_TEST
+    ).to.equal('passed');
+  });
+
+  it('should be extended by "serverless-iam-roles-per-function"', async () => {
+    await updateConfig({
+      plugins: ['serverless-iam-roles-per-function'],
+      functions: {
+        function: {
+          iamRoleStatementsName: 'fn-plugin-role-name',
+          iamRoleStatements: [
+            {
+              Effect: 'Allow',
+              Action: ['dynamodb:GetItem'],
+              Resource: 'arn:aws:dynamodb:${aws:region}:*:table/mytable',
+            },
+          ],
+        },
+      },
+    });
+    try {
+      await spawn(serverlessExec, ['package'], { cwd: serviceDir });
+      const cfTemplate = JSON.parse(
+        await fsp.readFile(
+          path.resolve(serviceDir, '.serverless/cloudformation-template-update-stack.json')
+        )
+      );
+      expect(cfTemplate.Resources.FunctionIamRoleLambdaExecution.Properties.RoleName).to.equal(
+        'fn-plugin-role-name'
+      );
+    } finally {
+      await updateConfig({
+        functions: {
+          function: { iamRoleStatementsName: null, iamRoleStatements: null },
+        },
+      });
+    }
+  });
+
+  it('should be extended by "serverless-plugin-typescript"', async () => {
+    await updateConfig({
+      plugins: ['serverless-plugin-typescript'],
+      functions: {
+        functionTs: {
+          handler: 'index-ts.handler',
+        },
+      },
+    });
+    try {
+      await spawn(serverlessExec, ['package'], { cwd: serviceDir });
+      const zip = new AdmZip(path.resolve(serviceDir, `.serverless/${serviceConfig.service}.zip`));
+      const zipEntry = zip.getEntries().find(({ entryName }) => entryName === 'index-ts.js');
+      const tmpModulePath = path.resolve(serviceDir, '.serverless/test-ts.js');
+      await fsp.writeFile(tmpModulePath, zipEntry.getData());
+      expect(require(tmpModulePath).testData).to.deep.equal({ value: 'test-ts-compilation' });
+    } finally {
+      await updateConfig({
+        functions: { functionTs: null },
+      });
+    }
+  });
+
+  it('should be extended by "serverless-step-functions"', async () => {
+    await updateConfig({
+      plugins: ['serverless-step-functions'],
+      stepFunctions: {
+        stateMachines: {
+          testMachine: {
+            definition: {
+              StartAt: 'FirstState',
+              States: {
+                FirstState: {
+                  Type: 'Task',
+                  Resource: {
+                    'Fn::GetAtt': ['entry', 'Arn'],
+                  },
+                  Next: 'mapped_task',
+                },
+                mapped_task: {
+                  Type: 'Map',
+                  Iterator: {
+                    StartAt: 'FirstMapTask',
+                    States: {
+                      FirstMapTask: {
+                        Type: 'Task',
+                        Resource: {
+                          'Fn::GetAtt': ['mapTask', 'Arn'],
+                        },
+                        End: true,
+                      },
+                    },
+                  },
+                  End: true,
+                },
+              },
+            },
+          },
+        },
+        validate: true,
+      },
+    });
+    try {
+      await spawn(serverlessExec, ['package'], { cwd: serviceDir });
+      const cfTemplate = JSON.parse(
+        await fsp.readFile(
+          path.resolve(serviceDir, '.serverless/cloudformation-template-update-stack.json')
+        )
+      );
+      expect(cfTemplate.Resources.TestMachineStepFunctionsStateMachine.Type).to.equal(
+        'AWS::StepFunctions::StateMachine'
+      );
+    } finally {
+      await updateConfig({
+        stepFunctions: null,
+      });
+    }
+  });
+});
diff --git a/test/integration/functionDestinations.test.js b/test/integration/functionDestinations.test.js
deleted file mode 100644
index 75a381d4462..00000000000
--- a/test/integration/functionDestinations.test.js
+++ /dev/null
@@ -1,42 +0,0 @@
-'use strict';
-
-const { expect } = require('chai');
-const awsRequest = require('@serverless/test/aws-request');
-const fixtures = require('../fixtures/programmatic');
-const { confirmCloudWatchLogs } = require('../utils/misc');
-
-const { deployService, removeService } = require('../utils/integration');
-
-describe('Function destinations Integration Test', function () {
-  this.timeout(1000 * 60 * 20); // Involves time-taking deploys
-  let stackName;
-  let serviceDir;
-  const stage = 'dev';
-
-  before(async () => {
-    const serviceData = await fixtures.setup('functionDestinations');
-    ({ servicePath: serviceDir } = serviceData);
-    const serviceName = serviceData.serviceConfig.service;
-    stackName = `${serviceName}-${stage}`;
-    await deployService(serviceDir);
-  });
-
-  after(async () => {
-    if (!serviceDir) return;
-    await removeService(serviceDir);
-  });
-
-  it('on async invoke should invoke destination target', async () =>
-    confirmCloudWatchLogs(
-      `/aws/lambda/${stackName}-target`,
-      async () => {
-        await awsRequest('Lambda', 'invoke', {
-          FunctionName: `${stackName}-trigger`,
-          InvocationType: 'Event',
-        });
-      },
-      { checkIsComplete: (events) => events.length }
-    ).then((events) => {
-      expect(events.length > 0).to.equal(true);
-    }));
-});
diff --git a/test/integration/plugin-install.test.js b/test/integration/plugin-install.test.js
new file mode 100644
index 00000000000..8286de8c711
--- /dev/null
+++ b/test/integration/plugin-install.test.js
@@ -0,0 +1,29 @@
+'use strict';
+
+const path = require('path');
+const fsp = require('fs').promises;
+const spawn = require('child-process-ext/spawn');
+const fixturesEngine = require('../fixtures/programmatic');
+
+const serverlessExec = require('../serverless-binary');
+
+describe('test/integration/plugin-install.test.js', function () {
+  this.timeout(1000 * 60 * 10); // Involves time-taking npm install
+
+  let serviceDir;
+  before(async () => {
+    serviceDir = (
+      await fixturesEngine.setup('function', {
+        // Unresolved variables should not block "plugin install" command
+        configExt: { custom: { foo: '${foo:bar}' } },
+      })
+    ).servicePath;
+    await spawn(serverlessExec, ['plugin', 'install', '-n', 'serverless-offline'], {
+      cwd: serviceDir,
+    });
+  });
+
+  it('should install plugin', async () => {
+    await fsp.access(path.resolve(serviceDir, 'node_modules/serverless-offline'));
+  });
+});
diff --git a/test/mochaPatch.js b/test/mocha-patch.js
similarity index 75%
rename from test/mochaPatch.js
rename to test/mocha-patch.js
index 8bd417359a4..992ee2cb617 100644
--- a/test/mochaPatch.js
+++ b/test/mocha-patch.js
@@ -1,7 +1,7 @@
 'use strict';
 
-const path = require('path');
 const fs = require('fs');
+const Module = require('module');
 
 // Temporary patch to help tackle peekaboo error, by revelaing fuller stack trace for "fs" errors
 // https://github.com/serverless/serverless/runs/1740873363
@@ -38,17 +38,17 @@ const patchCallback = (name) => {
     }
   );
 };
-patchPromised('readFile');
+patchPromised('mkdir');
 patchPromised('open');
-patchCallback('readFile');
+patchPromised('readFile');
+patchCallback('mkdir');
 patchCallback('open');
+patchCallback('readFile');
 
-const disableServerlessStatsRequests = require('@serverless/test/disable-serverless-stats-requests');
-const ensureArtifact = require('../lib/utils/ensureArtifact');
-const resolveLocalServerless = require('../lib/cli/resolve-local-serverless-path');
-const resolveInput = require('../lib/cli/resolve-input');
+const ensureArtifact = require('../lib/utils/ensure-artifact');
 
-disableServerlessStatsRequests(path.resolve(__dirname, '..'));
+const localServerlessPathModulePath = require.resolve('../lib/cli/local-serverless-path');
+const resolveInput = require('../lib/cli/resolve-input');
 
 const BbPromise = require('bluebird');
 
@@ -65,7 +65,15 @@ runnerEmitter.on('runner', (runner) => {
     resolveInput.clear();
     // Ensure to reset cache for local serverless installation resolution
     // Leaking it across test files may introduce wrong assumptions when result is used for testing
-    resolveLocalServerless.clear();
+    if (require.cache[localServerlessPathModulePath]) {
+      // As we rely on native require.resolve, we need to ensure that it's cache related to
+      // tmp homedir is cleared
+      const homedir = require('os').homedir();
+      for (const key of Object.keys(Module._pathCache)) {
+        if (key.includes(homedir)) delete Module._pathCache[key];
+      }
+      delete require.cache[localServerlessPathModulePath];
+    }
     // Ensure to reset memoization on artifacts generation after each test file run.
     // Reason is that homedir is automatically cleaned for each test,
     // therefore eventually built custom resource file is also removed
diff --git a/test/serverlessBinary.js b/test/serverless-binary.js
similarity index 100%
rename from test/serverlessBinary.js
rename to test/serverless-binary.js
diff --git a/test/unit/commands/doctor.test.js b/test/unit/commands/doctor.test.js
new file mode 100644
index 00000000000..d9f4958a1d9
--- /dev/null
+++ b/test/unit/commands/doctor.test.js
@@ -0,0 +1,44 @@
+'use strict';
+
+const chai = require('chai');
+const path = require('path');
+const spawn = require('child-process-ext/spawn');
+const { expect } = require('chai');
+const fixturesEngine = require('../../fixtures/programmatic');
+
+chai.use(require('chai-as-promised'));
+
+const serverlessPath = path.resolve(__dirname, '../../../scripts/serverless.js');
+
+describe('test/unit/commands/doctor.test.js', async () => {
+  before(() => {
+    process.env.SLS_DEPRECATION_NOTIFICATION_MODE = 'warn:summary';
+  });
+
+  it('should print health status after command which triggered deprecation', async () => {
+    const { servicePath: serviceDir } = await fixturesEngine.setup('http-api', {
+      configExt: {
+        provider: {
+          httpApi: {
+            useProviderTags: true,
+          },
+        },
+      },
+    });
+    // Trigger deprecation
+    await spawn('node', [serverlessPath, 'print'], { cwd: serviceDir });
+
+    // Gather Health status
+    expect(String((await spawn('node', [serverlessPath, 'doctor'])).stdoutBuffer)).to.include(
+      'deprecation triggered in the last command'
+    );
+  });
+
+  it('should inform of no issues when no health status found', async () => {
+    // Trigger command that reports no issues
+    await spawn('node', [serverlessPath, 'config', '--help']);
+
+    // Gather Health status
+    expect(String((await spawn('node', [serverlessPath, 'doctor'])).stdoutBuffer)).to.be.empty;
+  });
+});
diff --git a/test/unit/commands/plugin-install.test.js b/test/unit/commands/plugin-install.test.js
new file mode 100644
index 00000000000..d84adb871b2
--- /dev/null
+++ b/test/unit/commands/plugin-install.test.js
@@ -0,0 +1,62 @@
+'use strict';
+
+const chai = require('chai');
+const sinon = require('sinon');
+const yaml = require('js-yaml');
+const fse = require('fs-extra');
+const proxyquire = require('proxyquire');
+const fixturesEngine = require('../../fixtures/programmatic');
+const resolveConfigurationPath = require('../../../lib/cli/resolve-configuration-path');
+const { expect } = require('chai');
+
+chai.use(require('chai-as-promised'));
+
+const npmCommand = 'npm';
+
+describe('test/unit/commands/plugin-install.test.js', async () => {
+  let spawnFake;
+  let serviceDir;
+  let configurationFilePath;
+
+  const pluginName = 'serverless-plugin-1';
+
+  before(async () => {
+    spawnFake = sinon.fake();
+    const installPlugin = proxyquire('../../../commands/plugin-install', {
+      'child-process-ext/spawn': spawnFake,
+    });
+
+    const fixture = await fixturesEngine.setup('function');
+
+    const configuration = fixture.serviceConfig;
+    serviceDir = fixture.servicePath;
+    configurationFilePath = await resolveConfigurationPath({
+      cwd: serviceDir,
+    });
+    const configurationFilename = configurationFilePath.slice(serviceDir.length + 1);
+    const options = {
+      name: pluginName,
+    };
+
+    await installPlugin({
+      configuration,
+      serviceDir,
+      configurationFilename,
+      options,
+    });
+  });
+
+  it('should install plugin', () => {
+    const firstCall = spawnFake.firstCall;
+    const command = [firstCall.args[0], ...firstCall.args[1]].join(' ');
+    const expectedCommand = `${npmCommand} install --save-dev ${pluginName}`;
+    expect(command).to.have.string(expectedCommand);
+  });
+
+  it('should add plugin to serverless file', async () => {
+    const serverlessFileObj = yaml.load(await fse.readFile(configurationFilePath, 'utf8'), {
+      filename: configurationFilePath,
+    });
+    expect(serverlessFileObj.plugins).to.include(pluginName);
+  });
+});
diff --git a/test/unit/commands/plugin-uninstall.test.js b/test/unit/commands/plugin-uninstall.test.js
new file mode 100644
index 00000000000..8024d210d23
--- /dev/null
+++ b/test/unit/commands/plugin-uninstall.test.js
@@ -0,0 +1,66 @@
+'use strict';
+
+const chai = require('chai');
+const sinon = require('sinon');
+const yaml = require('js-yaml');
+const fse = require('fs-extra');
+const proxyquire = require('proxyquire');
+const fixturesEngine = require('../../fixtures/programmatic');
+const resolveConfigurationPath = require('../../../lib/cli/resolve-configuration-path');
+const { expect } = require('chai');
+
+chai.use(require('chai-as-promised'));
+
+const npmCommand = 'npm';
+
+describe('test/unit/commands/plugin-uninstall.test.js', async () => {
+  let spawnFake;
+  let serviceDir;
+  let configurationFilePath;
+
+  const pluginName = 'serverless-plugin-1';
+
+  before(async () => {
+    spawnFake = sinon.fake();
+    const uninstallPlugin = proxyquire('../../../commands/plugin-uninstall', {
+      'child-process-ext/spawn': spawnFake,
+    });
+
+    const fixture = await fixturesEngine.setup('function', {
+      configExt: {
+        plugins: [pluginName],
+      },
+    });
+
+    const configuration = fixture.serviceConfig;
+    serviceDir = fixture.servicePath;
+    configurationFilePath = await resolveConfigurationPath({
+      cwd: serviceDir,
+    });
+    const configurationFilename = configurationFilePath.slice(serviceDir.length + 1);
+    const options = {
+      name: pluginName,
+    };
+
+    await uninstallPlugin({
+      configuration,
+      serviceDir,
+      configurationFilename,
+      options,
+    });
+  });
+
+  it('should uninstall plugin', () => {
+    const firstCall = spawnFake.firstCall;
+    const command = [firstCall.args[0], ...firstCall.args[1]].join(' ');
+    const expectedCommand = `${npmCommand} uninstall --save-dev ${pluginName}`;
+    expect(command).to.have.string(expectedCommand);
+  });
+
+  it('should remove plugin from serverless file', async () => {
+    const serverlessFileObj = yaml.load(await fse.readFile(configurationFilePath, 'utf8'), {
+      filename: configurationFilePath,
+    });
+    expect(serverlessFileObj.plugins).to.be.undefined;
+  });
+});
diff --git a/test/unit/lib/Serverless.test.js b/test/unit/lib/Serverless.test.js
deleted file mode 100644
index fa5016f19ff..00000000000
--- a/test/unit/lib/Serverless.test.js
+++ /dev/null
@@ -1,358 +0,0 @@
-'use strict';
-
-const expect = require('chai').expect;
-const Serverless = require('../../../lib/Serverless');
-const semverRegex = require('semver-regex');
-const path = require('path');
-const sinon = require('sinon');
-const BbPromise = require('bluebird');
-
-const YamlParser = require('../../../lib/classes/YamlParser');
-const PluginManager = require('../../../lib/classes/PluginManager');
-const Utils = require('../../../lib/classes/Utils');
-const Service = require('../../../lib/classes/Service');
-const ConfigSchemaHandler = require('../../../lib/classes/ConfigSchemaHandler');
-const CLI = require('../../../lib/classes/CLI');
-const ServerlessError = require('../../../lib/serverless-error');
-const conditionallyLoadDotenv = require('../../../lib/cli/conditionally-load-dotenv');
-const runServerless = require('../../utils/run-serverless');
-const fixtures = require('../../fixtures/programmatic');
-const fs = require('fs');
-
-describe('Serverless', () => {
-  let serverless;
-
-  beforeEach(() => {
-    serverless = new Serverless();
-  });
-
-  describe('#constructor()', () => {
-    it('should set the correct config if a config object is passed', () => {
-      const configObj = { some: 'config' };
-      const serverlessWithConfig = new Serverless(configObj);
-
-      expect(serverlessWithConfig.config.some).to.equal('config');
-    });
-
-    it('should set an empty config object if no config object passed', () => {
-      expect(Object.keys(serverless.config)).to.include('serverless');
-      expect(Object.keys(serverless.config)).to.include('serverlessPath');
-    });
-
-    it('should set an empty providers object', () => {
-      expect(serverless.providers).to.deep.equal({});
-    });
-
-    it('should set the Serverless version', () => {
-      expect(serverless.version.length).to.be.at.least(1);
-    });
-
-    it('should set the YamlParser class instance', () => {
-      expect(serverless.yamlParser).to.be.instanceof(YamlParser);
-    });
-
-    it('should set the PluginManager class instance', () => {
-      expect(serverless.pluginManager).to.be.instanceof(PluginManager);
-    });
-
-    it('should set the Utils class instance', () => {
-      expect(serverless.utils).to.be.instanceof(Utils);
-    });
-
-    it('should set the Service class instance', () => {
-      expect(serverless.service).to.be.instanceof(Service);
-    });
-
-    it('should set the ConfigSchemaHandler class instance', () => {
-      expect(serverless.configSchemaHandler).to.be.instanceof(ConfigSchemaHandler);
-    });
-
-    it('should have a config object', () => {
-      expect(serverless.config).to.not.equal(undefined);
-    });
-
-    it('should have a classes object', () => {
-      expect(serverless.classes).to.not.equal(undefined);
-    });
-
-    it('should store the CLI class inside the classes object', () => {
-      expect(serverless.classes.CLI).to.deep.equal(CLI);
-    });
-
-    it('should store the YamlParser class inside the classes object', () => {
-      expect(serverless.classes.YamlParser).to.deep.equal(YamlParser);
-    });
-
-    it('should store the PluginManager class inside the classes object', () => {
-      expect(serverless.classes.PluginManager).to.deep.equal(PluginManager);
-    });
-
-    it('should store the Utils class inside the classes object', () => {
-      expect(serverless.classes.Utils).to.deep.equal(Utils);
-    });
-
-    it('should store the Service class inside the classes object', () => {
-      expect(serverless.classes.Service).to.deep.equal(Service);
-    });
-
-    it('should store the ConfigSchemaHandler class inside the classes object', () => {
-      expect(serverless.classes.ConfigSchemaHandler).to.deep.equal(ConfigSchemaHandler);
-    });
-
-    it('should store the Error class inside the classes object', () => {
-      expect(serverless.classes.Error).to.deep.equal(ServerlessError);
-    });
-  });
-
-  describe('#init()', () => {
-    it('should set an instanceId', () =>
-      serverless.init().then(() => {
-        expect(serverless.instanceId).to.match(/\d/);
-      }));
-
-    it('should create a new CLI instance', () =>
-      serverless.init().then(() => {
-        expect(serverless.cli).to.be.instanceof(CLI);
-      }));
-
-    it('should allow a custom CLI instance', () => {
-      class CustomCLI extends CLI {}
-      serverless.classes.CLI = CustomCLI;
-
-      return serverless.init().then(() => {
-        expect(serverless.cli).to.be.instanceof(CLI);
-        expect(serverless.cli.constructor.name).to.equal('CustomCLI');
-      });
-    });
-
-    // note: we just test that the processedInput variable is set (not the content of it)
-    // the test for the correct input is done in the CLI class test file
-    it('should receive the processed input form the CLI instance', () =>
-      serverless.init().then(() => {
-        expect(serverless.processedInput).to.not.deep.equal({});
-      }));
-  });
-
-  describe('#run()', () => {
-    let displayHelpStub;
-    let validateCommandStub;
-    let populateServiceStub;
-    let runStub;
-
-    beforeEach(() => {
-      serverless.cli = new CLI(serverless);
-      serverless.processedInput = { commands: [], options: {} };
-      // setup default stubs
-      displayHelpStub = sinon.stub(serverless.cli, 'displayHelp').returns(false);
-      validateCommandStub = sinon.stub(serverless.pluginManager, 'validateCommand').returns();
-      populateServiceStub = sinon.stub(serverless.variables, 'populateService').resolves();
-      runStub = sinon.stub(serverless.pluginManager, 'run').resolves();
-    });
-
-    afterEach(() => {
-      serverless.cli.displayHelp.restore();
-      serverless.pluginManager.validateCommand.restore();
-      serverless.variables.populateService.restore();
-      serverless.pluginManager.run.restore();
-    });
-
-    it('should resolve if the stats logging call throws an error / is rejected', () => {
-      return serverless.run().then(() => {
-        expect(displayHelpStub.calledOnce).to.equal(true);
-        expect(validateCommandStub.calledOnce).to.equal(true);
-        expect(populateServiceStub.calledOnce).to.equal(true);
-        expect(runStub.calledOnce).to.equal(true);
-        return BbPromise.resolve();
-      });
-    });
-
-    it('should resolve if help is displayed or no commands are entered', () => {
-      // overwrite displayHelpStub
-      displayHelpStub.returns(true);
-
-      return serverless.run().then(() => {
-        expect(displayHelpStub.calledOnce).to.equal(true);
-        expect(validateCommandStub.calledOnce).to.equal(false);
-        expect(populateServiceStub.calledOnce).to.equal(false);
-        expect(runStub.calledOnce).to.equal(false);
-      });
-    });
-
-    it('should run all the needed functions', () =>
-      serverless.run().then(() => {
-        expect(displayHelpStub.calledOnce).to.equal(true);
-        expect(validateCommandStub.calledOnce).to.equal(true);
-        expect(populateServiceStub.calledOnce).to.equal(true);
-        expect(runStub.calledOnce).to.equal(true);
-      }));
-  });
-
-  describe('#setProvider()', () => {
-    class ProviderMock {}
-
-    it('should set the provider object in the provider object', () => {
-      const myProvider = new ProviderMock();
-
-      serverless.setProvider('myProvider', myProvider);
-
-      expect(serverless.providers.myProvider).to.equal(myProvider);
-    });
-  });
-
-  describe('#getProvider()', () => {
-    class ProviderMock {}
-    let myProvider;
-
-    beforeEach(() => {
-      myProvider = new ProviderMock();
-      serverless.setProvider('myProvider', myProvider);
-    });
-
-    it('should return the provider object', () => {
-      const retrivedProvider = serverless.getProvider('myProvider');
-
-      expect(retrivedProvider).to.deep.equal(myProvider);
-    });
-  });
-
-  describe('#getVersion()', () => {
-    it('should get the correct Serverless version', () => {
-      expect(semverRegex().test(serverless.getVersion())).to.equal(true);
-    });
-  });
-});
-
-describe('test/unit/lib/Serverless.test.js', () => {
-  describe('When local version available', () => {
-    describe('When running global version', () => {
-      it('Should fallback to local version when it is found and "enableLocalInstallationFallback" is not set', () =>
-        runServerless({
-          fixture: 'locallyInstalledServerless',
-          command: 'print',
-          modulesCacheStub: {},
-        }).then(({ serverless }) => {
-          expect(Array.from(serverless.triggeredDeprecations)).to.deep.equal([]);
-          expect(serverless._isInvokedByGlobalInstallation).to.be.true;
-          expect(serverless.isLocallyInstalled).to.be.true;
-          expect(serverless.isLocalStub).to.be.true;
-        }));
-
-      let serverlessWithDisabledLocalInstallationFallback;
-      it('Should report deprecation notice when "enableLocalInstallationFallback" is set', () =>
-        runServerless({
-          fixture: 'locallyInstalledServerless',
-          configExt: { enableLocalInstallationFallback: false },
-          command: 'print',
-          modulesCacheStub: {},
-        }).then(({ serverless }) => {
-          serverlessWithDisabledLocalInstallationFallback = serverless;
-          expect(Array.from(serverless.triggeredDeprecations)).to.deep.equal([
-            'DISABLE_LOCAL_INSTALLATION_FALLBACK_SETTING',
-          ]);
-          expect(serverless._isInvokedByGlobalInstallation).to.be.false;
-          expect(serverless.isLocallyInstalled).to.be.false;
-          expect(serverless.isLocalStub).to.not.exist;
-        }));
-
-      it('Should not fallback to local when "enableLocalInstallationFallback" set to false', () =>
-        expect(serverlessWithDisabledLocalInstallationFallback.invokedInstance).to.not.exist);
-
-      it('Should fallback to local version when "enableLocalInstallationFallback" set to true', () =>
-        runServerless({
-          fixture: 'locallyInstalledServerless',
-          configExt: { enableLocalInstallationFallback: true },
-          command: 'print',
-          modulesCacheStub: {},
-        }).then(({ serverless }) => {
-          expect(Array.from(serverless.triggeredDeprecations)).to.deep.equal([
-            'DISABLE_LOCAL_INSTALLATION_FALLBACK_SETTING',
-          ]);
-          expect(serverless._isInvokedByGlobalInstallation).to.be.true;
-          expect(serverless.isLocallyInstalled).to.be.true;
-          expect(serverless.isLocalStub).to.be.true;
-        }));
-    });
-
-    describe('When running local version', () => {
-      it('Should run without notice', () =>
-        fixtures.setup('locallyInstalledServerless').then(({ servicePath: serviceDir }) =>
-          runServerless({
-            serverlessDir: path.resolve(serviceDir, 'node_modules/serverless'),
-            cwd: serviceDir,
-            command: 'print',
-          }).then(({ serverless }) => {
-            expect(Array.from(serverless.triggeredDeprecations)).to.not.include(
-              'DISABLE_LOCAL_INSTALLATION_FALLBACK_SETTING'
-            );
-            expect(serverless._isInvokedByGlobalInstallation).to.be.false;
-            expect(serverless.isLocallyInstalled).to.be.true;
-            expect(serverless.isLocalStub).to.be.true;
-          })
-        ));
-    });
-  });
-
-  describe('When local version not available', () => {
-    it('Should run without notice', () =>
-      runServerless({ fixture: 'aws', command: 'print', modulesCacheStub: {} }).then(
-        ({ serverless }) => {
-          expect(Array.from(serverless.triggeredDeprecations)).to.deep.equal([]);
-          expect(serverless._isInvokedByGlobalInstallation).to.be.false;
-          expect(serverless.isLocallyInstalled).to.be.false;
-          expect(serverless.isLocalStub).to.not.exist;
-        }
-      ));
-  });
-
-  describe('When .env file is available', () => {
-    let serviceDir;
-
-    before(async () => {
-      serviceDir = (
-        await fixtures.setup('function', {
-          configExt: {
-            useDotenv: true,
-            custom: {
-              fromDefaultEnv: '${env:DEFAULT_ENV_VARIABLE}',
-              fromStageEnv: '${env:STAGE_ENV_VARIABLE}',
-            },
-          },
-        })
-      ).servicePath;
-
-      const defaultFileContent = 'DEFAULT_ENV_VARIABLE=valuefromdefault';
-      await fs.promises.writeFile(path.join(serviceDir, '.env'), defaultFileContent);
-      conditionallyLoadDotenv.clear();
-    });
-
-    it('Should load environment variables from default .env file if no matching stage', async () => {
-      const result = await runServerless({
-        cwd: serviceDir,
-        command: 'package',
-        shouldUseLegacyVariablesResolver: true,
-      });
-
-      expect(result.serverless.service.custom.fromDefaultEnv).to.equal('valuefromdefault');
-      expect(result.serverless.service.custom.fromStageEnv).to.be.undefined;
-    });
-  });
-
-  describe('Legacy API interface', () => {
-    let serverless;
-
-    before(async () => {
-      ({ serverless } = await runServerless({
-        fixture: 'aws',
-        command: 'package',
-      }));
-    });
-
-    it('Ensure that instance is setup', async () => {
-      expect(serverless.variables).to.have.property('variableSyntax');
-    });
-
-    it('Ensure config.servicePath', async () => {
-      expect(serverless.config).to.have.property('servicePath');
-    });
-  });
-});
diff --git a/test/unit/lib/aws/has-local-credentials.test.js b/test/unit/lib/aws/has-local-credentials.test.js
new file mode 100644
index 00000000000..644a24d1509
--- /dev/null
+++ b/test/unit/lib/aws/has-local-credentials.test.js
@@ -0,0 +1,82 @@
+'use strict';
+
+const chai = require('chai');
+const overrideEnv = require('process-utils/override-env');
+const requireUncached = require('ncjsm/require-uncached');
+const path = require('path');
+const fse = require('fs-extra');
+
+const { expect } = chai;
+
+describe('test/unit/lib/aws/has-local-credentials.test.js', () => {
+  const accessKeyId = 'AKIAIOSFODNN7EXAMPLE';
+  const secretAccessKey = 'wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY';
+
+  describe('In environment credentials', () => {
+    let restoreEnv;
+    let uncachedHasLocalCredentials;
+
+    before(() => {
+      ({ restoreEnv } = overrideEnv({ asCopy: true }));
+      process.env.AWS_ACCESS_KEY_ID = accessKeyId;
+      process.env.AWS_SECRET_ACCESS_KEY = secretAccessKey;
+      uncachedHasLocalCredentials = requireUncached(() =>
+        require('../../../../lib/aws/has-local-credentials')
+      );
+    });
+
+    after(() => restoreEnv);
+
+    it('Should properly detect credentials', () => {
+      expect(uncachedHasLocalCredentials()).to.equal(true);
+    });
+  });
+
+  describe('With profile in `.aws`', () => {
+    let credentialsDirPath;
+    let credentialsFilePath;
+    let uncachedHasLocalCredentials;
+
+    before(async () => {
+      credentialsDirPath = path.resolve('.aws');
+      credentialsFilePath = path.join(credentialsDirPath, 'credentials');
+      await fse.outputFile(
+        credentialsFilePath,
+        [
+          '[default]',
+          `aws_access_key_id = ${accessKeyId}`,
+          `aws_secret_access_key = ${secretAccessKey}`,
+        ].join('\n')
+      );
+      uncachedHasLocalCredentials = requireUncached(() =>
+        require('../../../../lib/aws/has-local-credentials')
+      );
+    });
+
+    after(async () => fse.remove(credentialsDirPath));
+
+    it('Should properly detect credentials', () => {
+      expect(uncachedHasLocalCredentials()).to.equal(true);
+    });
+  });
+
+  describe('Without credentials in `.aws` or in env', () => {
+    let restoreEnv;
+    let uncachedHasLocalCredentials;
+
+    before(() => {
+      ({ restoreEnv } = overrideEnv({ asCopy: true }));
+      delete process.env.AWS_ACCESS_KEY_ID;
+      delete process.env.AWS_SECRET_ACCESS_KEY;
+      uncachedHasLocalCredentials = requireUncached(() =>
+        require('../../../../lib/aws/has-local-credentials')
+      );
+    });
+
+    after(() => restoreEnv);
+
+    it('Should properly report lack of credentials', () => {
+      expect(uncachedHasLocalCredentials()).to.equal(false);
+    });
+  });
+});
diff --git a/test/unit/lib/aws/request.test.js b/test/unit/lib/aws/request.test.js
index 737904163d2..2cca7960fde 100644
--- a/test/unit/lib/aws/request.test.js
+++ b/test/unit/lib/aws/request.test.js
@@ -14,11 +14,10 @@ describe('#request', () => {
   it('should enable aws logging when debug log is enabled', () => {
     const configStub = sinon.stub();
     overrideEnv(() => {
-      process.env.SLS_DEBUG = true;
       proxyquire('../../../../lib/aws/request', {
         'aws-sdk': { config: configStub },
       });
-      expect(typeof configStub.logger).to.equal('function');
+      expect(typeof configStub.logger.log).to.equal('function');
     });
   });
 
@@ -40,7 +39,6 @@ describe('#request', () => {
     });
 
     it('should produce a meaningful error when no supported credentials are provided', async () => {
-      process.env.SLS_DEBUG = true;
       const awsRequest = require('../../../../lib/aws/request');
       return expect(
         awsRequest(
@@ -53,9 +51,7 @@ describe('#request', () => {
             Key: 'test-key',
           }
         )
-      ).to.be.rejectedWith(
-        'AWS provider credentials not found. Learn how to set up AWS provider credentials in our docs here: <\u001b[32mhttp://slss.io/aws-creds-setup\u001b[39m>.'
-      );
+      ).to.be.eventually.rejected.and.have.property('code', 'AWS_CREDENTIALS_NOT_FOUND');
     });
 
     it('should support passing params without credentials', async () => {
@@ -72,9 +68,7 @@ describe('#request', () => {
             Key: 'test-key',
           }
         )
-      ).to.be.rejectedWith(
-        'AWS provider credentials not found. Learn how to set up AWS provider credentials in our docs here: <\u001b[32mhttp://slss.io/aws-creds-setup\u001b[39m>.'
-      );
+      ).to.be.rejectedWith('AWS provider credentials not found.');
     });
   });
 
@@ -205,7 +199,7 @@ describe('#request', () => {
       expect(sendFake.promise).to.have.been.calledTwice;
     });
 
-    it('should not retry if error code is 403 and retryable is set to true', async () => {
+    it('should not retry if status code is 403 and retryable is set to true', async () => {
       const error = {
         providerError: {
           statusCode: 403,
@@ -231,13 +225,64 @@ describe('#request', () => {
       return expect(sendFake.promise).to.have.been.calledOnce;
     });
 
-    it('should expose non-retryable errors', () => {
+    it('should not retry if error code is ExpiredTokenException and retryable is set to true', async () => {
+      const error = {
+        providerError: {
+          statusCode: 400,
+          retryable: true,
+          code: 'ExpiredTokenException',
+          message: 'Testing retry',
+        },
+      };
+      const sendFake = {
+        promise: sinon.stub(),
+      };
+      sendFake.promise.onFirstCall().rejects(error);
+      sendFake.promise.onSecondCall().resolves({});
+      class FakeS3 {
+        error() {
+          return sendFake;
+        }
+      }
+      const awsRequest = proxyquire('../../../../lib/aws/request', {
+        'aws-sdk': { S3: FakeS3 },
+      });
+      expect(awsRequest({ name: 'S3' }, 'error')).to.be.rejected;
+      return expect(sendFake.promise).to.have.been.calledOnce;
+    });
+
+    it('should expose non-retryable errors', async () => {
       const error = {
         statusCode: 500,
         message: 'Some error message',
+        code: 'SomeError',
       };
       class FakeS3 {
-        error() {
+        test() {
+          return {
+            promise: async () => {
+              throw error;
+            },
+          };
+        }
+      }
+      const awsRequest = proxyquire('../../../../lib/aws/request', {
+        'aws-sdk': { S3: FakeS3 },
+      });
+      await expect(awsRequest({ name: 'S3' }, 'test')).to.eventually.be.rejected.and.have.property(
+        'code',
+        'AWS_S3_TEST_SOME_ERROR'
+      );
+    });
+
+    it('should handle numeric error codes', async () => {
+      const error = {
+        statusCode: 500,
+        message: 'Some error message',
+        code: 500,
+      };
+      class FakeS3 {
+        test() {
           return {
             promise: async () => {
               throw error;
@@ -248,7 +293,10 @@ describe('#request', () => {
       const awsRequest = proxyquire('../../../../lib/aws/request', {
         'aws-sdk': { S3: FakeS3 },
       });
-      return expect(awsRequest({ name: 'S3' }, 'error')).to.be.rejected;
+      await expect(awsRequest({ name: 'S3' }, 'test')).to.eventually.be.rejected.and.have.property(
+        'code',
+        'AWS_S3_TEST_HTTP_500_ERROR'
+      );
     });
   });
 
diff --git a/test/unit/lib/classes/CLI.test.js b/test/unit/lib/classes/CLI.test.js
deleted file mode 100644
index 44cd1d5187f..00000000000
--- a/test/unit/lib/classes/CLI.test.js
+++ /dev/null
@@ -1,176 +0,0 @@
-'use strict';
-
-const chai = require('chai');
-const sinon = require('sinon');
-const CLI = require('../../../../lib/classes/CLI');
-const overrideArgv = require('process-utils/override-argv');
-const stripAnsi = require('strip-ansi');
-const Serverless = require('../../../../lib/Serverless');
-const resolveInput = require('../../../../lib/cli/resolve-input');
-
-const { expect } = chai;
-chai.use(require('sinon-chai'));
-
-describe('CLI', () => {
-  let cli;
-  let serverless;
-
-  beforeEach(() => {
-    serverless = new Serverless({});
-  });
-
-  describe('#constructor()', () => {
-    it('should set the serverless instance', () => {
-      cli = new CLI(serverless);
-      expect(cli.serverless).to.deep.equal(serverless);
-    });
-
-    it('should set an empty loadedPlugins array', () => {
-      cli = new CLI(serverless);
-      expect(cli.loadedPlugins.length).to.equal(0);
-    });
-  });
-
-  describe('#setLoadedPlugins()', () => {
-    it('should set the loadedPlugins array with the given plugin instances', () => {
-      class PluginMock {}
-
-      const pluginMock = new PluginMock();
-      const plugins = [pluginMock];
-
-      cli = new CLI(serverless);
-
-      cli.setLoadedPlugins(plugins);
-
-      expect(cli.loadedPlugins[0]).to.equal(pluginMock);
-    });
-  });
-
-  describe('#suppressLogIfPrintCommand()', () => {
-    let logStub;
-    let consoleLogStub;
-
-    beforeEach(() => {
-      logStub = sinon.stub();
-      consoleLogStub = sinon.stub();
-    });
-
-    it('should do nothing when no command is given', () => {
-      cli = new CLI(serverless);
-      cli.log = logStub;
-      cli.consoleLog = consoleLogStub;
-
-      cli.suppressLogIfPrintCommand({ commands: [], options: {} });
-      cli.log('logged');
-      cli.consoleLog('logged');
-
-      expect(logStub.calledOnce).to.equal(true);
-      expect(consoleLogStub.calledOnce).to.equal(true);
-    });
-
-    it('should do nothing when "print" is given with "--help"', () => {
-      cli = new CLI(serverless);
-      cli.log = logStub;
-      cli.consoleLog = consoleLogStub;
-
-      resolveInput.clear();
-      overrideArgv({ args: ['serverless', '--help'] }, () =>
-        cli.suppressLogIfPrintCommand({
-          commands: ['print'],
-          options: { help: true },
-        })
-      );
-      resolveInput.clear();
-      cli.log('logged');
-      cli.consoleLog('logged');
-
-      expect(logStub.calledOnce).to.equal(true);
-      expect(consoleLogStub.calledOnce).to.equal(true);
-    });
-
-    it('should do nothing when "print" is combined with other command.', () => {
-      cli = new CLI(serverless);
-      cli.log = logStub;
-      cli.consoleLog = consoleLogStub;
-
-      cli.suppressLogIfPrintCommand({ commands: ['other', 'print'], options: {} });
-      cli.log('logged');
-      cli.consoleLog('logged');
-
-      expect(logStub.calledOnce).to.equal(true);
-      expect(consoleLogStub.calledOnce).to.equal(true);
-    });
-
-    it('should suppress log when "print" is given', () => {
-      cli = new CLI(serverless);
-      cli.log = logStub;
-      cli.consoleLog = consoleLogStub;
-
-      cli.suppressLogIfPrintCommand({ commands: ['print'], options: {} });
-      cli.log('NOT LOGGED');
-      cli.consoleLog('logged');
-
-      expect(logStub.calledOnce).to.equal(false);
-      expect(consoleLogStub.calledOnce).to.equal(true);
-    });
-  });
-
-  describe('#log', () => {
-    let consoleLogSpy;
-
-    beforeEach(() => {
-      cli = new CLI(serverless);
-      consoleLogSpy = sinon.spy(cli, 'consoleLog');
-    });
-
-    afterEach(() => {
-      cli.consoleLog.restore();
-    });
-
-    it('should log messages', () => {
-      const msg = 'Hello World!';
-
-      cli.log(msg);
-
-      expect(consoleLogSpy.callCount).to.equal(1);
-      expect(stripAnsi(consoleLogSpy.firstCall.args[0])).to.equal('Serverless: Hello World!');
-    });
-
-    it('should support different entities', () => {
-      const msg = 'Hello World!';
-      const entity = 'Entity';
-
-      cli.log(msg, entity);
-
-      expect(consoleLogSpy.callCount).to.equal(1);
-      expect(stripAnsi(consoleLogSpy.firstCall.args[0])).to.equal('Entity: Hello World!');
-    });
-
-    // NOTE: Here we're just testing that it won't break
-    it('should support logging options', () => {
-      const msg = 'Hello World!';
-      const opts = {
-        color: 'orange',
-        bold: true,
-        underline: true,
-      };
-
-      cli.log(msg, 'Serverless', opts);
-
-      expect(consoleLogSpy.callCount).to.equal(1);
-      expect(stripAnsi(consoleLogSpy.firstCall.args[0])).to.equal('Serverless: Hello World!');
-    });
-
-    it('should ignore invalid logging options', () => {
-      const msg = 'Hello World!';
-      const opts = {
-        invalid: 'option',
-      };
-
-      cli.log(msg, 'Serverless', opts);
-
-      expect(consoleLogSpy.callCount).to.equal(1);
-      expect(stripAnsi(consoleLogSpy.firstCall.args[0])).to.equal('Serverless: Hello World!');
-    });
-  });
-});
diff --git a/test/unit/lib/classes/ConfigSchemaHandler/resolveDataPathSize.test.js b/test/unit/lib/classes/ConfigSchemaHandler/resolveDataPathSize.test.js
deleted file mode 100644
index 9bbd2ade9db..00000000000
--- a/test/unit/lib/classes/ConfigSchemaHandler/resolveDataPathSize.test.js
+++ /dev/null
@@ -1,18 +0,0 @@
-'use strict';
-
-const { expect } = require('chai');
-const resolveDataPathSize = require('../../../../../lib/classes/ConfigSchemaHandler/resolveDataPathSize');
-
-describe('#resolveDataPathSize', () => {
-  it('should count root property as 1', () => expect(resolveDataPathSize('.foo'), 1));
-  it('should recognize all deep litera properties', () =>
-    expect(resolveDataPathSize('.foo.bar.mar'), 3));
-  it('should recognize string property', () => expect(resolveDataPathSize(".foo['bar']"), 2));
-  it('should recognize multiple string property', () =>
-    expect(resolveDataPathSize(".foo['bar']['or']"), 3));
-  it('should recognize numeric property', () => expect(resolveDataPathSize('.foo[1]'), 2));
-  it('should recognize multiple numeric properties', () =>
-    expect(resolveDataPathSize('.foo[1][2]'), 3));
-  it('should recognize mixed multiple property notations', () =>
-    expect(resolveDataPathSize(".foo[1]['2'].elo['3'].bar[2].foo['2'][3]"), 10));
-});
diff --git a/test/unit/lib/classes/Error.test.js b/test/unit/lib/classes/Error.test.js
deleted file mode 100644
index ddd47cbeb10..00000000000
--- a/test/unit/lib/classes/Error.test.js
+++ /dev/null
@@ -1,18 +0,0 @@
-'use strict';
-
-const expect = require('chai').expect;
-const overrideStdoutWrite = require('process-utils/override-stdout-write');
-const { logWarning } = require('../../../../lib/classes/Error');
-
-describe('#logWarning()', () => {
-  it('should log warning and proceed', () => {
-    let stdoutData = '';
-    overrideStdoutWrite(
-      (data) => (stdoutData += data),
-      () => logWarning('a message')
-    );
-
-    expect(stdoutData).to.have.string('Serverless Warning');
-    expect(stdoutData).to.have.string('a message');
-  });
-});
diff --git a/test/unit/lib/classes/PromiseTracker.test.js b/test/unit/lib/classes/PromiseTracker.test.js
deleted file mode 100644
index e82702db8a7..00000000000
--- a/test/unit/lib/classes/PromiseTracker.test.js
+++ /dev/null
@@ -1,98 +0,0 @@
-'use strict';
-
-/* eslint-disable no-unused-expressions */
-
-const BbPromise = require('bluebird');
-const chai = require('chai');
-
-const PromiseTracker = require('../../../../lib/classes/PromiseTracker');
-
-chai.use(require('chai-as-promised'));
-
-const expect = chai.expect;
-
-/**
- * Mostly this class is tested by its use in peer ~/lib/classes/Variables.js
- *
- * Mostly, I'm creating coverage but if errors are discovered, coverage for the specific cases
- * can be created here.
- */
-describe('PromiseTracker', () => {
-  let promiseTracker;
-  beforeEach(() => {
-    promiseTracker = new PromiseTracker();
-  });
-  it('logs a warning without throwing', () => {
-    promiseTracker.add('foo', BbPromise.resolve(), '${foo:}');
-    promiseTracker.add('foo', BbPromise.delay(10), '${foo:}');
-    promiseTracker.report(); // shouldn't throw
-    return Promise.all(promiseTracker.getAll());
-  });
-  it('reports no promises when none have been added', () => {
-    expect(promiseTracker.getAll()).to.be.an('array').that.is.empty;
-    expect(promiseTracker.getPending()).to.be.an('array').that.is.empty;
-    expect(promiseTracker.getSettled()).to.be.an('array').that.is.empty;
-    expect(promiseTracker.getResolved()).to.be.an('array').that.is.empty;
-    expect(promiseTracker.getRejected()).to.be.an('array').that.is.empty;
-  });
-  it('reports the correct number of added promise statuses', () => {
-    let resolve;
-    const pending = new BbPromise((rslv) => {
-      resolve = rslv;
-    });
-    const resolved = BbPromise.resolve();
-    const rejected = BbPromise.reject('reason');
-    promiseTracker.add('pending', pending, '${pending:}');
-    promiseTracker.add('resolved', resolved, '${resolved:}');
-    promiseTracker.add('rejected', rejected, '${rejected:}');
-    resolved.state = 'resolved';
-    rejected.state = 'rejected';
-    return BbPromise.delay(1)
-      .then(() => {
-        const pendings = promiseTracker.getPending();
-        expect(pendings).to.be.an.instanceof(Array);
-        expect(pendings.length).to.equal(1);
-        expect(pendings[0]).to.equal(pending);
-        const settleds = promiseTracker.getSettled();
-        expect(settleds).to.be.an.instanceof(Array);
-        expect(settleds.length).to.equal(2);
-        expect(settleds).to.include(resolved);
-        expect(settleds).to.include(rejected);
-        const resolveds = promiseTracker.getResolved();
-        expect(resolveds).to.be.an.instanceof(Array);
-        expect(resolveds.length).to.equal(1);
-        expect(resolveds).to.include(resolved);
-        const rejecteds = promiseTracker.getRejected();
-        expect(rejecteds).to.be.an.instanceof(Array);
-        expect(rejecteds.length).to.equal(1);
-        expect(rejecteds).to.include(rejected);
-      })
-      .then(() => {
-        resolve();
-      });
-  });
-  it('reports and then clears tracked promises when stopped after reporting.', () => {
-    let resolve;
-    const pending = new BbPromise((rslv) => {
-      resolve = rslv;
-    });
-    const resolved = BbPromise.resolve();
-    const rejected = BbPromise.reject('reason');
-    promiseTracker.add('pending', pending, '${pending:}');
-    promiseTracker.add('resolved', resolved, '${resolved:}');
-    promiseTracker.add('rejected', rejected, '${rejected:}');
-    resolved.state = 'resolved';
-    rejected.state = 'rejected';
-    promiseTracker.reported = true;
-    return BbPromise.delay(1).then(() => {
-      const all = promiseTracker.getAll();
-      expect(all).to.be.an.instanceof(Array);
-      expect(all.length).to.equal(3);
-      promiseTracker.stop();
-      const stopped = promiseTracker.getAll();
-      expect(stopped).to.be.an.instanceof(Array);
-      expect(stopped.length).to.equal(0);
-      resolve();
-    });
-  });
-});
diff --git a/test/unit/lib/classes/Variables.test.js b/test/unit/lib/classes/Variables.test.js
deleted file mode 100644
index 5a098c9162b..00000000000
--- a/test/unit/lib/classes/Variables.test.js
+++ /dev/null
@@ -1,2918 +0,0 @@
-'use strict';
-
-/* eslint-disable no-unused-expressions */
-
-const BbPromise = require('bluebird');
-const chai = require('chai');
-const jc = require('json-cycle');
-const os = require('os');
-const path = require('path');
-const proxyquire = require('proxyquire');
-const sinon = require('sinon');
-const yaml = require('js-yaml');
-const _ = require('lodash');
-const overrideEnv = require('process-utils/override-env');
-
-const AwsProvider = require('../../../../lib/plugins/aws/provider');
-const fse = require('fs-extra');
-const Serverless = require('../../../../lib/Serverless');
-const slsError = require('../../../../lib/classes/Error');
-const Utils = require('../../../../lib/classes/Utils');
-const Variables = require('../../../../lib/classes/Variables');
-const ServerlessError = require('../../../../lib/serverless-error');
-const { getTmpDirPath } = require('../../../utils/fs');
-const skipOnDisabledSymlinksInWindows = require('@serverless/test/skip-on-disabled-symlinks-in-windows');
-const runServerless = require('../../../utils/run-serverless');
-
-BbPromise.longStackTraces(true);
-
-chai.use(require('chai-as-promised'));
-chai.use(require('sinon-chai'));
-
-chai.should();
-
-const expect = chai.expect;
-
-describe('Variables', () => {
-  let serverless;
-  let restoreEnv;
-
-  beforeEach(() => {
-    ({ restoreEnv } = overrideEnv());
-    serverless = new Serverless();
-  });
-
-  const afterCallback = () => restoreEnv();
-  afterEach(afterCallback);
-
-  describe('#constructor()', () => {
-    it('should attach serverless instance', () => {
-      const variablesInstance = new Variables(serverless);
-      expect(variablesInstance.serverless).to.equal(serverless);
-    });
-    it('should not set variableSyntax in constructor', () => {
-      const variablesInstance = new Variables(serverless);
-      expect(variablesInstance.variableSyntax).to.be.undefined;
-    });
-  });
-
-  describe('#loadVariableSyntax()', () => {
-    it('should set variableSyntax', () => {
-      // eslint-disable-next-line no-template-curly-in-string
-      serverless.service.provider.variableSyntax = '\\${{([ ~:a-zA-Z0-9._@\'",\\-\\/\\(\\)*?]+?)}}';
-      serverless.variables.loadVariableSyntax();
-      expect(serverless.variables.variableSyntax).to.be.a('RegExp');
-    });
-  });
-
-  describe('#populateService()', () => {
-    it('should remove problematic attributes bofore calling populateObjectImpl with the service', () => {
-      const prepopulateServiceStub = sinon
-        .stub(serverless.variables, 'prepopulateService')
-        .returns(BbPromise.resolve());
-      const populateObjectStub = sinon
-        .stub(serverless.variables, 'populateObjectImpl')
-        .callsFake((val) => {
-          expect(val).to.equal(serverless.service);
-          expect(val.provider.variableSyntax).to.be.undefined;
-          expect(val.serverless).to.be.undefined;
-          return BbPromise.resolve();
-        });
-      return serverless.variables
-        .populateService()
-        .should.be.fulfilled.then()
-        .finally(() => {
-          prepopulateServiceStub.restore();
-          populateObjectStub.restore();
-        });
-    });
-    it('should clear caches and remaining state *before* [pre]populating service', () => {
-      const prepopulateServiceStub = sinon
-        .stub(serverless.variables, 'prepopulateService')
-        .callsFake((val) => {
-          expect(serverless.variables.deep).to.eql([]);
-          expect(serverless.variables.tracker.getAll()).to.eql([]);
-          return BbPromise.resolve(val);
-        });
-      const populateObjectStub = sinon
-        .stub(serverless.variables, 'populateObjectImpl')
-        .callsFake((val) => {
-          expect(serverless.variables.deep).to.eql([]);
-          expect(serverless.variables.tracker.getAll()).to.eql([]);
-          return BbPromise.resolve(val);
-        });
-      serverless.variables.deep.push('${foo:}');
-      const prms = BbPromise.resolve('foo');
-      serverless.variables.tracker.add('foo:', prms, '${foo:}');
-      prms.state = 'resolved';
-      return serverless.variables
-        .populateService()
-        .should.be.fulfilled.then()
-        .finally(() => {
-          prepopulateServiceStub.restore();
-          populateObjectStub.restore();
-        });
-    });
-    it('should clear caches and remaining *after* [pre]populating service', () => {
-      const prepopulateServiceStub = sinon
-        .stub(serverless.variables, 'prepopulateService')
-        .callsFake((val) => {
-          serverless.variables.deep.push('${foo:}');
-          const promise = BbPromise.resolve(val);
-          serverless.variables.tracker.add('foo:', promise, '${foo:}');
-          promise.state = 'resolved';
-          return BbPromise.resolve();
-        });
-      const populateObjectStub = sinon
-        .stub(serverless.variables, 'populateObjectImpl')
-        .callsFake((val) => {
-          serverless.variables.deep.push('${bar:}');
-          const promise = BbPromise.resolve(val);
-          serverless.variables.tracker.add('bar:', promise, '${bar:}');
-          promise.state = 'resolved';
-          return BbPromise.resolve();
-        });
-      return serverless.variables
-        .populateService()
-        .should.be.fulfilled.then(() => {
-          expect(serverless.variables.deep).to.eql([]);
-          expect(serverless.variables.tracker.getAll()).to.eql([]);
-        })
-        .finally(() => {
-          prepopulateServiceStub.restore();
-          populateObjectStub.restore();
-        });
-    });
-  });
-
-  describe('fallback', () => {
-    describe('should fallback if ${self} syntax fail to populate but fallback is provided', () => {
-      [
-        { value: 'fallback123_*', description: 'regular ASCII characters' },
-        { value: 'hello+world^*$@(!', description: 'different ASCII characters' },
-        { value: '+++++', description: 'plus sign' },
-        { value: 'システム管理者*', description: 'japanese characters' },
-        { value: 'deす', description: 'mixed japanese ending' },
-        { value: 'でsu', description: 'mixed japanese leading' },
-        { value: 'suごi', description: 'mixed japanese middle' },
-        { value: '①⑴⒈⒜Ⓐⓐⓟ ..▉가Ὠ', description: 'random unicode' },
-      ].forEach((testCase) => {
-        it(testCase.description, () => {
-          serverless.variables.service.custom = {
-            settings: `\${self:nonExistent, "${testCase.value}"}`,
-          };
-          return serverless.variables.populateService().should.be.fulfilled.then((result) => {
-            expect(result.custom).to.be.deep.eql({
-              settings: testCase.value,
-            });
-          });
-        });
-      });
-    });
-
-    it('should fallback if ${opt} syntax fail to populate but fallback is provided', () => {
-      serverless.variables.service.custom = {
-        settings: '${opt:nonExistent, "fallback"}',
-      };
-      return serverless.variables.populateService().should.be.fulfilled.then((result) => {
-        expect(result.custom).to.be.deep.eql({
-          settings: 'fallback',
-        });
-      });
-    });
-
-    it('should fallback if ${env} syntax fail to populate but fallback is provided', () => {
-      serverless.variables.service.custom = {
-        settings: '${env:nonExistent, "fallback"}',
-      };
-      return serverless.variables.populateService().should.be.fulfilled.then((result) => {
-        expect(result.custom).to.be.deep.eql({
-          settings: 'fallback',
-        });
-      });
-    });
-
-    describe('file syntax', () => {
-      it('should fallback if file does not exist but fallback is provided', () => {
-        serverless.variables.service.custom = {
-          settings: '${file(~/config.yml):xyz, "fallback"}',
-        };
-
-        const fileExistsStub = sinon.stub(serverless.utils, 'fileExistsSync').returns(false);
-        const realpathSync = sinon.stub(fse, 'realpathSync').returns(`${os.homedir()}/config.yml`);
-
-        return serverless.variables
-          .populateService()
-          .should.be.fulfilled.then((result) => {
-            expect(result.custom).to.be.deep.eql({
-              settings: 'fallback',
-            });
-          })
-          .finally(() => {
-            fileExistsStub.restore();
-            realpathSync.restore();
-          });
-      });
-
-      it('should fallback if file exists but given key not found and fallback is provided', () => {
-        serverless.variables.service.custom = {
-          settings: '${file(~/config.yml):xyz, "fallback"}',
-        };
-
-        const fileExistsStub = sinon.stub(serverless.utils, 'fileExistsSync').returns(true);
-        const realpathSync = sinon.stub(fse, 'realpathSync').returns(`${os.homedir()}/config.yml`);
-        const readFileSyncStub = sinon.stub(serverless.utils, 'readFileSync').returns({
-          test: 1,
-          test2: 'test2',
-        });
-
-        return serverless.variables
-          .populateService()
-          .should.be.fulfilled.then((result) => {
-            expect(result.custom).to.be.deep.eql({
-              settings: 'fallback',
-            });
-          })
-          .finally(() => {
-            fileExistsStub.restore();
-            realpathSync.restore();
-            readFileSyncStub.restore();
-          });
-      });
-    });
-
-    describe('ensure unique instances', () => {
-      it('should not produce same instances for same variable patters used more than once', () => {
-        serverless.variables.service.custom = {
-          settings1: '${file(~/config.yml)}',
-          settings2: '${file(~/config.yml)}',
-        };
-
-        const fileExistsStub = sinon.stub(serverless.utils, 'fileExistsSync').returns(true);
-        const realpathSync = sinon.stub(fse, 'realpathSync').returns(`${os.homedir()}/config.yml`);
-        const readFileSyncStub = sinon.stub(serverless.utils, 'readFileSync').returns({
-          test: 1,
-          test2: 'test2',
-        });
-
-        return serverless.variables
-          .populateService()
-          .should.be.fulfilled.then((result) => {
-            expect(result.custom.settings1).to.not.equal(result.custom.settings2);
-          })
-          .finally(() => {
-            fileExistsStub.restore();
-            realpathSync.restore();
-            readFileSyncStub.restore();
-          });
-      });
-    });
-
-    describe('aws-specific syntax', () => {
-      let awsProvider;
-      let requestStub;
-      beforeEach(() => {
-        awsProvider = new AwsProvider(serverless, {});
-        requestStub = sinon
-          .stub(awsProvider, 'request')
-          .callsFake(() => BbPromise.reject(new ServerlessError('Not found.', 400)));
-      });
-      afterEach(() => {
-        requestStub.restore();
-      });
-      it('should fallback if ${s3} syntax fail to populate but fallback is provided', () => {
-        serverless.variables.service.custom = {
-          settings: '${s3:bucket/key, "fallback"}',
-        };
-        return serverless.variables.populateService().should.be.fulfilled.then((result) => {
-          expect(result.custom).to.be.deep.eql({
-            settings: 'fallback',
-          });
-        });
-      });
-
-      it('should fallback if ${cf} syntax fail to populate but fallback is provided', () => {
-        serverless.variables.service.custom = {
-          settings: '${cf:stack.value, "fallback"}',
-        };
-        return serverless.variables.populateService().should.be.fulfilled.then((result) => {
-          expect(result.custom).to.be.deep.eql({
-            settings: 'fallback',
-          });
-        });
-      });
-
-      it('should fallback if ${ssm} syntax fail to populate but fallback is provided', () => {
-        serverless.variables.service.custom = {
-          settings: '${ssm:/path/param, "fallback"}',
-        };
-        return serverless.variables.populateService().should.be.fulfilled.then((result) => {
-          expect(result.custom).to.be.deep.eql({
-            settings: 'fallback',
-          });
-        });
-      });
-
-      it('should throw an error if fallback fails too', () => {
-        serverless.variables.service.custom = {
-          settings: '${s3:bucket/key, ${ssm:/path/param}}',
-        };
-        return serverless.variables.populateService().should.be.rejected;
-      });
-    });
-  });
-
-  describe('#prepopulateService', () => {
-    // TL;DR: call populateService to test prepopulateService (note addition of 'pre')
-    //
-    // The prepopulateService resolver basically assumes invocation of of populateService (i.e. that
-    // variable syntax is loaded, and that the service object is cleaned up.  Just use
-    // populateService to do that work.
-    let awsProvider;
-    let populateObjectImplStub;
-    let requestStub; // just in case... don't want to actually call...
-    beforeEach(() => {
-      awsProvider = new AwsProvider(serverless, {});
-      populateObjectImplStub = sinon.stub(serverless.variables, 'populateObjectImpl');
-      populateObjectImplStub.withArgs(serverless.variables.service).returns(BbPromise.resolve());
-      requestStub = sinon
-        .stub(awsProvider, 'request')
-        .callsFake(() => BbPromise.reject(new Error('unexpected')));
-    });
-    afterEach(() => {
-      populateObjectImplStub.restore();
-      requestStub.restore();
-    });
-    const prepopulatedProperties = [
-      { name: 'region', getter: (provider) => provider.getRegion() },
-      { name: 'stage', getter: (provider) => provider.getStage() },
-      { name: 'profile', getter: (provider) => provider.getProfile() },
-    ];
-    describe('basic population tests', () => {
-      prepopulatedProperties.forEach((property) => {
-        it(`should populate variables in ${property.name} values`, () => {
-          _.set(
-            awsProvider.serverless.service.provider,
-            property.name,
-            '${self:foobar, "default"}'
-          );
-          return serverless.variables
-            .populateService()
-            .should.be.fulfilled.then(() =>
-              expect(property.getter(awsProvider)).to.be.eql('default')
-            );
-        });
-      });
-    });
-    //
-    describe('dependent service rejections', () => {
-      const dependentConfigs = [
-        { value: '${cf:stack.value}', name: 'CloudFormation' },
-        { value: '${s3:bucket/key}', name: 'S3' },
-        { value: '${ssm:/path/param}', name: 'SSM' },
-      ];
-      prepopulatedProperties.forEach((property) => {
-        dependentConfigs.forEach((config) => {
-          it(`should reject ${config.name} variables in ${property.name} values`, () => {
-            _.set(awsProvider.serverless.service.provider, property.name, config.value);
-            return serverless.variables
-              .populateService()
-              .should.be.rejectedWith('Variable dependency failure');
-          });
-          it(`should reject recursively dependent ${config.name} service dependencies`, () => {
-            serverless.variables.service.custom = {
-              settings: config.value,
-            };
-            awsProvider.serverless.service.provider.region = '${self:custom.settings.region}';
-            return serverless.variables
-              .populateService()
-              .should.be.rejectedWith('Variable dependency failure');
-          });
-        });
-      });
-    });
-    describe('dependent service non-interference', () => {
-      const stateCombinations = [
-        { region: 'foo', state: 'bar' },
-        { region: 'foo', state: '${self:bar, "bar"}' },
-        { region: '${self:foo, "foo"}', state: 'bar' },
-        { region: '${self:foo, "foo"}', state: '${self:bar, "bar"}' },
-      ];
-      stateCombinations.forEach((combination) => {
-        it('must leave the dependent services in their original state', () => {
-          const dependentMethods = [
-            { name: 'getValueFromCf', original: serverless.variables.getValueFromCf },
-            { name: 'getValueFromS3', original: serverless.variables.getValueFromS3 },
-            { name: 'getValueFromSsm', original: serverless.variables.getValueFromSsm },
-          ];
-          awsProvider.serverless.service.provider.region = combination.region;
-          awsProvider.serverless.service.provider.state = combination.state;
-          return serverless.variables.populateService().should.be.fulfilled.then(() => {
-            dependentMethods.forEach((method) => {
-              expect(serverless.variables[method.name]).to.equal(method.original);
-            });
-          });
-        });
-      });
-    });
-  });
-
-  describe('#getProperties', () => {
-    it('extracts all terminal properties of an object', () => {
-      const date = new Date();
-      const regex = /^.*$/g;
-      const func = () => {};
-      const obj = {
-        foo: {
-          bar: 'baz',
-          biz: 'buz',
-        },
-        b: [{ c: 'd' }, { e: 'f' }],
-        g: date,
-        h: regex,
-        i: func,
-      };
-      const expected = [
-        { path: ['foo', 'bar'], value: 'baz' },
-        { path: ['foo', 'biz'], value: 'buz' },
-        { path: ['b', 0, 'c'], value: 'd' },
-        { path: ['b', 1, 'e'], value: 'f' },
-        { path: ['g'], value: date },
-        { path: ['h'], value: regex },
-        { path: ['i'], value: func },
-      ];
-      const result = serverless.variables.getProperties(obj, true, obj);
-      expect(result).to.eql(expected);
-    });
-    it('ignores self references', () => {
-      const obj = {};
-      obj.self = obj;
-      const expected = [];
-      const result = serverless.variables.getProperties(obj, true, obj);
-      expect(result).to.eql(expected);
-    });
-  });
-
-  describe('#populateObject()', () => {
-    beforeEach(() => {
-      serverless.variables.loadVariableSyntax();
-    });
-    it('should populate object and return it', () => {
-      const object = {
-        stage: '${opt:stage}',
-      };
-      const expectedPopulatedObject = {
-        stage: 'prod',
-      };
-
-      sinon.stub(serverless.variables, 'populateValue').resolves('prod');
-
-      return serverless.variables
-        .populateObject(object)
-        .then((populatedObject) => {
-          expect(populatedObject).to.deep.equal(expectedPopulatedObject);
-        })
-        .finally(() => serverless.variables.populateValue.restore());
-    });
-
-    it('should persist keys with dot notation', () => {
-      const object = {
-        stage: '${opt:stage}',
-      };
-      object['some.nested.key'] = 'hello';
-      const expectedPopulatedObject = {
-        stage: 'prod',
-      };
-      expectedPopulatedObject['some.nested.key'] = 'hello';
-      const populateValueStub = sinon.stub(serverless.variables, 'populateValue').callsFake(
-        // eslint-disable-next-line no-template-curly-in-string
-        (val) => {
-          return val === '${opt:stage}' ? BbPromise.resolve('prod') : BbPromise.resolve(val);
-        }
-      );
-      return serverless.variables
-        .populateObject(object)
-        .should.become(expectedPopulatedObject)
-        .then()
-        .finally(() => populateValueStub.restore());
-    });
-    describe('significant variable usage corner cases', () => {
-      let service;
-      const makeDefault = () => ({
-        service: 'my-service',
-        provider: {
-          name: 'aws',
-        },
-      });
-      beforeEach(() => {
-        service = makeDefault();
-        // eslint-disable-next-line no-template-curly-in-string
-        service.provider.variableSyntax = '\\${([ ~:a-zA-Z0-9._@\'",\\-\\/\\(\\)*?]+?)}'; // default
-        serverless.variables.service = service;
-        serverless.variables.loadVariableSyntax();
-        delete service.provider.variableSyntax;
-      });
-      it('should properly replace self-references', () => {
-        service.custom = {
-          me: '${self:}',
-        };
-        const expected = makeDefault();
-        expected.custom = {
-          me: expected,
-        };
-        return expect(
-          serverless.variables.populateObject(service).then((result) => {
-            expect(jc.stringify(result)).to.eql(jc.stringify(expected));
-          })
-        ).to.be.fulfilled;
-      });
-      it('should properly populate embedded variables', () => {
-        service.custom = {
-          val0: 'my value 0',
-          val1: '0', // eslint-disable-next-line no-template-curly-in-string
-          val2: '${self:custom.val${self:custom.val1}}',
-        };
-        const expected = {
-          val0: 'my value 0',
-          val1: '0',
-          val2: 'my value 0',
-        };
-        return expect(
-          serverless.variables.populateObject(service.custom).then((result) => {
-            expect(result).to.eql(expected);
-          })
-        ).to.be.fulfilled;
-      });
-      it('should properly populate an overwrite with a default value that is a string', () => {
-        service.custom = {
-          val0: 'my value', // eslint-disable-next-line no-template-curly-in-string
-          val1: '${self:custom.NOT_A_VAL1, self:custom.NOT_A_VAL2, "string"}',
-        };
-        const expected = {
-          val0: 'my value',
-          val1: 'string',
-        };
-        return expect(
-          serverless.variables.populateObject(service.custom).then((result) => {
-            expect(result).to.eql(expected);
-          })
-        ).to.be.fulfilled;
-      });
-      it('should properly populate an overwrite with a default value that is the string *', () => {
-        service.custom = {
-          val0: 'my value', // eslint-disable-next-line no-template-curly-in-string
-          val1: '${self:custom.NOT_A_VAL1, self:custom.NOT_A_VAL2, "*"}',
-        };
-        const expected = {
-          val0: 'my value',
-          val1: '*',
-        };
-        return expect(
-          serverless.variables.populateObject(service.custom).then((result) => {
-            expect(result).to.eql(expected);
-          })
-        ).to.be.fulfilled;
-      });
-      it('should properly populate an overwrite with a default value that is a string w/*', () => {
-        service.custom = {
-          val0: 'my value', // eslint-disable-next-line no-template-curly-in-string
-          val1: '${self:custom.NOT_A_VAL1, self:custom.NOT_A_VAL2, "foo*"}',
-        };
-        const expected = {
-          val0: 'my value',
-          val1: 'foo*',
-        };
-        return expect(
-          serverless.variables.populateObject(service.custom).then((result) => {
-            expect(result).to.eql(expected);
-          })
-        ).to.be.fulfilled;
-      });
-      it('should properly populate overwrites where the first value is valid', () => {
-        service.custom = {
-          val0: 'my value', // eslint-disable-next-line no-template-curly-in-string
-          val1: '${self:custom.val0, self:custom.NOT_A_VAL1, self:custom.NOT_A_VAL2}',
-        };
-        const expected = {
-          val0: 'my value',
-          val1: 'my value',
-        };
-        return expect(
-          serverless.variables.populateObject(service.custom).then((result) => {
-            expect(result).to.eql(expected);
-          })
-        ).to.be.fulfilled;
-      });
-      it('should do nothing useful on * when not wrapped in quotes', () => {
-        service.custom = {
-          val0: '${self:custom.*}',
-        };
-        const expected = { val0: undefined };
-        return expect(
-          serverless.variables.populateObject(service.custom).then((result) => {
-            expect(result).to.eql(expected);
-          })
-        ).to.be.fulfilled;
-      });
-      it('should properly populate overwrites where the middle value is valid', () => {
-        service.custom = {
-          val0: 'my value', // eslint-disable-next-line no-template-curly-in-string
-          val1: '${self:custom.NOT_A_VAL1, self:custom.val0, self:custom.NOT_A_VAL2}',
-        };
-        const expected = {
-          val0: 'my value',
-          val1: 'my value',
-        };
-        return expect(
-          serverless.variables.populateObject(service.custom).then((result) => {
-            expect(result).to.eql(expected);
-          })
-        ).to.be.fulfilled;
-      });
-      it('should properly populate overwrites where the last value is valid', () => {
-        service.custom = {
-          val0: 'my value', // eslint-disable-next-line no-template-curly-in-string
-          val1: '${self:custom.NOT_A_VAL1, self:custom.NOT_A_VAL2, self:custom.val0}',
-        };
-        const expected = {
-          val0: 'my value',
-          val1: 'my value',
-        };
-        return expect(
-          serverless.variables.populateObject(service.custom).then((result) => {
-            expect(result).to.eql(expected);
-          })
-        ).to.be.fulfilled;
-      });
-      it('should properly populate overwrites with nested variables in the first value', () => {
-        service.custom = {
-          val0: 'my value',
-          val1: 0, // eslint-disable-next-line no-template-curly-in-string
-          val2: '${self:custom.val${self:custom.val1}, self:custom.NO_1, self:custom.NO_2}',
-        };
-        const expected = {
-          val0: 'my value',
-          val1: 0,
-          val2: 'my value',
-        };
-        return expect(
-          serverless.variables.populateObject(service.custom).then((result) => {
-            expect(result).to.eql(expected);
-          })
-        ).to.be.fulfilled;
-      });
-      it('should properly populate overwrites with nested variables in the middle value', () => {
-        service.custom = {
-          val0: 'my value',
-          val1: 0, // eslint-disable-next-line no-template-curly-in-string
-          val2: '${self:custom.NO_1, self:custom.val${self:custom.val1}, self:custom.NO_2}',
-        };
-        const expected = {
-          val0: 'my value',
-          val1: 0,
-          val2: 'my value',
-        };
-        return expect(
-          serverless.variables.populateObject(service.custom).then((result) => {
-            expect(result).to.eql(expected);
-          })
-        ).to.be.fulfilled;
-      });
-      it('should properly populate overwrites with nested variables in the last value', () => {
-        service.custom = {
-          val0: 'my value',
-          val1: 0, // eslint-disable-next-line no-template-curly-in-string
-          val2: '${self:custom.NO_1, self:custom.NO_2, self:custom.val${self:custom.val1}}',
-        };
-        const expected = {
-          val0: 'my value',
-          val1: 0,
-          val2: 'my value',
-        };
-        return expect(
-          serverless.variables.populateObject(service.custom).then((result) => {
-            expect(result).to.eql(expected);
-          })
-        ).to.be.fulfilled;
-      });
-      it('should properly replace duplicate variable declarations', () => {
-        service.custom = {
-          val0: 'my value',
-          val1: '${self:custom.val0}',
-          val2: '${self:custom.val0}',
-        };
-        const expected = {
-          val0: 'my value',
-          val1: 'my value',
-          val2: 'my value',
-        };
-        return expect(
-          serverless.variables.populateObject(service.custom).then((result) => {
-            expect(result).to.eql(expected);
-          })
-        ).to.be.fulfilled;
-      });
-      it('should recursively populate, regardless of order and duplication', () => {
-        service.custom = {
-          val1: '${self:custom.depVal}',
-          depVal: '${self:custom.val0}',
-          val0: 'my value',
-          val2: '${self:custom.depVal}',
-        };
-        const expected = {
-          val1: 'my value',
-          depVal: 'my value',
-          val0: 'my value',
-          val2: 'my value',
-        };
-        return expect(
-          serverless.variables.populateObject(service.custom).then((result) => {
-            expect(result).to.eql(expected);
-          })
-        ).to.be.fulfilled;
-      });
-      // see https://github.com/serverless/serverless/pull/4713#issuecomment-366975172
-      it('should handle deep references into deep variables', () => {
-        service.provider.stage = 'dev';
-        service.custom = {
-          stage: '${env:stage, self:provider.stage}',
-          secrets: '${self:custom.${self:custom.stage}}',
-          dev: {
-            SECRET: 'secret',
-          },
-          environment: {
-            SECRET: '${self:custom.secrets.SECRET}',
-          },
-        };
-        const expected = {
-          stage: 'dev',
-          secrets: {
-            SECRET: 'secret',
-          },
-          dev: {
-            SECRET: 'secret',
-          },
-          environment: {
-            SECRET: 'secret',
-          },
-        };
-        return serverless.variables.populateObject(service.custom).should.become(expected);
-      });
-      it('should handle deep variables that reference overrides', () => {
-        service.custom = {
-          val1: '${self:not.a.value, "bar"}',
-          val2: '${self:custom.val1}',
-        };
-        const expected = {
-          val1: 'bar',
-          val2: 'bar',
-        };
-        return serverless.variables.populateObject(service.custom).should.become(expected);
-      });
-      it('should handle deep references into deep variables', () => {
-        service.custom = {
-          val0: {
-            foo: 'bar',
-          },
-          val1: '${self:custom.val0}',
-          val2: '${self:custom.val1.foo}',
-        };
-        const expected = {
-          val0: {
-            foo: 'bar',
-          },
-          val1: {
-            foo: 'bar',
-          },
-          val2: 'bar',
-        };
-        return serverless.variables.populateObject(service.custom).should.become(expected);
-      });
-      it('should handle deep variables that reference overrides', () => {
-        service.custom = {
-          val1: '${self:not.a.value, "bar"}',
-          val2: 'foo${self:custom.val1}',
-        };
-        const expected = {
-          val1: 'bar',
-          val2: 'foobar',
-        };
-        return serverless.variables.populateObject(service.custom).should.become(expected);
-      });
-      it('should handle referenced deep variables that reference overrides', () => {
-        service.custom = {
-          val1: '${self:not.a.value, "bar"}',
-          val2: '${self:custom.val1}',
-          val3: '${self:custom.val2}',
-        };
-        const expected = {
-          val1: 'bar',
-          val2: 'bar',
-          val3: 'bar',
-        };
-        return serverless.variables.populateObject(service.custom).should.become(expected);
-      });
-      it('should handle partial referenced deep variables that reference overrides', () => {
-        service.custom = {
-          val1: '${self:not.a.value, "bar"}',
-          val2: '${self:custom.val1}',
-          val3: 'foo${self:custom.val2}',
-        };
-        const expected = {
-          val1: 'bar',
-          val2: 'bar',
-          val3: 'foobar',
-        };
-        return serverless.variables.populateObject(service.custom).should.become(expected);
-      });
-      it('should handle referenced contained deep variables that reference overrides', () => {
-        service.custom = {
-          val1: '${self:not.a.value, "bar"}',
-          val2: 'foo${self:custom.val1}',
-          val3: '${self:custom.val2}',
-        };
-        const expected = {
-          val1: 'bar',
-          val2: 'foobar',
-          val3: 'foobar',
-        };
-        return serverless.variables.populateObject(service.custom).should.become(expected);
-      });
-      it('should handle multiple referenced contained deep variables referencing overrides', () => {
-        service.custom = {
-          val0: '${self:not.a.value, "foo"}',
-          val1: '${self:not.a.value, "bar"}',
-          val2: '${self:custom.val0}:${self:custom.val1}',
-          val3: '${self:custom.val2}',
-        };
-        const expected = {
-          val0: 'foo',
-          val1: 'bar',
-          val2: 'foo:bar',
-          val3: 'foo:bar',
-        };
-        return serverless.variables.populateObject(service.custom).should.become(expected);
-      });
-      it('should handle overrides that are populated by unresolvable deep variables', () => {
-        service.custom = {
-          val0: 'foo',
-          val1: '${self:custom.val0}',
-          val2: '${self:custom.val1.notAnAttribute, "fallback"}',
-        };
-        const expected = {
-          val0: 'foo',
-          val1: 'foo',
-          val2: 'fallback',
-        };
-        return serverless.variables.populateObject(service.custom).should.become(expected);
-      });
-      it('should handle embedded deep variable replacements in overrides', () => {
-        service.custom = {
-          foo: 'bar',
-          val0: 'foo',
-          val1: '${self:custom.val0, "fallback 1"}',
-          val2: '${self:custom.${self:custom.val0, self:custom.val1}, "fallback 2"}',
-        };
-        const expected = {
-          foo: 'bar',
-          val0: 'foo',
-          val1: 'foo',
-          val2: 'bar',
-        };
-        return serverless.variables.populateObject(service.custom).should.become(expected);
-      });
-      it('should deal with overwites that reference embedded deep references', () => {
-        service.custom = {
-          val0: 'val',
-          val1: 'val0',
-          val2: '${self:custom.val1}',
-          val3: '${self:custom.${self:custom.val2}, "fallback"}',
-          val4: '${self:custom.val3, self:custom.val3}',
-        };
-        const expected = {
-          val0: 'val',
-          val1: 'val0',
-          val2: 'val0',
-          val3: 'val',
-          val4: 'val',
-        };
-        return serverless.variables.populateObject(service.custom).should.become(expected);
-      });
-      it('should preserve whitespace in double-quote literal fallback', () => {
-        service.custom = {
-          val0: '${self:custom.val, "rate(3 hours)"}',
-        };
-        const expected = {
-          val0: 'rate(3 hours)',
-        };
-        return serverless.variables.populateObject(service.custom).should.become(expected);
-      });
-      it('should preserve whitespace in single-quote literal fallback', () => {
-        service.custom = {
-          val0: "${self:custom.val, 'rate(1 hour)'}",
-        };
-        const expected = {
-          val0: 'rate(1 hour)',
-        };
-        return serverless.variables.populateObject(service.custom).should.become(expected);
-      });
-      it('should preserve question mark in single-quote literal fallback', () => {
-        service.custom = {
-          val0: "${self:custom.val, '?'}",
-        };
-        const expected = {
-          val0: '?',
-        };
-        return serverless.variables.populateObject(service.custom).should.become(expected);
-      });
-      it('should preserve question mark in single-quote literal fallback', () => {
-        service.custom = {
-          val0: "${self:custom.val, 'cron(0 0 * * ? *)'}",
-        };
-        const expected = {
-          val0: 'cron(0 0 * * ? *)',
-        };
-        return serverless.variables.populateObject(service.custom).should.become(expected);
-      });
-      it('should accept whitespace in variables', () => {
-        service.custom = {
-          val0: '${self: custom.val}',
-          val: 'foobar',
-        };
-        const expected = {
-          val: 'foobar',
-          val0: 'foobar',
-        };
-        return serverless.variables.populateObject(service.custom).should.become(expected);
-      });
-      it('should handle deep variables regardless of custom variableSyntax', () => {
-        service.provider.variableSyntax = '\\${{([ ~:a-zA-Z0-9._@\\\'",\\-\\/\\(\\)*?]+?)}}';
-        serverless.variables.loadVariableSyntax();
-        delete service.provider.variableSyntax;
-        service.custom = {
-          my0thStage: 'DEV',
-          my1stStage: '${{self:custom.my0thStage}}',
-          my2ndStage: '${{self:custom.my1stStage}}',
-        };
-        const expected = {
-          my0thStage: 'DEV',
-          my1stStage: 'DEV',
-          my2ndStage: 'DEV',
-        };
-        return serverless.variables.populateObject(service.custom).should.become(expected);
-      });
-      it('should handle deep variable continuations regardless of custom variableSyntax', () => {
-        service.provider.variableSyntax = '\\${{([ ~:a-zA-Z0-9._@\\\'",\\-\\/\\(\\)*?]+?)}}';
-        serverless.variables.loadVariableSyntax();
-        delete service.provider.variableSyntax;
-        service.custom = {
-          my0thStage: { we: 'DEV' },
-          my1stStage: '${{self:custom.my0thStage}}',
-          my2ndStage: '${{self:custom.my1stStage.we}}',
-        };
-        const expected = {
-          my0thStage: { we: 'DEV' },
-          my1stStage: { we: 'DEV' },
-          my2ndStage: 'DEV',
-        };
-        return serverless.variables.populateObject(service.custom).should.become(expected);
-      });
-      it('should handle deep variables regardless of recursion into custom variableSyntax', () => {
-        service.provider.variableSyntax = '\\${{([ ~:a-zA-Z0-9._@\\\'",\\-\\/\\(\\)*?]+?)}}';
-        serverless.variables.loadVariableSyntax();
-        delete service.provider.variableSyntax;
-        service.custom = {
-          my0thIndex: '0th',
-          my1stIndex: '1st',
-          my0thStage: 'DEV',
-          my1stStage: '${{self:custom.my${{self:custom.my0thIndex}}Stage}}',
-          my2ndStage: '${{self:custom.my${{self:custom.my1stIndex}}Stage}}',
-        };
-        const expected = {
-          my0thIndex: '0th',
-          my1stIndex: '1st',
-          my0thStage: 'DEV',
-          my1stStage: 'DEV',
-          my2ndStage: 'DEV',
-        };
-        return serverless.variables.populateObject(service.custom).should.become(expected);
-      });
-      it('should handle deep variables in complex recursions of custom variableSyntax', () => {
-        service.provider.variableSyntax = '\\${{([ ~:a-zA-Z0-9._@\\\'",\\-\\/\\(\\)*?]+?)}}';
-        serverless.variables.loadVariableSyntax();
-        delete service.provider.variableSyntax;
-        service.custom = {
-          i0: '0',
-          s0: 'DEV',
-          s1: '${{self:custom.s0}}! ${{self:custom.s0}}',
-          s2: 'I am a ${{self:custom.s0}}! A ${{self:custom.s${{self:custom.i0}}}}!',
-          s3: '${{self:custom.s0}}!, I am a ${{self:custom.s1}}!, ${{self:custom.s2}}',
-        };
-        const expected = {
-          i0: '0',
-          s0: 'DEV',
-          s1: 'DEV! DEV',
-          s2: 'I am a DEV! A DEV!',
-          s3: 'DEV!, I am a DEV! DEV!, I am a DEV! A DEV!',
-        };
-        return serverless.variables.populateObject(service.custom).should.become(expected);
-      });
-      describe('file reading cases', () => {
-        let tmpDirPath;
-        beforeEach(() => {
-          tmpDirPath = getTmpDirPath();
-          fse.mkdirsSync(tmpDirPath);
-          serverless.serviceDir = tmpDirPath;
-        });
-        afterEach(() => {
-          fse.removeSync(tmpDirPath);
-        });
-        const makeTempFile = (fileName, fileContent) => {
-          fse.outputFileSync(path.join(tmpDirPath, fileName), fileContent);
-        };
-        const asyncFileName = 'async.load.js';
-        const asyncContent = `'use strict';
-let i = 0
-const str = () => new Promise((resolve) => {
-  setTimeout(() => {
-    i += 1 // side effect
-    resolve(\`my-async-value-\${i}\`)
-  }, 200);
-});
-const obj = () => new Promise((resolve) => {
-  setTimeout(() => {
-    i += 1 // side effect
-    resolve({
-      val0: \`my-async-value-\${i}\`,
-      val1: '\${opt:stage}',
-    });
-  }, 200);
-});
-module.exports = {
-  str,
-  obj,
-};
-`;
-        it('should populate any given variable only once', () => {
-          makeTempFile(asyncFileName, asyncContent);
-          service.custom = {
-            val1: '${self:custom.val0}',
-            val2: '${self:custom.val1}',
-            val0: `\${file(${asyncFileName}):str}`,
-          };
-          const expected = {
-            val1: 'my-async-value-1',
-            val2: 'my-async-value-1',
-            val0: 'my-async-value-1',
-          };
-          return serverless.variables.populateObject(service.custom).should.become(expected);
-        });
-        it('should still work with a default file name in double or single quotes', () => {
-          makeTempFile(asyncFileName, asyncContent);
-          service.custom = {
-            val1: '${self:custom.val0}',
-            val2: '${self:custom.val1}',
-            val3: `\${file(\${self:custom.nonexistent, "${asyncFileName}"}):str}`,
-            val0: `\${file(\${self:custom.nonexistent, '${asyncFileName}'}):str}`,
-          };
-          const expected = {
-            val1: 'my-async-value-1',
-            val2: 'my-async-value-1',
-            val3: 'my-async-value-1',
-            val0: 'my-async-value-1',
-          };
-          return serverless.variables.populateObject(service.custom).should.become(expected);
-        });
-        it('should populate any given variable only once regardless of ordering or reference count', () => {
-          makeTempFile(asyncFileName, asyncContent);
-          service.custom = {
-            val9: '${self:custom.val7}',
-            val7: '${self:custom.val5}',
-            val5: '${self:custom.val3}',
-            val3: '${self:custom.val1}',
-            val1: '${self:custom.val0}',
-            val2: '${self:custom.val1}',
-            val4: '${self:custom.val3}',
-            val6: '${self:custom.val5}',
-            val8: '${self:custom.val7}',
-            val0: `\${file(${asyncFileName}):str}`,
-          };
-          const expected = {
-            val9: 'my-async-value-1',
-            val7: 'my-async-value-1',
-            val5: 'my-async-value-1',
-            val3: 'my-async-value-1',
-            val1: 'my-async-value-1',
-            val2: 'my-async-value-1',
-            val4: 'my-async-value-1',
-            val6: 'my-async-value-1',
-            val8: 'my-async-value-1',
-            val0: 'my-async-value-1',
-          };
-          return serverless.variables.populateObject(service.custom).should.become(expected);
-        });
-        it('should populate async objects with contained variables', () => {
-          makeTempFile(asyncFileName, asyncContent);
-          serverless.variables.options = {
-            stage: 'dev',
-          };
-          service.custom = {
-            obj: `\${file(${asyncFileName}):obj}`,
-          };
-          const expected = {
-            obj: {
-              val0: 'my-async-value-1',
-              val1: 'dev',
-            },
-          };
-          return serverless.variables.populateObject(service.custom).should.become(expected);
-        });
-        it("should populate variables from filesnames including '@',  e.g scoped npm packages", () => {
-          const fileName = `./node_modules/@scoped-org/${asyncFileName}`;
-          makeTempFile(fileName, asyncContent);
-          service.custom = {
-            val0: `\${file(${fileName}):str}`,
-          };
-          const expected = {
-            val0: 'my-async-value-1',
-          };
-          return serverless.variables.populateObject(service.custom).should.become(expected);
-        });
-        const selfFileName = 'self.yml';
-        const selfContent = `foo: baz
-bar: \${self:custom.self.foo}
-`;
-        it('should populate a "cyclic" reference across an unresolved dependency (issue #4687)', () => {
-          makeTempFile(selfFileName, selfContent);
-          service.custom = {
-            self: `\${file(${selfFileName})}`,
-          };
-          const expected = {
-            self: {
-              foo: 'baz',
-              bar: 'baz',
-            },
-          };
-          return serverless.variables.populateObject(service.custom).should.become(expected);
-        });
-        const emptyFileName = 'empty.js';
-        const emptyContent = `'use strict';
-module.exports = {
-  func: () => ({ value: 'a value' }),
-}
-`;
-        it('should reject population of an attribute not exported from a file', () => {
-          makeTempFile(emptyFileName, emptyContent);
-          service.custom = {
-            val: `\${file(${emptyFileName}):func.notAValue}`,
-          };
-          return serverless.variables
-            .populateObject(service.custom)
-            .should.be.rejectedWith(
-              ServerlessError,
-              'Invalid variable syntax when referencing file'
-            );
-        });
-      });
-    });
-  });
-
-  describe('#populateProperty()', () => {
-    beforeEach(() => {
-      serverless.variables.loadVariableSyntax();
-    });
-
-    it('should call overwrite if overwrite syntax provided', () => {
-      // eslint-disable-next-line no-template-curly-in-string
-      const property = 'my stage is ${opt:stage, self:provider.stage}';
-      serverless.variables.options = { stage: 'dev' };
-      serverless.service.provider.stage = 'prod';
-      return serverless.variables
-        .populateProperty(property)
-        .should.eventually.eql('my stage is dev');
-    });
-
-    it('should allow a single-quoted string if overwrite syntax provided', () => {
-      // eslint-disable-next-line no-template-curly-in-string
-      const property = "my stage is ${opt:stage, 'prod'}";
-      serverless.variables.options = {};
-      return serverless.variables
-        .populateProperty(property)
-        .should.eventually.eql('my stage is prod');
-    });
-
-    it('should allow a double-quoted string if overwrite syntax provided', () => {
-      // eslint-disable-next-line no-template-curly-in-string
-      const property = 'my stage is ${opt:stage, "prod"}';
-      serverless.variables.options = {};
-      return serverless.variables
-        .populateProperty(property)
-        .should.eventually.eql('my stage is prod');
-    });
-
-    it('should not allow partially double-quoted string', () => {
-      const property = '${opt:stage, prefix"prod"suffix}';
-      serverless.variables.options = {};
-      const handleUnresolvedSpy = sinon.spy(serverless.variables, 'handleUnresolved');
-      return serverless.variables
-        .populateProperty(property)
-        .should.become(undefined)
-        .then(() => {
-          expect(handleUnresolvedSpy.callCount).to.equal(1);
-        })
-        .finally(() => {
-          handleUnresolvedSpy.restore();
-        });
-    });
-
-    it('should allow a boolean with value true if overwrite syntax provided', () => {
-      const property = '${opt:stage, true}';
-      serverless.variables.options = {};
-      return serverless.variables.populateProperty(property).should.eventually.eql(true);
-    });
-
-    it('should allow a boolean with value false if overwrite syntax provided', () => {
-      const property = '${opt:stage, false}';
-      serverless.variables.options = {};
-      return serverless.variables.populateProperty(property).should.eventually.eql(false);
-    });
-
-    it('should not match a boolean with value containing word true or false if overwrite syntax provided', () => {
-      const property = '${opt:stage, foofalsebar}';
-      serverless.variables.options = {};
-      const handleUnresolvedSpy = sinon.spy(serverless.variables, 'handleUnresolved');
-      return serverless.variables
-        .populateProperty(property)
-        .should.become(undefined)
-        .then(() => {
-          expect(handleUnresolvedSpy.callCount).to.equal(1);
-        })
-        .finally(() => {
-          handleUnresolvedSpy.restore();
-        });
-    });
-
-    it('should allow an integer if overwrite syntax provided', () => {
-      const property = '${opt:quantity, 123}';
-      serverless.variables.options = {};
-      return serverless.variables.populateProperty(property).should.eventually.eql(123);
-    });
-
-    it('should call getValueFromSource if no overwrite syntax provided', () => {
-      // eslint-disable-next-line no-template-curly-in-string
-      const property = 'my stage is ${opt:stage}';
-      serverless.variables.options = { stage: 'prod' };
-      return serverless.variables
-        .populateProperty(property)
-        .should.eventually.eql('my stage is prod');
-    });
-
-    it('should warn if an SSM parameter does not exist', () => {
-      const options = {
-        stage: 'prod',
-        region: 'us-east-1',
-      };
-      serverless.variables.options = options;
-      const awsProvider = new AwsProvider(serverless, options);
-      const param = '/some/path/to/invalidparam';
-      const property = `\${ssm:${param}}`;
-      const error = Object.assign(new Error(`Parameter ${param} not found.`), {
-        providerError: { statusCode: 400 },
-      });
-      const requestStub = sinon
-        .stub(awsProvider, 'request')
-        .callsFake(() => BbPromise.reject(error));
-      const handleUnresolvedSpy = sinon.spy(serverless.variables, 'handleUnresolved');
-
-      return serverless.variables
-        .populateProperty(property)
-        .should.become(undefined)
-        .then(() => {
-          expect(requestStub.callCount).to.equal(1);
-          expect(handleUnresolvedSpy.callCount).to.equal(1);
-        })
-        .finally(() => {
-          requestStub.restore();
-          handleUnresolvedSpy.restore();
-        });
-    });
-
-    it('should throw an Error if the SSM request fails', () => {
-      const options = {
-        stage: 'prod',
-        region: 'us-east-1',
-      };
-      serverless.variables.options = options;
-      const awsProvider = new AwsProvider(serverless, options);
-      const param = '/some/path/to/invalidparam';
-      const property = `\${ssm:${param}}`;
-      const error = new ServerlessError('Some random failure.', 123);
-      const requestStub = sinon
-        .stub(awsProvider, 'request')
-        .callsFake(() => BbPromise.reject(error));
-      return serverless.variables
-        .populateProperty(property)
-        .should.be.rejectedWith(ServerlessError)
-        .then(() => expect(requestStub.callCount).to.equal(1))
-        .finally(() => requestStub.restore());
-    });
-
-    it('should run recursively if nested variables provided', () => {
-      // eslint-disable-next-line no-template-curly-in-string
-      const property = 'my stage is ${env:${opt:name}}';
-      process.env.TEST_VAR = 'dev';
-      serverless.variables.options = { name: 'TEST_VAR' };
-      return serverless.variables
-        .populateProperty(property)
-        .should.eventually.eql('my stage is dev');
-    });
-
-    it('should run recursively through many nested variables', () => {
-      // eslint-disable-next-line no-template-curly-in-string
-      const property = 'my stage is ${env:${opt:name}}';
-      process.env.TEST_VAR = 'dev';
-      serverless.variables.options = {
-        name: 'T${opt:lvl0}',
-        lvl0: 'E${opt:lvl1}',
-        lvl1: 'S${opt:lvl2}',
-        lvl2: 'T${opt:lvl3}',
-        lvl3: '_${opt:lvl4}',
-        lvl4: 'V${opt:lvl5}',
-        lvl5: 'A${opt:lvl6}',
-        lvl6: 'R',
-      };
-      return serverless.variables
-        .populateProperty(property)
-        .should.eventually.eql('my stage is dev');
-    });
-  });
-
-  describe('#populateVariable()', () => {
-    it('should populate string variables as sub string', () => {
-      const valueToPopulate = 'dev';
-      const matchedString = '${opt:stage}';
-      // eslint-disable-next-line no-template-curly-in-string
-      const property = 'my stage is ${opt:stage}';
-      serverless.variables
-        .populateVariable(property, matchedString, valueToPopulate)
-        .should.eql('my stage is dev');
-    });
-
-    it('should populate number variables as sub string', () => {
-      const valueToPopulate = 5;
-      const matchedString = '${opt:number}';
-      // eslint-disable-next-line no-template-curly-in-string
-      const property = 'your account number is ${opt:number}';
-      serverless.variables
-        .populateVariable(property, matchedString, valueToPopulate)
-        .should.eql('your account number is 5');
-    });
-
-    it('should populate non string variables', () => {
-      const valueToPopulate = 5;
-      const matchedString = '${opt:number}';
-      const property = '${opt:number}';
-      return serverless.variables
-        .populateVariable(property, matchedString, valueToPopulate)
-        .should.equal(5);
-    });
-
-    it('should throw error if populating non string or non number variable as sub string', () => {
-      const valueToPopulate = {};
-      const matchedString = '${opt:object}';
-      // eslint-disable-next-line no-template-curly-in-string
-      const property = 'your account number is ${opt:object}';
-      return expect(() =>
-        serverless.variables.populateVariable(property, matchedString, valueToPopulate)
-      ).to.throw(ServerlessError);
-    });
-  });
-
-  describe('#splitByComma', () => {
-    it('should return a given empty string', () => {
-      const input = '';
-      const expected = [input];
-      expect(serverless.variables.splitByComma(input)).to.eql(expected);
-    });
-    it('should return a undelimited string', () => {
-      const input = 'foo:bar';
-      const expected = [input];
-      expect(serverless.variables.splitByComma(input)).to.eql(expected);
-    });
-    it('should split basic comma delimited strings', () => {
-      const input = 'my,values,to,split';
-      const expected = ['my', 'values', 'to', 'split'];
-      expect(serverless.variables.splitByComma(input)).to.eql(expected);
-    });
-    it('should remove leading and following white space', () => {
-      const input = ' \t\nfoobar\n\t ';
-      const expected = ['foobar'];
-      expect(serverless.variables.splitByComma(input)).to.eql(expected);
-    });
-    it('should remove white space surrounding commas', () => {
-      const input = 'a,b ,c , d, e  ,  f\t,g\n,h,\ti,\nj,\t\n , \n\tk';
-      const expected = ['a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k'];
-      expect(serverless.variables.splitByComma(input)).to.eql(expected);
-    });
-    it('should ignore quoted commas', () => {
-      const input = '",", \',\', ",\', \',\'", "\',\', \',\'", \',", ","\', \'",", ","\'';
-      const expected = ['","', "','", "\",', ','\"", "\"',', ','\"", '\',", ","\'', '\'",", ","\''];
-      expect(serverless.variables.splitByComma(input)).to.eql(expected);
-    });
-    it('should deal with a combination of these cases', () => {
-      const input = " \t\n'a'\t\n , \n\t\"foo,bar\", opt:foo, \",\", ',', \"',', ','\", foo\n\t ";
-      const expected = ["'a'", '"foo,bar"', 'opt:foo', '","', "','", "\"',', ','\"", 'foo'];
-      expect(serverless.variables.splitByComma(input)).to.eql(expected);
-    });
-  });
-
-  describe('#overwrite()', () => {
-    beforeEach(() => {
-      serverless.service.provider.variableSyntax = '\\${{([ ~:a-zA-Z0-9._@\'",\\-\\/\\(\\)*?]+?)}}';
-      serverless.variables.loadVariableSyntax();
-      delete serverless.service.provider.variableSyntax;
-    });
-    it('should overwrite undefined and null values', () => {
-      const getValueFromSourceStub = sinon.stub(serverless.variables, 'getValueFromSource');
-      getValueFromSourceStub.onCall(0).resolves(undefined);
-      getValueFromSourceStub.onCall(1).resolves(null);
-      getValueFromSourceStub.onCall(2).resolves('variableValue');
-      return serverless.variables
-        .overwrite(['opt:stage', 'env:stage', 'self:provider.stage'])
-        .should.be.fulfilled.then((valueToPopulate) => {
-          expect(valueToPopulate).to.equal('variableValue');
-          expect(getValueFromSourceStub).to.have.been.calledThrice;
-        })
-        .finally(() => getValueFromSourceStub.restore());
-    });
-
-    it('should overwrite empty object values', () => {
-      const getValueFromSourceStub = sinon.stub(serverless.variables, 'getValueFromSource');
-      getValueFromSourceStub.onCall(0).resolves({});
-      getValueFromSourceStub.onCall(1).resolves('variableValue');
-      return serverless.variables
-        .overwrite(['opt:stage', 'env:stage'])
-        .should.be.fulfilled.then((valueToPopulate) => {
-          expect(valueToPopulate).to.equal('variableValue');
-          expect(getValueFromSourceStub).to.have.been.calledTwice;
-        })
-        .finally(() => getValueFromSourceStub.restore());
-    });
-
-    it('should overwrite values with an array even if it is empty', () => {
-      const getValueFromSourceStub = sinon.stub(serverless.variables, 'getValueFromSource');
-      getValueFromSourceStub.onCall(0).resolves(undefined);
-      getValueFromSourceStub.onCall(1).resolves([]);
-      return serverless.variables
-        .overwrite(['opt:stage', 'env:stage'])
-        .should.be.fulfilled.then((valueToPopulate) => {
-          expect(valueToPopulate).to.deep.equal([]);
-          expect(getValueFromSourceStub).to.have.been.calledTwice;
-        })
-        .finally(() => getValueFromSourceStub.restore());
-    });
-
-    it('should not overwrite 0 values', () => {
-      const getValueFromSourceStub = sinon.stub(serverless.variables, 'getValueFromSource');
-      getValueFromSourceStub.onCall(0).resolves(0);
-      getValueFromSourceStub.onCall(1).resolves('variableValue');
-      return serverless.variables
-        .overwrite(['opt:stage', 'env:stage'])
-        .should.become(0)
-        .then()
-        .finally(() => getValueFromSourceStub.restore());
-    });
-
-    it('should not overwrite false values', () => {
-      const getValueFromSourceStub = sinon.stub(serverless.variables, 'getValueFromSource');
-      getValueFromSourceStub.onCall(0).resolves(false);
-      getValueFromSourceStub.onCall(1).resolves('variableValue');
-      return serverless.variables
-        .overwrite(['opt:stage', 'env:stage'])
-        .should.become(false)
-        .then()
-        .finally(() => getValueFromSourceStub.restore());
-    });
-
-    it('should skip getting values once a value has been found', () => {
-      const getValueFromSourceStub = sinon.stub(serverless.variables, 'getValueFromSource');
-      getValueFromSourceStub.onCall(0).resolves(undefined);
-      getValueFromSourceStub.onCall(1).resolves('variableValue');
-      getValueFromSourceStub.onCall(2).resolves('variableValue2');
-      return serverless.variables
-        .overwrite(['opt:stage', 'env:stage', 'self:provider.stage'])
-        .should.be.fulfilled.then((valueToPopulate) =>
-          expect(valueToPopulate).to.equal('variableValue')
-        )
-        .finally(() => getValueFromSourceStub.restore());
-    });
-    it('should properly handle string values containing commas', () => {
-      const str = '"foo,bar"';
-      const getValueFromSourceStub = sinon
-        .stub(serverless.variables, 'getValueFromSource')
-        .resolves(undefined);
-      return serverless.variables
-        .overwrite(['opt:stage', str])
-        .should.be.fulfilled.then(() =>
-          expect(getValueFromSourceStub.getCall(1).args[0]).to.eql(str)
-        )
-        .finally(() => getValueFromSourceStub.restore());
-    });
-  });
-
-  describe('#getValueFromSource()', () => {
-    const variableValue = 'variableValue';
-    let getValueFromSlsStub;
-    let getValueFromEnvStub;
-    let getValueFromOptionsStub;
-    let getValueFromSelfStub;
-    let getValueFromFileStub;
-    let getValueFromCfStub;
-    let getValueFromS3Stub;
-    let getValueFromSsmStub;
-
-    beforeEach(() => {
-      getValueFromSlsStub = sinon
-        .stub(serverless.variables.variableResolvers[0], 'resolver')
-        .resolves('variableValue');
-      getValueFromEnvStub = sinon
-        .stub(serverless.variables.variableResolvers[1], 'resolver')
-        .resolves('variableValue');
-      getValueFromOptionsStub = sinon
-        .stub(serverless.variables.variableResolvers[2], 'resolver')
-        .resolves('variableValue');
-      getValueFromSelfStub = sinon
-        .stub(serverless.variables.variableResolvers[3], 'resolver')
-        .resolves('variableValue');
-      getValueFromFileStub = sinon
-        .stub(serverless.variables.variableResolvers[4], 'resolver')
-        .resolves('variableValue');
-      getValueFromCfStub = sinon
-        .stub(serverless.variables.variableResolvers[5], 'resolver')
-        .resolves('variableValue');
-      getValueFromS3Stub = sinon
-        .stub(serverless.variables.variableResolvers[6], 'resolver')
-        .resolves('variableValue');
-      getValueFromSsmStub = sinon
-        .stub(serverless.variables.variableResolvers[10], 'resolver')
-        .resolves('variableValue');
-    });
-
-    afterEach(() => {
-      serverless.variables.variableResolvers[0].resolver.restore();
-      serverless.variables.variableResolvers[1].resolver.restore();
-      serverless.variables.variableResolvers[2].resolver.restore();
-      serverless.variables.variableResolvers[3].resolver.restore();
-      serverless.variables.variableResolvers[4].resolver.restore();
-      serverless.variables.variableResolvers[5].resolver.restore();
-      serverless.variables.variableResolvers[6].resolver.restore();
-      serverless.variables.variableResolvers[10].resolver.restore();
-    });
-
-    it('should call getValueFromSls if referencing sls var', () =>
-      serverless.variables
-        .getValueFromSource('sls:instanceId')
-        .should.be.fulfilled.then((valueToPopulate) => {
-          expect(valueToPopulate).to.equal(variableValue);
-          expect(getValueFromSlsStub).to.have.been.called;
-          expect(getValueFromSlsStub).to.have.been.calledWith('sls:instanceId');
-        }));
-
-    it('should call getValueFromEnv if referencing env var', () =>
-      serverless.variables
-        .getValueFromSource('env:TEST_VAR')
-        .should.be.fulfilled.then((valueToPopulate) => {
-          expect(valueToPopulate).to.equal(variableValue);
-          expect(getValueFromEnvStub).to.have.been.called;
-          expect(getValueFromEnvStub).to.have.been.calledWith('env:TEST_VAR');
-        }));
-
-    it('should call getValueFromOptions if referencing an option', () =>
-      serverless.variables
-        .getValueFromSource('opt:stage')
-        .should.be.fulfilled.then((valueToPopulate) => {
-          expect(valueToPopulate).to.equal(variableValue);
-          expect(getValueFromOptionsStub).to.have.been.called;
-          expect(getValueFromOptionsStub).to.have.been.calledWith('opt:stage');
-        }));
-
-    it('should call getValueFromSelf if referencing from self', () =>
-      serverless.variables
-        .getValueFromSource('self:provider')
-        .should.be.fulfilled.then((valueToPopulate) => {
-          expect(valueToPopulate).to.equal(variableValue);
-          expect(getValueFromSelfStub).to.have.been.called;
-          expect(getValueFromSelfStub).to.have.been.calledWith('self:provider');
-        }));
-
-    it('should call getValueFromFile if referencing from another file', () =>
-      serverless.variables
-        .getValueFromSource('file(./config.yml)')
-        .should.be.fulfilled.then((valueToPopulate) => {
-          expect(valueToPopulate).to.equal(variableValue);
-          expect(getValueFromFileStub).to.have.been.called;
-          expect(getValueFromFileStub).to.have.been.calledWith('file(./config.yml)');
-        }));
-
-    it('should call getValueFromCf if referencing CloudFormation Outputs', () =>
-      serverless.variables
-        .getValueFromSource('cf:test-stack.testOutput')
-        .should.be.fulfilled.then((valueToPopulate) => {
-          expect(valueToPopulate).to.equal(variableValue);
-          expect(getValueFromCfStub).to.have.been.called;
-          expect(getValueFromCfStub).to.have.been.calledWith('cf:test-stack.testOutput');
-        }));
-
-    it('should call getValueFromS3 if referencing variable in S3', () =>
-      serverless.variables
-        .getValueFromSource('s3:test-bucket/path/to/key')
-        .should.be.fulfilled.then((valueToPopulate) => {
-          expect(valueToPopulate).to.equal(variableValue);
-          expect(getValueFromS3Stub).to.have.been.called;
-          expect(getValueFromS3Stub).to.have.been.calledWith('s3:test-bucket/path/to/key');
-        }));
-
-    it('should call getValueFromSsm if referencing variable in SSM', () =>
-      serverless.variables
-        .getValueFromSource('ssm:/test/path/to/param')
-        .should.be.fulfilled.then((valueToPopulate) => {
-          expect(valueToPopulate).to.equal(variableValue);
-          expect(getValueFromSsmStub).to.have.been.called;
-          expect(getValueFromSsmStub).to.have.been.calledWith('ssm:/test/path/to/param');
-        }));
-
-    it('should reject invalid sources', () =>
-      serverless.variables
-        .getValueFromSource('weird:source')
-        .should.be.rejectedWith(ServerlessError));
-
-    describe('caching', () => {
-      const sources = [
-        { functionIndex: 0, function: 'getValueFromSls', variableString: 'sls:instanceId' },
-        { functionIndex: 1, function: 'getValueFromEnv', variableString: 'env:NODE_ENV' },
-        { functionIndex: 2, function: 'getValueFromOptions', variableString: 'opt:stage' },
-        { functionIndex: 3, function: 'getValueFromSelf', variableString: 'self:provider' },
-        { functionIndex: 4, function: 'getValueFromFile', variableString: 'file(./config.yml)' },
-        {
-          functionIndex: 5,
-          function: 'getValueFromCf',
-          variableString: 'cf:test-stack.testOutput',
-        },
-        {
-          functionIndex: 6,
-          function: 'getValueFromS3',
-          variableString: 's3:test-bucket/path/to/ke',
-        },
-        {
-          functionIndex: 10,
-          function: 'getValueFromSsm',
-          variableString: 'ssm:/test/path/to/param',
-        },
-      ];
-      sources.forEach((source) => {
-        it(`should only call ${source.function} once, returning the cached value otherwise`, () => {
-          const getValueFunctionStub =
-            serverless.variables.variableResolvers[source.functionIndex].resolver;
-          return BbPromise.all([
-            serverless.variables
-              .getValueFromSource(source.variableString)
-              .should.become(variableValue),
-            BbPromise.delay(100).then(() =>
-              serverless.variables
-                .getValueFromSource(source.variableString)
-                .should.become(variableValue)
-            ),
-          ]).then(() => {
-            expect(getValueFunctionStub).to.have.been.calledOnce;
-            expect(getValueFunctionStub).to.have.been.calledWith(source.variableString);
-          });
-        });
-      });
-    });
-  });
-
-  describe('#getValueFromSls()', () => {
-    it('should get variable from Serverless Framework provided variables', () => {
-      serverless.instanceId = 12345678;
-      return serverless.variables.getValueFromSls('sls:instanceId').then((valueToPopulate) => {
-        expect(valueToPopulate).to.equal(12345678);
-      });
-    });
-  });
-
-  describe('#getValueFromEnv()', () => {
-    it('should get variable from environment variables', () => {
-      process.env.TEST_VAR = 'someValue';
-      return serverless.variables.getValueFromEnv('env:TEST_VAR').should.become('someValue');
-    });
-
-    it('should allow top-level references to the environment variables hive', () => {
-      process.env.TEST_VAR = 'someValue';
-      return serverless.variables.getValueFromEnv('env:').then((valueToPopulate) => {
-        expect(valueToPopulate.TEST_VAR).to.be.equal('someValue');
-      });
-    });
-  });
-
-  describe('#getValueFromOptions()', () => {
-    it('should get variable from options', () => {
-      serverless.variables.options = { stage: 'prod' };
-      return serverless.variables.getValueFromOptions('opt:stage').should.become('prod');
-    });
-
-    it('should allow top-level references to the options hive', () => {
-      serverless.variables.options = { stage: 'prod' };
-      return serverless.variables
-        .getValueFromOptions('opt:')
-        .should.become(serverless.variables.options);
-    });
-  });
-
-  describe('#getValueFromSelf()', () => {
-    beforeEach(() => {
-      serverless.service.provider.variableSyntax = '\\${{([ ~:a-zA-Z0-9._@\'",\\-\\/\\(\\)*?]+?)}}';
-      serverless.variables.loadVariableSyntax();
-      delete serverless.service.provider.variableSyntax;
-    });
-    it('should get variable from self serverless.yml file', () => {
-      serverless.variables.service = {
-        service: 'testService',
-        provider: serverless.service.provider,
-      };
-      return serverless.variables.getValueFromSelf('self:service').should.become('testService');
-    });
-    it('should redirect ${self:service.name} to ${self:service}', () => {
-      serverless.variables.service = {
-        service: 'testService',
-        provider: serverless.service.provider,
-      };
-      return serverless.variables
-        .getValueFromSelf('self:service.name')
-        .should.become('testService');
-    });
-    it('should redirect ${self:provider} to ${self:provider.name}', () => {
-      serverless.variables.service = {
-        service: 'testService',
-        provider: { name: 'aws' },
-      };
-      return serverless.variables.getValueFromSelf('self:provider').should.become('aws');
-    });
-    it('should redirect ${self:service.awsKmsKeyArn} to ${self:serviceObject.awsKmsKeyArn}', () => {
-      const keyArn = 'arn:aws:kms:us-east-1:xxxxxxxxxxxx:key/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx';
-      serverless.variables.service = {
-        service: 'testService',
-        serviceObject: {
-          name: 'testService',
-          awsKmsKeyArn: keyArn,
-        },
-      };
-      return serverless.variables
-        .getValueFromSelf('self:service.awsKmsKeyArn')
-        .should.become(keyArn);
-    });
-    it('should handle self-references to the root of the serverless.yml file', () => {
-      serverless.variables.service = {
-        service: 'testService',
-        provider: 'testProvider',
-        defaults: serverless.service.defaults,
-      };
-      return serverless.variables
-        .getValueFromSelf('self:')
-        .should.eventually.equal(serverless.variables.service);
-    });
-  });
-
-  describe('#getValueFromFile()', () => {
-    it('should work for absolute paths with ~ ', () => {
-      const expectedFileName = `${os.homedir()}/somedir/config.yml`;
-      const configYml = {
-        test: 1,
-        test2: 'test2',
-        testObj: {
-          sub: 2,
-          prob: 'prob',
-        },
-      };
-      const fileExistsStub = sinon.stub(serverless.utils, 'fileExistsSync').returns(true);
-      const realpathSync = sinon.stub(fse, 'realpathSync').returns(expectedFileName);
-      const readFileSyncStub = sinon.stub(serverless.utils, 'readFileSync').returns(configYml);
-      return serverless.variables
-        .getValueFromFile('file(~/somedir/config.yml)')
-        .should.be.fulfilled.then((valueToPopulate) => {
-          expect(realpathSync).to.not.have.been.called;
-          expect(fileExistsStub).to.have.been.calledWithMatch(expectedFileName);
-          expect(readFileSyncStub).to.have.been.calledWithMatch(expectedFileName);
-          expect(valueToPopulate).to.deep.equal(configYml);
-        })
-        .finally(() => {
-          realpathSync.restore();
-          readFileSyncStub.restore();
-          fileExistsStub.restore();
-        });
-    });
-
-    it('should populate an entire variable file', () => {
-      const SUtils = new Utils();
-      const tmpDirPath = getTmpDirPath();
-      const configYml = {
-        test: 1,
-        test2: 'test2',
-        testObj: {
-          sub: 2,
-          prob: 'prob',
-        },
-      };
-      SUtils.writeFileSync(path.join(tmpDirPath, 'config.yml'), yaml.dump(configYml));
-      serverless.serviceDir = tmpDirPath;
-      return serverless.variables
-        .getValueFromFile('file(./config.yml)')
-        .should.eventually.eql(configYml);
-    });
-
-    it('should get undefined if non existing file and the second argument is true', () => {
-      const tmpDirPath = getTmpDirPath();
-      serverless.serviceDir = tmpDirPath;
-      const realpathSync = sinon.spy(fse, 'realpathSync');
-      const existsSync = sinon.spy(fse, 'existsSync');
-      return serverless.variables
-        .getValueFromFile('file(./non-existing.yml)')
-        .should.be.fulfilled.then((valueToPopulate) => {
-          expect(realpathSync).to.not.have.been.called;
-          expect(existsSync).to.have.been.calledOnce;
-          expect(valueToPopulate).to.be.undefined;
-        })
-        .finally(() => {
-          realpathSync.restore();
-          existsSync.restore();
-        });
-    });
-
-    it('should populate non json/yml files', () => {
-      const SUtils = new Utils();
-      const tmpDirPath = getTmpDirPath();
-      SUtils.writeFileSync(path.join(tmpDirPath, 'someFile'), 'hello world');
-      serverless.serviceDir = tmpDirPath;
-      return serverless.variables.getValueFromFile('file(./someFile)').should.become('hello world');
-    });
-
-    it('should populate symlinks', function () {
-      const SUtils = new Utils();
-      const tmpDirPath = getTmpDirPath();
-      const realFilePath = path.join(tmpDirPath, 'someFile');
-      const symlinkPath = path.join(tmpDirPath, 'refSomeFile');
-      SUtils.writeFileSync(realFilePath, 'hello world');
-      try {
-        fse.ensureSymlinkSync(realFilePath, symlinkPath);
-      } catch (error) {
-        skipOnDisabledSymlinksInWindows(error, this, afterCallback);
-        throw error;
-      }
-      serverless.serviceDir = tmpDirPath;
-      return serverless.variables
-        .getValueFromFile('file(./refSomeFile)')
-        .should.become('hello world')
-        .then()
-        .finally(() => {
-          fse.removeSync(realFilePath);
-          fse.removeSync(symlinkPath);
-        });
-    });
-
-    it('should trim trailing whitespace and new line character', () => {
-      const SUtils = new Utils();
-      const tmpDirPath = getTmpDirPath();
-      SUtils.writeFileSync(path.join(tmpDirPath, 'someFile'), 'hello world \n');
-      serverless.serviceDir = tmpDirPath;
-      return serverless.variables.getValueFromFile('file(./someFile)').should.become('hello world');
-    });
-
-    it('should populate from another file when variable is of any type', () => {
-      const SUtils = new Utils();
-      const tmpDirPath = getTmpDirPath();
-      const configYml = {
-        test0: 0,
-        test1: 'test1',
-        test2: {
-          sub: 2,
-          prob: 'prob',
-        },
-      };
-      SUtils.writeFileSync(path.join(tmpDirPath, 'config.yml'), yaml.dump(configYml));
-      serverless.serviceDir = tmpDirPath;
-      return serverless.variables
-        .getValueFromFile('file(./config.yml):test2.sub')
-        .should.become(configYml.test2.sub);
-    });
-
-    it('should populate from a javascript file that exports a function', () => {
-      const SUtils = new Utils();
-      const tmpDirPath = getTmpDirPath();
-      const jsData = 'module.exports.hello=function(){return "hello world";};';
-      SUtils.writeFileSync(path.join(tmpDirPath, 'hello.js'), jsData);
-      serverless.serviceDir = tmpDirPath;
-      return serverless.variables
-        .getValueFromFile('file(./hello.js):hello')
-        .should.become('hello world');
-    });
-
-    it('should populate from a javascript file that exports a string', () => {
-      const SUtils = new Utils();
-      const tmpDirPath = getTmpDirPath();
-      const jsData = 'module.exports.hello="hello world";';
-      SUtils.writeFileSync(path.join(tmpDirPath, 'hello.js'), jsData);
-      serverless.serviceDir = tmpDirPath;
-      return serverless.variables
-        .getValueFromFile('file(./hello.js):hello')
-        .should.become('hello world');
-    });
-
-    it('should populate an entire variable exported by a javascript file function', () => {
-      const SUtils = new Utils();
-      const tmpDirPath = getTmpDirPath();
-      const jsData = 'module.exports=function(){return { hello: "hello world" };};';
-      SUtils.writeFileSync(path.join(tmpDirPath, 'hello.js'), jsData);
-      serverless.serviceDir = tmpDirPath;
-      return serverless.variables
-        .getValueFromFile('file(./hello.js)')
-        .should.become({ hello: 'hello world' });
-    });
-
-    it('should populate an entire variable exported by a javascript file object', () => {
-      const SUtils = new Utils();
-      const tmpDirPath = getTmpDirPath();
-      const jsData = 'module.exports={ hello: "hello world" };';
-      SUtils.writeFileSync(path.join(tmpDirPath, 'hello.js'), jsData);
-      serverless.serviceDir = tmpDirPath;
-      return serverless.variables
-        .getValueFromFile('file(./hello.js)')
-        .should.become({ hello: 'hello world' });
-    });
-
-    it('should populate an entire variable exported by a javascript file literal', () => {
-      const SUtils = new Utils();
-      const tmpDirPath = getTmpDirPath();
-      const jsData = 'module.exports="hello world";';
-      SUtils.writeFileSync(path.join(tmpDirPath, 'hello.js'), jsData);
-      serverless.serviceDir = tmpDirPath;
-      return serverless.variables.getValueFromFile('file(./hello.js)').should.become('hello world');
-    });
-
-    it('should populate deep object from a javascript file', () => {
-      const SUtils = new Utils();
-      const tmpDirPath = getTmpDirPath();
-      const jsData = `module.exports.hello=function(){
-        return {one:{two:{three: 'hello world'}}}
-      };`;
-      SUtils.writeFileSync(path.join(tmpDirPath, 'hello.js'), jsData);
-      serverless.serviceDir = tmpDirPath;
-      serverless.variables.loadVariableSyntax();
-      return serverless.variables
-        .getValueFromFile('file(./hello.js):hello.one.two.three')
-        .should.become('hello world');
-    });
-
-    it('should preserve the exported function context when executing', () => {
-      const SUtils = new Utils();
-      const tmpDirPath = getTmpDirPath();
-      const jsData = `
-      module.exports.one = {two: {three: 'hello world'}}
-      module.exports.hello=function(){ return this; };`;
-      SUtils.writeFileSync(path.join(tmpDirPath, 'hello.js'), jsData);
-      serverless.serviceDir = tmpDirPath;
-      serverless.variables.loadVariableSyntax();
-      return serverless.variables
-        .getValueFromFile('file(./hello.js):hello.one.two.three')
-        .should.become('hello world');
-    });
-
-    it('should file variable not using ":" syntax', () => {
-      const SUtils = new Utils();
-      const tmpDirPath = getTmpDirPath();
-      const configYml = {
-        test: 1,
-        test2: 'test2',
-        testObj: {
-          sub: 2,
-          prob: 'prob',
-        },
-      };
-      SUtils.writeFileSync(path.join(tmpDirPath, 'config.yml'), yaml.dump(configYml));
-      serverless.serviceDir = tmpDirPath;
-      return serverless.variables
-        .getValueFromFile('file(./config.yml).testObj.sub')
-        .should.be.rejectedWith(ServerlessError);
-    });
-
-    it('should throw an error if resolved value is undefined', () => {
-      const SUtils = new Utils();
-      const tmpDirPath = getTmpDirPath();
-      const jsData = 'module.exports=undefined;';
-      SUtils.writeFileSync(path.join(tmpDirPath, 'hello.js'), jsData);
-      serverless.serviceDir = tmpDirPath;
-      return serverless.variables
-        .getValueFromFile('file(./hello.js)')
-        .should.be.rejectedWith(ServerlessError);
-    });
-
-    it('should throw an error if resolved value is a symbol', () => {
-      const SUtils = new Utils();
-      const tmpDirPath = getTmpDirPath();
-      const jsData = 'module.exports=Symbol()';
-      SUtils.writeFileSync(path.join(tmpDirPath, 'hello.js'), jsData);
-      serverless.serviceDir = tmpDirPath;
-      return serverless.variables
-        .getValueFromFile('file(./hello.js)')
-        .should.be.rejectedWith(ServerlessError);
-    });
-
-    it('should throw an error if resolved value is a function', () => {
-      const SUtils = new Utils();
-      const tmpDirPath = getTmpDirPath();
-      const jsData = 'module.exports=function(){ return function(){}; };';
-      SUtils.writeFileSync(path.join(tmpDirPath, 'hello.js'), jsData);
-      serverless.serviceDir = tmpDirPath;
-      return serverless.variables
-        .getValueFromFile('file(./hello.js)')
-        .should.be.rejectedWith(ServerlessError);
-    });
-  });
-
-  describe('#getValueFromCf()', () => {
-    it('should get variable from CloudFormation', () => {
-      const options = {
-        stage: 'prod',
-        region: 'us-west-2',
-      };
-      const awsProvider = new AwsProvider(serverless, options);
-      serverless.setProvider('aws', awsProvider);
-      serverless.variables.options = options;
-      const awsResponseMock = {
-        Stacks: [
-          {
-            Outputs: [
-              {
-                OutputKey: 'MockExport',
-                OutputValue: 'MockValue',
-              },
-            ],
-          },
-        ],
-      };
-      const cfStub = sinon
-        .stub(serverless.getProvider('aws'), 'request')
-        .callsFake(() => BbPromise.resolve(awsResponseMock));
-      return serverless.variables
-        .getValueFromCf('cf:some-stack.MockExport')
-        .should.become('MockValue')
-        .then(() => {
-          expect(cfStub).to.have.been.calledOnce;
-          expect(cfStub).to.have.been.calledWithExactly(
-            'CloudFormation',
-            'describeStacks',
-            { StackName: 'some-stack' },
-            { useCache: true }
-          );
-        })
-        .finally(() => cfStub.restore());
-    });
-
-    it('should get variable from CloudFormation of different region', () => {
-      const options = {
-        stage: 'prod',
-        region: 'us-west-2',
-      };
-      const awsProvider = new AwsProvider(serverless, options);
-      serverless.setProvider('aws', awsProvider);
-      serverless.variables.options = options;
-      const awsResponseMock = {
-        Stacks: [
-          {
-            Outputs: [
-              {
-                OutputKey: 'MockExport',
-                OutputValue: 'MockValue',
-              },
-            ],
-          },
-        ],
-      };
-      const cfStub = sinon
-        .stub(serverless.getProvider('aws'), 'request')
-        .callsFake(() => BbPromise.resolve(awsResponseMock));
-      return serverless.variables
-        .getValueFromCf('cf.us-east-1:some-stack.MockExport')
-        .should.become('MockValue')
-        .then(() => {
-          expect(cfStub).to.have.been.calledOnce;
-          expect(cfStub).to.have.been.calledWithExactly(
-            'CloudFormation',
-            'describeStacks',
-            { StackName: 'some-stack' },
-            { region: 'us-east-1', useCache: true }
-          );
-        })
-        .finally(() => cfStub.restore());
-    });
-
-    it('should reject CloudFormation variables that do not exist', () => {
-      const options = {
-        stage: 'prod',
-        region: 'us-west-2',
-      };
-      const awsProvider = new AwsProvider(serverless, options);
-      serverless.setProvider('aws', awsProvider);
-      serverless.variables.options = options;
-      const awsResponseMock = {
-        Stacks: [
-          {
-            Outputs: [
-              {
-                OutputKey: 'MockExport',
-                OutputValue: 'MockValue',
-              },
-            ],
-          },
-        ],
-      };
-      const cfStub = sinon
-        .stub(serverless.getProvider('aws'), 'request')
-        .callsFake(() => BbPromise.resolve(awsResponseMock));
-      return serverless.variables
-        .getValueFromCf('cf:some-stack.DoestNotExist')
-        .should.be.rejectedWith(
-          ServerlessError,
-          /to request a non exported variable from CloudFormation/
-        )
-        .then(() => {
-          expect(cfStub).to.have.been.calledOnce;
-          expect(cfStub).to.have.been.calledWithExactly(
-            'CloudFormation',
-            'describeStacks',
-            { StackName: 'some-stack' },
-            { useCache: true }
-          );
-        })
-        .finally(() => cfStub.restore());
-    });
-  });
-
-  describe('#getValueFromS3()', () => {
-    let awsProvider;
-    beforeEach(() => {
-      const options = {
-        stage: 'prod',
-        region: 'us-west-2',
-      };
-      awsProvider = new AwsProvider(serverless, options);
-      serverless.setProvider('aws', awsProvider);
-      serverless.variables.options = options;
-    });
-    it('should get variable from S3', () => {
-      const awsResponseMock = {
-        Body: 'MockValue',
-      };
-      const s3Stub = sinon
-        .stub(awsProvider, 'request')
-        .callsFake(() => BbPromise.resolve(awsResponseMock));
-      return serverless.variables
-        .getValueFromS3('s3:some.bucket/path/to/key')
-        .should.become('MockValue')
-        .then(() => {
-          expect(s3Stub).to.have.been.calledOnce;
-          expect(s3Stub).to.have.been.calledWithExactly(
-            'S3',
-            'getObject',
-            {
-              Bucket: 'some.bucket',
-              Key: 'path/to/key',
-            },
-            { useCache: true }
-          );
-        })
-        .finally(() => s3Stub.restore());
-    });
-
-    it('should throw error if error getting value from S3', () => {
-      const error = new Error('The specified bucket is not valid');
-      const requestStub = sinon
-        .stub(awsProvider, 'request')
-        .callsFake(() => BbPromise.reject(error));
-      return expect(serverless.variables.getValueFromS3('s3:some.bucket/path/to/key'))
-        .to.be.rejectedWith(
-          ServerlessError,
-          'Error getting value for s3:some.bucket/path/to/key. The specified bucket is not valid'
-        )
-        .then()
-        .finally(() => requestStub.restore());
-    });
-  });
-
-  describe('#getValueFromSsm()', () => {
-    const param = 'Param-01_valid.chars';
-    const value = 'MockValue';
-    const awsResponseMock = {
-      Parameter: {
-        Value: value,
-      },
-    };
-    let awsProvider;
-    beforeEach(() => {
-      const options = {
-        stage: 'prod',
-        region: 'us-west-2',
-      };
-      awsProvider = new AwsProvider(serverless, options);
-      serverless.setProvider('aws', awsProvider);
-      serverless.variables.options = options;
-    });
-    it('should get variable from Ssm using regular-style param', () => {
-      const ssmStub = sinon
-        .stub(awsProvider, 'request')
-        .callsFake(() => BbPromise.resolve(awsResponseMock));
-      return serverless.variables
-        .getValueFromSsm(`ssm:${param}`)
-        .should.become(value)
-        .then(() => {
-          expect(ssmStub).to.have.been.calledOnce;
-          expect(ssmStub).to.have.been.calledWithExactly(
-            'SSM',
-            'getParameter',
-            {
-              Name: param,
-              WithDecryption: false,
-            },
-            { useCache: true }
-          );
-        })
-        .finally(() => ssmStub.restore());
-    });
-    it('should get variable from Ssm of different region', () => {
-      const ssmStub = sinon
-        .stub(awsProvider, 'request')
-        .callsFake(() => BbPromise.resolve(awsResponseMock));
-      return serverless.variables
-        .getValueFromSsm(`ssm.us-east-1:${param}`)
-        .should.become(value)
-        .then(() => {
-          expect(ssmStub).to.have.been.calledOnce;
-          expect(ssmStub).to.have.been.calledWithExactly(
-            'SSM',
-            'getParameter',
-            {
-              Name: param,
-              WithDecryption: false,
-            },
-            { region: 'us-east-1', useCache: true }
-          );
-        })
-        .finally(() => ssmStub.restore());
-    });
-    it('should get variable from Ssm using path-style param', () => {
-      const ssmStub = sinon
-        .stub(awsProvider, 'request')
-        .callsFake(() => BbPromise.resolve(awsResponseMock));
-      return serverless.variables
-        .getValueFromSsm(`ssm:${param}`)
-        .should.become(value)
-        .then(() => {
-          expect(ssmStub).to.have.been.calledOnce;
-          expect(ssmStub).to.have.been.calledWithExactly(
-            'SSM',
-            'getParameter',
-            {
-              Name: param,
-              WithDecryption: false,
-            },
-            { useCache: true }
-          );
-        })
-        .finally(() => ssmStub.restore());
-    });
-    it('should get encrypted variable from Ssm using extended syntax', () => {
-      const ssmStub = sinon
-        .stub(awsProvider, 'request')
-        .callsFake(() => BbPromise.resolve(awsResponseMock));
-      return serverless.variables
-        .getValueFromSsm(`ssm:${param}~true`)
-        .should.become(value)
-        .then(() => {
-          expect(ssmStub).to.have.been.calledOnce;
-          expect(ssmStub).to.have.been.calledWithExactly(
-            'SSM',
-            'getParameter',
-            {
-              Name: param,
-              WithDecryption: true,
-            },
-            { useCache: true }
-          );
-        })
-        .finally(() => ssmStub.restore());
-    });
-    it('should get unencrypted variable from Ssm using extended syntax', () => {
-      const ssmStub = sinon
-        .stub(awsProvider, 'request')
-        .callsFake(() => BbPromise.resolve(awsResponseMock));
-      return serverless.variables
-        .getValueFromSsm(`ssm:${param}~false`)
-        .should.become(value)
-        .then(() => {
-          expect(ssmStub).to.have.been.calledOnce;
-          expect(ssmStub).to.have.been.calledWithExactly(
-            'SSM',
-            'getParameter',
-            {
-              Name: param,
-              WithDecryption: false,
-            },
-            { useCache: true }
-          );
-        })
-        .finally(() => ssmStub.restore());
-    });
-    it('should ignore bad values for extended syntax', () => {
-      const ssmStub = sinon
-        .stub(awsProvider, 'request')
-        .callsFake(() => BbPromise.resolve(awsResponseMock));
-      return serverless.variables
-        .getValueFromSsm(`ssm:${param}~badvalue`)
-        .should.become(value)
-        .then(() => {
-          expect(ssmStub).to.have.been.calledOnce;
-          expect(ssmStub).to.have.been.calledWithExactly(
-            'SSM',
-            'getParameter',
-            {
-              Name: param,
-              WithDecryption: false,
-            },
-            { useCache: true }
-          );
-        })
-        .finally(() => ssmStub.restore());
-    });
-    it('should get split StringList variable from Ssm using extended syntax', () => {
-      const stringListValue = 'MockValue1,MockValue2';
-      const parsedValue = ['MockValue1', 'MockValue2'];
-      const stringListResponseMock = {
-        Parameter: {
-          Value: stringListValue,
-          Type: 'StringList',
-        },
-      };
-      const ssmStub = sinon
-        .stub(awsProvider, 'request')
-        .callsFake(() => BbPromise.resolve(stringListResponseMock));
-      return serverless.variables
-        .getValueFromSsm(`ssm:${param}~split`)
-        .should.become(parsedValue)
-        .then(() => {
-          expect(ssmStub).to.have.been.calledOnce;
-          expect(ssmStub).to.have.been.calledWithExactly(
-            'SSM',
-            'getParameter',
-            {
-              Name: param,
-              WithDecryption: false,
-            },
-            { useCache: true }
-          );
-        })
-        .finally(() => ssmStub.restore());
-    });
-    it('should get unsplit StringList variable from Ssm by default', () => {
-      const stringListValue = 'MockValue1,MockValue2';
-      const stringListResponseMock = {
-        Parameter: {
-          Value: stringListValue,
-          Type: 'StringList',
-        },
-      };
-      const ssmStub = sinon
-        .stub(awsProvider, 'request')
-        .callsFake(() => BbPromise.resolve(stringListResponseMock));
-      return serverless.variables
-        .getValueFromSsm(`ssm:${param}`)
-        .should.become(stringListValue)
-        .then(() => {
-          expect(ssmStub).to.have.been.calledOnce;
-          expect(ssmStub).to.have.been.calledWithExactly(
-            'SSM',
-            'getParameter',
-            {
-              Name: param,
-              WithDecryption: false,
-            },
-            { useCache: true }
-          );
-        })
-        .finally(() => ssmStub.restore());
-    });
-    it('should warn when attempting to split a non-StringList Ssm variable', () => {
-      const logWarningSpy = sinon.spy(slsError, 'logWarning');
-      const consoleLogStub = sinon.stub(console, 'log').returns();
-      const ProxyQuiredVariables = proxyquire('../../../../lib/classes/Variables.js', {
-        './Error': logWarningSpy,
-      });
-      const varProxy = new ProxyQuiredVariables(serverless);
-      const stringListResponseMock = {
-        Parameter: {
-          Value: value,
-          Type: 'String',
-        },
-      };
-      const ssmStub = sinon
-        .stub(awsProvider, 'request')
-        .callsFake(() => BbPromise.resolve(stringListResponseMock));
-      return varProxy
-        .getValueFromSsm(`ssm:${param}~split`)
-        .should.become(value)
-        .then(() => {
-          expect(ssmStub).to.have.been.calledOnce;
-          expect(ssmStub).to.have.been.calledWithExactly(
-            'SSM',
-            'getParameter',
-            {
-              Name: param,
-              WithDecryption: false,
-            },
-            { useCache: true }
-          );
-          expect(logWarningSpy).to.have.been.calledWithExactly(
-            `Cannot split SSM parameter '${param}' of type 'String'. Must be 'StringList'.`
-          );
-        })
-        .finally(() => {
-          ssmStub.restore();
-          logWarningSpy.restore();
-          consoleLogStub.restore();
-        });
-    });
-    describe('Referencing to AWS SecretsManager', () => {
-      it('should NOT parse value as json if not referencing to AWS SecretsManager', () => {
-        const secretParam = '/path/to/foo-bar';
-        const jsonLikeText = '{"str":"abc","num":123}';
-        const awsResponse = {
-          Parameter: {
-            Value: jsonLikeText,
-          },
-        };
-        const ssmStub = sinon
-          .stub(awsProvider, 'request')
-          .callsFake(() => BbPromise.resolve(awsResponse));
-        return serverless.variables
-          .getValueFromSsm(`ssm:${secretParam}~true`)
-          .should.become(jsonLikeText)
-          .then()
-          .finally(() => ssmStub.restore());
-      });
-      it('should parse value as json if returned value is json-like', () => {
-        const secretParam = '/aws/reference/secretsmanager/foo-bar';
-        const jsonLikeText = '{"str":"abc","num":123}';
-        const json = {
-          str: 'abc',
-          num: 123,
-        };
-        const awsResponse = {
-          Parameter: {
-            Value: jsonLikeText,
-          },
-        };
-        const ssmStub = sinon
-          .stub(awsProvider, 'request')
-          .callsFake(() => BbPromise.resolve(awsResponse));
-        return serverless.variables
-          .getValueFromSsm(`ssm:${secretParam}~true`)
-          .should.become(json)
-          .then()
-          .finally(() => ssmStub.restore());
-      });
-      it('should get value as text if returned value is NOT json-like', () => {
-        const secretParam = '/aws/reference/secretsmanager/foo-bar';
-        const plainText = 'I am plain text';
-        const awsResponse = {
-          Parameter: {
-            Value: plainText,
-          },
-        };
-        const ssmStub = sinon
-          .stub(awsProvider, 'request')
-          .callsFake(() => BbPromise.resolve(awsResponse));
-        return serverless.variables
-          .getValueFromSsm(`ssm:${secretParam}~true`)
-          .should.become(plainText)
-          .then()
-          .finally(() => ssmStub.restore());
-      });
-    });
-    it('should return undefined if SSM parameter does not exist', () => {
-      const error = Object.assign(new Error(`Parameter ${param} not found.`), {
-        providerError: { statusCode: 400 },
-      });
-      const requestStub = sinon
-        .stub(awsProvider, 'request')
-        .callsFake(() => BbPromise.reject(error));
-      return serverless.variables
-        .getValueFromSsm(`ssm:${param}`)
-        .should.become(undefined)
-        .then()
-        .finally(() => requestStub.restore());
-    });
-
-    it('should reject if SSM request returns unexpected error', () => {
-      const error = new Error(
-        'User: <arn> is not authorized to perform: ssm:GetParameter on resource: <arn>'
-      );
-      const requestStub = sinon
-        .stub(awsProvider, 'request')
-        .callsFake(() => BbPromise.reject(error));
-      return serverless.variables
-        .getValueFromSsm(`ssm:${param}`)
-        .should.be.rejected.then()
-        .finally(() => requestStub.restore());
-    });
-  });
-
-  describe('#getValueStrToBool()', () => {
-    const errMessage = 'Unexpected strToBool input; expected either "true", "false", "0", or "1".';
-    beforeEach(() => {
-      serverless.variables.service = {
-        service: 'testService',
-        provider: serverless.service.provider,
-      };
-      serverless.variables.loadVariableSyntax();
-    });
-    it('regex for "true" input', () => {
-      expect(serverless.variables.strToBoolRefSyntax.test('${strToBool(true)}')).to.equal(true);
-    });
-    it('regex for "false" input', () => {
-      expect(serverless.variables.strToBoolRefSyntax.test('${strToBool(false)}')).to.equal(true);
-    });
-    it('regex for "0" input', () => {
-      expect(serverless.variables.strToBoolRefSyntax.test('${strToBool(0)}')).to.equal(true);
-    });
-    it('regex for "1" input', () => {
-      expect(serverless.variables.strToBoolRefSyntax.test('${strToBool(1)}')).to.equal(true);
-    });
-    it('regex for "null" input', () => {
-      expect(serverless.variables.strToBoolRefSyntax.test('${strToBool(null)}')).to.equal(true);
-    });
-    it('regex for truthy input', () => {
-      expect(serverless.variables.strToBoolRefSyntax.test('${strToBool(anything)}')).to.equal(true);
-    });
-    it('regex for empty input', () => {
-      expect(serverless.variables.strToBoolRefSyntax.test('${strToBool()}')).to.equal(false);
-    });
-    it('true (string) should return true (boolean)', () => {
-      return serverless.variables.getValueStrToBool('strToBool(true)').should.become(true);
-    });
-    it('false (string) should return false (boolean)', () => {
-      return serverless.variables.getValueStrToBool('strToBool(false)').should.become(false);
-    });
-    it('1 (string) should return true (boolean)', () => {
-      return serverless.variables.getValueStrToBool('strToBool(1)').should.become(true);
-    });
-    it('0 (string) should return false (boolean)', () => {
-      return serverless.variables.getValueStrToBool('strToBool(0)').should.become(false);
-    });
-    it('truthy string should throw an error', () => {
-      return serverless.variables
-        .getValueStrToBool('strToBool(anything)')
-        .catch((err) => err.message)
-        .should.become(errMessage);
-    });
-    it('null (string) should throw an error', () => {
-      return serverless.variables
-        .getValueStrToBool('strToBool(null)')
-        .catch((err) => err.message)
-        .should.become(errMessage);
-    });
-    it('strToBool(true) as an input to strToBool', () => {
-      const input = serverless.variables.getValueStrToBool('strToBool(true)');
-      return serverless.variables.getValueStrToBool(input).should.become(true);
-    });
-    it('strToBool(false) as an input to strToBool', () => {
-      const input = serverless.variables.getValueStrToBool('strToBool(false)');
-      return serverless.variables.getValueStrToBool(input).should.become(true);
-    });
-  });
-
-  describe('#getDeeperValue()', () => {
-    it('should get deep values', () => {
-      const valueToPopulateMock = {
-        service: 'testService',
-        custom: {
-          subProperty: {
-            deep: 'deepValue',
-          },
-        },
-      };
-      serverless.variables.loadVariableSyntax();
-      return serverless.variables
-        .getDeeperValue(['custom', 'subProperty', 'deep'], valueToPopulateMock)
-        .should.become('deepValue');
-    });
-    it('should not throw error if referencing invalid properties', () => {
-      const valueToPopulateMock = {
-        service: 'testService',
-        custom: {
-          subProperty: 'hello',
-        },
-      };
-      serverless.variables.loadVariableSyntax();
-      return serverless.variables
-        .getDeeperValue(['custom', 'subProperty', 'deep', 'deeper'], valueToPopulateMock)
-        .should.eventually.deep.equal({});
-    });
-    it('should return a simple deep variable when final deep value is variable', () => {
-      serverless.variables.service = {
-        service: 'testService',
-        custom: {
-          subProperty: {
-            // eslint-disable-next-line no-template-curly-in-string
-            deep: '${self:custom.anotherVar.veryDeep}',
-          },
-        },
-        provider: serverless.service.provider,
-      };
-      serverless.variables.loadVariableSyntax();
-      return serverless.variables
-        .getDeeperValue(['custom', 'subProperty', 'deep'], serverless.variables.service)
-        .should.become('${deep:0}');
-    });
-    it('should return a deep continuation when middle deep value is variable', () => {
-      serverless.variables.service = {
-        service: 'testService',
-        custom: {
-          anotherVar: '${self:custom.var}',
-        },
-        provider: serverless.service.provider,
-      };
-      serverless.variables.loadVariableSyntax();
-      return serverless.variables
-        .getDeeperValue(['custom', 'anotherVar', 'veryDeep'], serverless.variables.service)
-        .should.become('${deep:0.veryDeep}');
-    });
-  });
-
-  describe('#handleUnresolved()', () => {
-    let logWarningSpy;
-    let consoleLogStub;
-    let varProxy;
-
-    beforeEach(() => {
-      logWarningSpy = sinon.spy(slsError, 'logWarning');
-      consoleLogStub = sinon.stub(console, 'log').returns();
-      const ProxyQuiredVariables = proxyquire('../../../../lib/classes/Variables.js', {
-        './Error': logWarningSpy,
-      });
-      varProxy = new ProxyQuiredVariables(serverless);
-    });
-
-    afterEach(() => {
-      logWarningSpy.restore();
-      consoleLogStub.restore();
-    });
-
-    it('should do nothing if variable has valid value.', () => {
-      varProxy.handleUnresolved('self:service', 'a-valid-value');
-      expect(logWarningSpy).to.not.have.been.calledOnce;
-    });
-
-    describe('when variable string does not match any of syntax', () => {
-      // These situation happen when deep variable population fails
-      it('should do nothing if variable has null value.', () => {
-        varProxy.handleUnresolved('', null);
-        expect(logWarningSpy).to.not.have.been.calledOnce;
-      });
-
-      it('should do nothing if variable has undefined value.', () => {
-        varProxy.handleUnresolved('', undefined);
-        expect(logWarningSpy).to.not.have.been.calledOnce;
-      });
-
-      it('should do nothing if variable has empty object value.', () => {
-        varProxy.handleUnresolved('', {});
-        expect(logWarningSpy).to.not.have.been.calledOnce;
-      });
-    });
-    it('should log if variable has null value.', () => {
-      varProxy.handleUnresolved('self:service', null);
-      expect(logWarningSpy).to.have.been.calledOnce;
-    });
-    it('should log if variable has undefined value.', () => {
-      varProxy.handleUnresolved('self:service', undefined);
-      expect(logWarningSpy).to.have.been.calledOnce;
-    });
-
-    it('should log if variable has empty object value.', () => {
-      varProxy.handleUnresolved('self:service', {});
-      expect(logWarningSpy).to.have.been.calledOnce;
-    });
-
-    it('should not log if variable has empty array value.', () => {
-      varProxy.handleUnresolved('self:service', []);
-      expect(logWarningSpy).to.not.have.been.called;
-    });
-
-    it('should detect the "environment variable" variable type', () => {
-      varProxy.handleUnresolved('env:service', null);
-      expect(logWarningSpy).to.have.been.calledOnce;
-      expect(logWarningSpy.args[0][0]).to.contain('environment variable');
-    });
-
-    it('should detect the "option" variable type', () => {
-      varProxy.handleUnresolved('opt:service', null);
-      expect(logWarningSpy).to.have.been.calledOnce;
-      expect(logWarningSpy.args[0][0]).to.contain('option');
-    });
-
-    it('should detect the "service attribute" variable type', () => {
-      varProxy.handleUnresolved('self:service', null);
-      expect(logWarningSpy).to.have.been.calledOnce;
-      expect(logWarningSpy.args[0][0]).to.contain('service attribute');
-    });
-
-    it('should detect the "file" variable type', () => {
-      varProxy.handleUnresolved('file(service)', null);
-      expect(logWarningSpy).to.have.been.calledOnce;
-      expect(logWarningSpy.args[0][0]).to.contain('file');
-    });
-  });
-});
-
-describe('test/unit/lib/classes/Variables.test.js', () => {
-  let processedConfig = null;
-  before(async () => {
-    const result = await runServerless({
-      fixture: 'variables-legacy',
-      command: 'print',
-      shouldUseLegacyVariablesResolver: true,
-    });
-    processedConfig = result.serverless.service;
-  });
-
-  it('should support ${file(...)} syntax', () => {
-    expect(processedConfig.custom.importedFile).to.deep.equal({
-      foo: 'bar',
-    });
-  });
-
-  it('should support ${file(...):key} syntax', () => {
-    expect(processedConfig.custom.importedFileWithKey).to.equal('bar');
-  });
-
-  it('should support ${file(...)} syntax for Terraform state', () => {
-    expect(processedConfig.custom.importedTerraformState).to.deep.equal({
-      version: 4,
-      terraform_version: '0.14.4',
-      serial: 11,
-      lineage: '12ab3c45-abc1-0a1b-1a23-a12b34567c89',
-      outputs: {
-        listenerarn: {
-          value:
-            'arn:aws:elasticloadbalancing:us-west-2:123456789876:listener/app/myapp/1a2b3c4f1a23456b/a1b23c45de6789fa',
-          type: 'string',
-        },
-      },
-      resources: [],
-    });
-  });
-
-  it('should support ${file(...):key} syntax for Terraform state', () => {
-    expect(processedConfig.custom.importedTerraformStateWithKey).to.equal('string');
-  });
-
-  it('should ignore native CloudFormation variables', () => {
-    expect(processedConfig.custom.awsVariable).to.equal('${AWS::Region}');
-  });
-
-  it('should ignore CloudFormation references', () => {
-    expect(processedConfig.custom.cloudFormationReference).to.equal('${AnotherResource}');
-  });
-
-  it('should support ${self:key} syntax', () => {
-    expect(processedConfig.custom.selfReference).to.equal('bar');
-  });
-  it('should support ${self:} syntax', () => {
-    expect(processedConfig.custom.serviceReference).to.equal(processedConfig);
-  });
-  it('should support nested resolution', () => {
-    expect(processedConfig.custom.nestedReference).to.equal('resolvedNested');
-  });
-
-  it('should handle resolving variables when `prototype` is part of the path', async () => {
-    expect(processedConfig.custom.prototype.nestedInPrototype).to.equal('bar-in-prototype');
-  });
-
-  describe('variable resolving', () => {
-    describe('when unresolvedVariablesNotificationMode is set to "error"', () => {
-      it('should error for missing "environment variable" type variables', async () => {
-        await expect(
-          runServerless({
-            fixture: 'variables-legacy',
-            command: 'print',
-            configExt: {
-              unresolvedVariablesNotificationMode: 'error',
-              custom: { myVariable: '${env:missingEnvVar}' },
-            },
-            shouldUseLegacyVariablesResolver: true,
-          })
-        ).to.eventually.be.rejected.and.have.property('code', 'UNRESOLVED_CONFIG_VARIABLE');
-      });
-
-      it('should error for missing "option" type variables', async () => {
-        await expect(
-          runServerless({
-            fixture: 'variables-legacy',
-            command: 'print',
-            configExt: {
-              unresolvedVariablesNotificationMode: 'error',
-              custom: { myVariable: '${opt:missingOpt}' },
-            },
-            shouldUseLegacyVariablesResolver: true,
-          })
-        ).to.eventually.be.rejected.and.have.property('code', 'UNRESOLVED_CONFIG_VARIABLE');
-      });
-
-      it('should error for missing "service attribute" type variables', async () => {
-        await expect(
-          runServerless({
-            fixture: 'variables-legacy',
-            command: 'print',
-            configExt: {
-              unresolvedVariablesNotificationMode: 'error',
-              custom: { myVariable: '${self:missingAttribute}' },
-            },
-            shouldUseLegacyVariablesResolver: true,
-          })
-        ).to.eventually.be.rejected.and.have.property('code', 'UNRESOLVED_CONFIG_VARIABLE');
-      });
-
-      it('should error for missing "file" type variables', async () => {
-        await expect(
-          runServerless({
-            fixture: 'variables-legacy',
-            command: 'print',
-            configExt: {
-              unresolvedVariablesNotificationMode: 'error',
-              custom: { myVariable: '${file(./missingFile)}' },
-            },
-            shouldUseLegacyVariablesResolver: true,
-          })
-        ).to.eventually.be.rejected.and.have.property('code', 'UNRESOLVED_CONFIG_VARIABLE');
-      });
-    });
-
-    describe('when unresolvedVariablesNotificationMode is set to "warn"', () => {
-      it('prints warnings to the console but no deprecation message', async () => {
-        const { serverless, stdoutData } = await runServerless({
-          fixture: 'variables-legacy',
-          command: 'print',
-          configExt: {
-            unresolvedVariablesNotificationMode: 'warn',
-            custom: {
-              myVariable1: '${env:missingEnvVar}',
-              myVariable2: '${opt:missingOpt}',
-              myVariable3: '${self:missingAttribute}',
-              myVariable4: '${file(./missingFile)}',
-            },
-          },
-          shouldUseLegacyVariablesResolver: true,
-        });
-
-        expect(Array.from(serverless.triggeredDeprecations)).not.to.contain(
-          'VARIABLES_ERROR_ON_UNRESOLVED'
-        );
-
-        expect(stdoutData).to.include('Serverless Warning');
-        expect(stdoutData).to.include('A valid environment variable to satisfy the declaration');
-        expect(stdoutData).to.include('A valid option to satisfy the declaration');
-        expect(stdoutData).to.include('A valid service attribute to satisfy the declaration');
-        expect(stdoutData).to.include('A valid file to satisfy the declaration');
-      });
-    });
-
-    describe('when unresolvedVariablesNotificationMode is not set', () => {
-      it('should warn and print a deprecation message', async () => {
-        const { serverless } = await runServerless({
-          fixture: 'variables-legacy',
-          command: 'print',
-          configExt: {
-            custom: {
-              myVariable1: '${env:missingEnvVar}',
-              myVariable2: '${opt:missingOpt}',
-              myVariable3: '${self:missingAttribute}',
-              myVariable4: '${file(./missingFile)}',
-            },
-          },
-          shouldUseLegacyVariablesResolver: true,
-        });
-
-        expect(Array.from(serverless.triggeredDeprecations)).to.contain(
-          'VARIABLES_ERROR_ON_UNRESOLVED'
-        );
-      });
-    });
-  });
-});
diff --git a/test/unit/lib/classes/cli.test.js b/test/unit/lib/classes/cli.test.js
new file mode 100644
index 00000000000..5ac76a806d5
--- /dev/null
+++ b/test/unit/lib/classes/cli.test.js
@@ -0,0 +1,44 @@
+'use strict';
+
+const chai = require('chai');
+const CLI = require('../../../../lib/classes/cli');
+const Serverless = require('../../../../lib/serverless');
+
+const { expect } = chai;
+chai.use(require('sinon-chai'));
+
+describe('CLI', () => {
+  let cli;
+  let serverless;
+
+  beforeEach(() => {
+    serverless = new Serverless({ commands: [], options: {} });
+  });
+
+  describe('#constructor()', () => {
+    it('should set the serverless instance', () => {
+      cli = new CLI(serverless);
+      expect(cli.serverless).to.deep.equal(serverless);
+    });
+
+    it('should set an empty loadedPlugins array', () => {
+      cli = new CLI(serverless);
+      expect(cli.loadedPlugins.length).to.equal(0);
+    });
+  });
+
+  describe('#setLoadedPlugins()', () => {
+    it('should set the loadedPlugins array with the given plugin instances', () => {
+      class PluginMock {}
+
+      const pluginMock = new PluginMock();
+      const plugins = [pluginMock];
+
+      cli = new CLI(serverless);
+
+      cli.setLoadedPlugins(plugins);
+
+      expect(cli.loadedPlugins[0]).to.equal(pluginMock);
+    });
+  });
+});
diff --git a/test/unit/lib/classes/ConfigSchemaHandler/index.test.js b/test/unit/lib/classes/config-schema-handler/index.test.js
similarity index 83%
rename from test/unit/lib/classes/ConfigSchemaHandler/index.test.js
rename to test/unit/lib/classes/config-schema-handler/index.test.js
index d1054c7bfbe..2519a7eb62f 100644
--- a/test/unit/lib/classes/ConfigSchemaHandler/index.test.js
+++ b/test/unit/lib/classes/config-schema-handler/index.test.js
@@ -2,17 +2,20 @@
 
 const chai = require('chai');
 const runServerless = require('../../../../utils/run-serverless');
+const {
+  getConfigurationValidationResult,
+} = require('../../../../../lib/classes/config-schema-handler');
 
 chai.use(require('chai-as-promised'));
 
 const expect = chai.expect;
 const FUNCTION_NAME_PATTERN = '^[a-zA-Z0-9-_]+$';
 
-describe('ConfigSchemaHandler', () => {
+describe('test/unit/lib/classes/ConfigSchemaHandler/index.test.js', () => {
   describe('#constructor', () => {
     it('should freeze parts of schema for service', () => {
       return runServerless({
-        fixture: 'configSchemaExtensions',
+        fixture: 'config-schema-extensions',
         command: 'info',
       }).then((serverless) => {
         expect(() => {
@@ -23,7 +26,7 @@ describe('ConfigSchemaHandler', () => {
 
     it('should freeze parts of schema for plugins', () => {
       return runServerless({
-        fixture: 'configSchemaExtensions',
+        fixture: 'config-schema-extensions',
         command: 'info',
       }).then((serverless) => {
         expect(() => {
@@ -34,7 +37,7 @@ describe('ConfigSchemaHandler', () => {
 
     it('should freeze parts of schema for resources', () => {
       return runServerless({
-        fixture: 'configSchemaExtensions',
+        fixture: 'config-schema-extensions',
         command: 'info',
       }).then((serverless) => {
         expect(() => {
@@ -45,7 +48,7 @@ describe('ConfigSchemaHandler', () => {
 
     it('should freeze parts of schema for package', () => {
       return runServerless({
-        fixture: 'configSchemaExtensions',
+        fixture: 'config-schema-extensions',
         command: 'info',
       }).then((serverless) => {
         expect(() => {
@@ -58,7 +61,7 @@ describe('ConfigSchemaHandler', () => {
 
     it('should freeze parts of schema for layers', () => {
       return runServerless({
-        fixture: 'configSchemaExtensions',
+        fixture: 'config-schema-extensions',
         command: 'info',
       }).then((serverless) => {
         expect(() => {
@@ -69,18 +72,19 @@ describe('ConfigSchemaHandler', () => {
   });
 
   describe('#validateConfig', () => {
-    it('should run without errors for valid config', () => {
-      return runServerless({
-        fixture: 'configSchemaExtensions',
+    it('should run without errors for valid config', async () => {
+      const { serverless } = await runServerless({
+        fixture: 'config-schema-extensions',
         command: 'info',
       });
+      expect(getConfigurationValidationResult(serverless.configurationInput)).to.be.true;
     });
   });
 
   describe('#defineFunctionEvent', () => {
     it('should extend schema with defineFunctionEvent method', () => {
       return runServerless({
-        fixture: 'configSchemaExtensions',
+        fixture: 'config-schema-extensions',
         command: 'info',
       }).then((serverless) => {
         const expectedPieceOfSchema = {
@@ -114,7 +118,7 @@ describe('ConfigSchemaHandler', () => {
     it('should throw when defineFunctionEvent is used with an already defined event', async () => {
       await expect(
         runServerless({
-          fixture: 'configSchemaExtensionsError',
+          fixture: 'config-schema-extensions-error',
           command: 'info',
           configExt: {
             plugins: ['./test-plugin-with-colliding-function-event'],
@@ -127,15 +131,16 @@ describe('ConfigSchemaHandler', () => {
   describe('#defineFunctionEventProperties', () => {
     it('should extend schema with defineFunctionEventProperties method', async () => {
       const serverless = await runServerless({
-        fixture: 'configSchemaExtensions',
+        fixture: 'config-schema-extensions',
         command: 'info',
       });
 
-      const existingEventDefinition = serverless.serverless.configSchemaHandler.schema.properties.functions.patternProperties[
-        FUNCTION_NAME_PATTERN
-      ].properties.events.items.anyOf.find(
-        (definition) => definition.required[0] === 'existingEvent'
-      ).properties.existingEvent;
+      const existingEventDefinition =
+        serverless.serverless.configSchemaHandler.schema.properties.functions.patternProperties[
+          FUNCTION_NAME_PATTERN
+        ].properties.events.items.anyOf.find(
+          (definition) => definition.required[0] === 'existingEvent'
+        ).properties.existingEvent;
 
       expect(existingEventDefinition.properties).to.have.deep.property(
         'somePluginAdditionalEventProp',
@@ -148,15 +153,16 @@ describe('ConfigSchemaHandler', () => {
 
     it('should extend schema with defineFunctionEventProperties method on complex event schema', async () => {
       const serverless = await runServerless({
-        fixture: 'configSchemaExtensions',
+        fixture: 'config-schema-extensions',
         command: 'info',
       });
 
-      const existingEventDefinition = serverless.serverless.configSchemaHandler.schema.properties.functions.patternProperties[
-        FUNCTION_NAME_PATTERN
-      ].properties.events.items.anyOf.find(
-        (definition) => definition.required[0] === 'existingComplexEvent'
-      ).properties.existingComplexEvent;
+      const existingEventDefinition =
+        serverless.serverless.configSchemaHandler.schema.properties.functions.patternProperties[
+          FUNCTION_NAME_PATTERN
+        ].properties.events.items.anyOf.find(
+          (definition) => definition.required[0] === 'existingComplexEvent'
+        ).properties.existingComplexEvent;
 
       expect(existingEventDefinition).to.deep.equal({
         anyOf: [
@@ -176,7 +182,7 @@ describe('ConfigSchemaHandler', () => {
     it('should throw when defineFunctionEventProperties is used on non existing event name', async () => {
       await expect(
         runServerless({
-          fixture: 'configSchemaExtensionsError',
+          fixture: 'config-schema-extensions-error',
           command: 'info',
           configExt: {
             plugins: ['./test-plugin-with-non-existing-event-error'],
@@ -188,7 +194,7 @@ describe('ConfigSchemaHandler', () => {
     it('should throw when defineFunctionEventProperties is used on event without object definition', async () => {
       await expect(
         runServerless({
-          fixture: 'configSchemaExtensionsError',
+          fixture: 'config-schema-extensions-error',
           command: 'info',
           configExt: {
             plugins: ['./test-plugin-with-complex-event-without-object-definition'],
@@ -200,7 +206,7 @@ describe('ConfigSchemaHandler', () => {
     it('should throw when defineFunctionEventProperties is used with an already defined property', async () => {
       await expect(
         runServerless({
-          fixture: 'configSchemaExtensionsError',
+          fixture: 'config-schema-extensions-error',
           command: 'info',
           configExt: {
             plugins: ['./test-plugin-with-colliding-function-event-property'],
@@ -213,7 +219,7 @@ describe('ConfigSchemaHandler', () => {
   describe('#defineFunctionProperties', () => {
     it('should extend schema with defineFunctionProperties method', () => {
       return runServerless({
-        fixture: 'configSchemaExtensions',
+        fixture: 'config-schema-extensions',
         command: 'info',
       }).then((serverless) => {
         const actualFunctionProperties =
@@ -236,7 +242,7 @@ describe('ConfigSchemaHandler', () => {
     it('should throw when defineFunctionProperties is used with an already defined property', async () => {
       await expect(
         runServerless({
-          fixture: 'configSchemaExtensionsError',
+          fixture: 'config-schema-extensions-error',
           command: 'info',
           configExt: {
             plugins: ['./test-plugin-with-colliding-function-property'],
@@ -249,7 +255,7 @@ describe('ConfigSchemaHandler', () => {
   describe('#defineCustomProperties', () => {
     it('should extend schema with defineCustomProperties method', () => {
       return runServerless({
-        fixture: 'configSchemaExtensions',
+        fixture: 'config-schema-extensions',
         command: 'info',
       }).then((serverless) => {
         const someCustomStringProp = {
@@ -266,7 +272,7 @@ describe('ConfigSchemaHandler', () => {
     it('should throw when defineCustomProperties is used with an already defined property', async () => {
       await expect(
         runServerless({
-          fixture: 'configSchemaExtensionsError',
+          fixture: 'config-schema-extensions-error',
           command: 'info',
           configExt: {
             plugins: ['./test-plugin-with-colliding-custom-property'],
@@ -279,7 +285,7 @@ describe('ConfigSchemaHandler', () => {
   describe('#defineTopLevelProperty', () => {
     it('should extend schema with defineTopLevelProperty method', () => {
       return runServerless({
-        fixture: 'configSchemaExtensions',
+        fixture: 'config-schema-extensions',
         command: 'info',
       }).then((serverless) => {
         const expectedAppPropSchema = {
@@ -295,7 +301,7 @@ describe('ConfigSchemaHandler', () => {
     it('should throw when defineTopLevelProperty is used with an already defined property', async () => {
       await expect(
         runServerless({
-          fixture: 'configSchemaExtensionsError',
+          fixture: 'config-schema-extensions-error',
           command: 'info',
           configExt: {
             plugins: ['./test-plugin-with-colliding-top-level-property'],
@@ -308,7 +314,7 @@ describe('ConfigSchemaHandler', () => {
   describe('#defineProvider', () => {
     it('should extend schema with defineProvider method', () => {
       return runServerless({
-        fixture: 'configSchemaExtensions',
+        fixture: 'config-schema-extensions',
         command: 'info',
       }).then((serverless) => {
         const providerPieceOfSchema = {
@@ -316,7 +322,6 @@ describe('ConfigSchemaHandler', () => {
           properties: {
             name: { const: 'someProvider' },
             stage: { type: 'string' },
-            variableSyntax: { type: 'string' },
           },
           required: ['name'],
           additionalProperties: false,
@@ -338,7 +343,7 @@ describe('ConfigSchemaHandler', () => {
     it('should throw when defineProvider is used with an already defined property in provider', async () => {
       await expect(
         runServerless({
-          fixture: 'configSchemaExtensionsError',
+          fixture: 'config-schema-extensions-error',
           command: 'info',
           configExt: {
             plugins: ['./test-plugin-with-colliding-provider-property-in-provider'],
@@ -350,7 +355,7 @@ describe('ConfigSchemaHandler', () => {
     it('should throw when defineProvider is used with an already defined property in function', async () => {
       await expect(
         runServerless({
-          fixture: 'configSchemaExtensionsError',
+          fixture: 'config-schema-extensions-error',
           command: 'info',
           configExt: {
             plugins: ['./test-plugin-with-colliding-provider-property-in-function'],
diff --git a/test/unit/lib/classes/ConfigSchemaHandler/normalizeAjvErrors.test.js b/test/unit/lib/classes/config-schema-handler/normalize-ajv-errors.test.js
similarity index 80%
rename from test/unit/lib/classes/ConfigSchemaHandler/normalizeAjvErrors.test.js
rename to test/unit/lib/classes/config-schema-handler/normalize-ajv-errors.test.js
index 79d73a84c6d..ebcbfc0a909 100644
--- a/test/unit/lib/classes/ConfigSchemaHandler/normalizeAjvErrors.test.js
+++ b/test/unit/lib/classes/config-schema-handler/normalize-ajv-errors.test.js
@@ -2,9 +2,9 @@
 
 const { expect } = require('chai');
 
-const Ajv = require('ajv');
+const Ajv = require('ajv').default;
 const memoize = require('memoizee');
-const normalizeAjvErrors = require('../../../../../lib/classes/ConfigSchemaHandler/normalizeAjvErrors');
+const normalizeAjvErrors = require('../../../../../lib/classes/config-schema-handler/normalize-ajv-errors');
 
 describe('#normalizeAjvErrors', () => {
   const resolveAjv = memoize(
@@ -58,6 +58,19 @@ describe('#normalizeAjvErrors', () => {
               },
             ],
           },
+          someString: {
+            anyOf: [
+              {
+                type: 'string',
+                pattern: 'foo',
+              },
+              {
+                type: 'string',
+                pattern: 'bar',
+              },
+              { type: 'object' },
+            ],
+          },
         },
       },
       package: {
@@ -165,6 +178,7 @@ describe('#normalizeAjvErrors', () => {
       },
       custom: {
         someCustom: { name: 'third' },
+        someString: 'other',
       },
       package: { incclude: ['./folder'] },
       functions: {
@@ -205,7 +219,7 @@ describe('#normalizeAjvErrors', () => {
     it('should report error for unrecognized root property', () =>
       expect(
         errors.some((error) => {
-          if (error.dataPath !== '') return false;
+          if (error.instancePath !== '') return false;
           if (error.keyword !== 'additionalProperties') return false;
           error.isExpected = true;
           return true;
@@ -214,7 +228,7 @@ describe('#normalizeAjvErrors', () => {
     it('should report error for unrecognized deep level property', () =>
       expect(
         errors.some((error) => {
-          if (error.dataPath !== '.package') return false;
+          if (error.instancePath !== '/package') return false;
           if (error.keyword !== 'additionalProperties') return false;
           error.isExpected = true;
           return true;
@@ -223,7 +237,7 @@ describe('#normalizeAjvErrors', () => {
     it('should report error for invalid function name', () =>
       expect(
         errors.some((error) => {
-          if (error.dataPath !== '.functions') return false;
+          if (error.instancePath !== '/functions') return false;
           if (error.keyword !== 'additionalProperties') return false;
           error.isExpected = true;
           return true;
@@ -232,7 +246,7 @@ describe('#normalizeAjvErrors', () => {
     it('should report error for unrecognized event', () =>
       expect(
         errors.some((error) => {
-          if (error.dataPath !== ".functions['foo'].events[0]") return false;
+          if (error.instancePath !== '/functions/foo/events/0') return false;
           if (error.keyword !== 'anyOf') return false;
           error.isExpected = true;
           return true;
@@ -241,7 +255,7 @@ describe('#normalizeAjvErrors', () => {
     it('should report error for unrecognized property at event type configuration level', () =>
       expect(
         errors.some((error) => {
-          if (error.dataPath !== ".functions['foo'].events[1]") return false;
+          if (error.instancePath !== '/functions/foo/events/1') return false;
           if (error.keyword !== 'additionalProperties') return false;
           error.isExpected = true;
           return true;
@@ -260,7 +274,7 @@ describe('#normalizeAjvErrors', () => {
         //         method: GET # Should be additionally indented
         expect(
           errors.some((error) => {
-            if (error.dataPath !== ".functions['foo'].events[2]") return false;
+            if (error.instancePath !== '/functions/foo/events/2') return false;
             if (error.keyword !== 'additionalProperties') return false;
             error.isExpected = true;
             return true;
@@ -273,7 +287,7 @@ describe('#normalizeAjvErrors', () => {
       () =>
         expect(
           errors.some((error) => {
-            if (error.dataPath !== ".functions['foo'].events[3].http") return false;
+            if (error.instancePath !== '/functions/foo/events/3/http') return false;
             if (error.keyword !== 'additionalProperties') return false;
             error.isExpected = true;
             return true;
@@ -286,7 +300,7 @@ describe('#normalizeAjvErrors', () => {
       () =>
         expect(
           errors.some((error) => {
-            if (error.dataPath !== ".functions['foo'].events[4].http") return false;
+            if (error.instancePath !== '/functions/foo/events/4/http') return false;
             if (error.keyword !== 'pattern') return false;
             error.isExpected = true;
             return true;
@@ -299,7 +313,7 @@ describe('#normalizeAjvErrors', () => {
       () =>
         expect(
           errors.some((error) => {
-            if (error.dataPath !== ".functions['foo'].events[5].http") return false;
+            if (error.instancePath !== '/functions/foo/events/5/http') return false;
             if (error.keyword !== 'required') return false;
             error.isExpected = true;
             return true;
@@ -312,7 +326,9 @@ describe('#normalizeAjvErrors', () => {
       () =>
         expect(
           errors.some((error) => {
-            if (error.dataPath !== '.provider.deploymentBucket.maxPreviousDeploymentArtifacts') {
+            if (
+              error.instancePath !== '/provider/deploymentBucket/maxPreviousDeploymentArtifacts'
+            ) {
               return false;
             }
             if (error.keyword !== 'type') return false;
@@ -327,7 +343,22 @@ describe('#normalizeAjvErrors', () => {
       () =>
         expect(
           errors.some((error) => {
-            if (error.dataPath !== '.custom.someCustom') {
+            if (error.instancePath !== '/custom/someCustom') {
+              return false;
+            }
+            if (error.keyword !== 'anyOf') return false;
+            error.isExpected = true;
+            return true;
+          })
+        ).to.be.true
+    );
+    it(
+      'should report in anyOf case, where two values of same (string) type are possible ' +
+        'and for all variants errors relate to paths of same depth',
+      () =>
+        expect(
+          errors.some((error) => {
+            if (error.instancePath !== '/custom/someString') {
               return false;
             }
             if (error.keyword !== 'anyOf') return false;
@@ -349,7 +380,7 @@ describe('#normalizeAjvErrors', () => {
     it('should report "additionalProperties" error with meaningful message', () =>
       expect(
         errors.find((error) => {
-          if (error.dataPath !== '.package') return false;
+          if (error.instancePath !== '/package') return false;
           if (error.keyword !== 'additionalProperties') return false;
           return true;
         }).message
@@ -357,7 +388,7 @@ describe('#normalizeAjvErrors', () => {
     it('should report invalid function name error with meaningful message', () =>
       expect(
         errors.find((error) => {
-          if (error.dataPath !== '.functions') return false;
+          if (error.instancePath !== '/functions') return false;
           if (error.keyword !== 'additionalProperties') return false;
           return true;
         }).message
@@ -365,10 +396,26 @@ describe('#normalizeAjvErrors', () => {
     it('should report unrecognized event error with a meaningful message', () =>
       expect(
         errors.find((error) => {
-          if (error.dataPath !== ".functions['foo'].events[0]") return false;
+          if (error.instancePath !== '/functions/foo/events/0') return false;
           if (error.keyword !== 'anyOf') return false;
           return true;
         }).message
       ).to.include('unsupported function event'));
+    it('should report value which do not match multiple constants with a meaningful message', () =>
+      expect(
+        errors.find((error) => {
+          if (error.instancePath !== '/custom/someCustom') return false;
+          if (error.keyword !== 'anyOf') return false;
+          return true;
+        }).message
+      ).to.include('unsupported value'));
+    it('should report value which do not match multiple string formats with a meaningful message', () =>
+      expect(
+        errors.find((error) => {
+          if (error.instancePath !== '/custom/someString') return false;
+          if (error.keyword !== 'anyOf') return false;
+          return true;
+        }).message
+      ).to.include('unsupported string format'));
   });
 });
diff --git a/test/unit/lib/classes/config-schema-handler/resolve-ajv-validate.test.js b/test/unit/lib/classes/config-schema-handler/resolve-ajv-validate.test.js
new file mode 100644
index 00000000000..aead0166d1e
--- /dev/null
+++ b/test/unit/lib/classes/config-schema-handler/resolve-ajv-validate.test.js
@@ -0,0 +1,60 @@
+'use strict';
+
+const chai = require('chai');
+const resolveAjvValidate = require('../../../../../lib/classes/config-schema-handler/resolve-ajv-validate');
+const objectHash = require('object-hash');
+const deepSortObjectByKey = require('../../../../../lib/utils/deep-sort-object-by-key');
+const path = require('path');
+const os = require('os');
+const fsp = require('fs').promises;
+
+chai.use(require('chai-as-promised'));
+
+const expect = chai.expect;
+
+describe('test/unit/lib/classes/ConfigSchemaHandler/resolveAjvValidate.test.js', () => {
+  const schema = {
+    $id: 'https://example.com/person.schema.json',
+    $schema: 'http://json-schema.org/draft-07/schema#',
+    title: 'TestSchema',
+    type: 'object',
+    properties: {
+      firstProp: {
+        type: 'string',
+      },
+    },
+  };
+
+  it('generates schema validation file', async () => {
+    await resolveAjvValidate(schema);
+    const schemaHash = objectHash(deepSortObjectByKey(schema));
+
+    const fileStat = await fsp.lstat(
+      path.resolve(
+        process.env.SLS_SCHEMA_CACHE_BASE_DIR || os.homedir(),
+        `.serverless/artifacts/ajv-validate-${require('ajv/package').version}`,
+        `${schemaHash}.js`
+      )
+    );
+    expect(fileStat.isFile()).to.be.true;
+  });
+
+  it('regenerates schema validation file if schema changes', async () => {
+    await resolveAjvValidate(schema);
+    const updatedSchema = {
+      ...schema,
+      title: 'ChangedTitle',
+    };
+    await resolveAjvValidate(updatedSchema);
+    const schemaHash = objectHash(deepSortObjectByKey(updatedSchema));
+
+    const fileStat = await fsp.lstat(
+      path.resolve(
+        process.env.SLS_SCHEMA_CACHE_BASE_DIR || os.homedir(),
+        `.serverless/artifacts/ajv-validate-${require('ajv/package').version}`,
+        `${schemaHash}.js`
+      )
+    );
+    expect(fileStat.isFile()).to.be.true;
+  });
+});
diff --git a/test/unit/lib/classes/Config.test.js b/test/unit/lib/classes/config.test.js
similarity index 82%
rename from test/unit/lib/classes/Config.test.js
rename to test/unit/lib/classes/config.test.js
index bb0164592ac..af2be027f67 100644
--- a/test/unit/lib/classes/Config.test.js
+++ b/test/unit/lib/classes/config.test.js
@@ -1,10 +1,10 @@
 'use strict';
 
 const expect = require('chai').expect;
-const Config = require('../../../../lib/classes/Config');
-const Serverless = require('../../../../lib/Serverless');
+const Config = require('../../../../lib/classes/config');
+const Serverless = require('../../../../lib/serverless');
 
-const serverless = new Serverless();
+const serverless = new Serverless({ commands: [], options: {} });
 
 describe('Config', () => {
   describe('#constructor()', () => {
diff --git a/test/unit/lib/classes/PluginManager.test.js b/test/unit/lib/classes/plugin-manager.test.js
similarity index 75%
rename from test/unit/lib/classes/PluginManager.test.js
rename to test/unit/lib/classes/plugin-manager.test.js
index c254952e8ef..1cedf773731 100644
--- a/test/unit/lib/classes/PluginManager.test.js
+++ b/test/unit/lib/classes/plugin-manager.test.js
@@ -4,15 +4,16 @@
 
 const chai = require('chai');
 const overrideEnv = require('process-utils/override-env');
-const cjsResolve = require('ncjsm/resolve/sync');
 const spawn = require('child-process-ext/spawn');
 const overrideArgv = require('process-utils/override-argv');
 const resolveAwsEnv = require('@serverless/test/resolve-env');
-const Serverless = require('../../../../lib/Serverless');
-const CLI = require('../../../../lib/classes/CLI');
+const runServerless = require('../../../utils/run-serverless');
+const Serverless = require('../../../../lib/serverless');
+const CLI = require('../../../../lib/classes/cli');
 const resolveInput = require('../../../../lib/cli/resolve-input');
 const Create = require('../../../../lib/plugins/create/create');
 const ServerlessError = require('../../../../lib/serverless-error');
+const getRequire = require('../../../../lib/utils/get-require');
 
 const path = require('path');
 const fs = require('fs');
@@ -21,7 +22,6 @@ const mockRequire = require('mock-require');
 const sinon = require('sinon');
 const proxyquire = require('proxyquire');
 const BbPromise = require('bluebird');
-const getCacheFilePath = require('../../../../lib/utils/getCacheFilePath');
 const { installPlugin } = require('../../../utils/plugins');
 const { getTmpDirPath } = require('../../../utils/fs');
 
@@ -31,7 +31,6 @@ chai.use(require('sinon-chai'));
 const expect = chai.expect;
 
 describe('PluginManager', () => {
-  const env = resolveAwsEnv();
   let pluginManager;
   let serverless;
 
@@ -121,6 +120,10 @@ describe('PluginManager', () => {
                 },
               },
             },
+            other: {
+              usage: 'Deploy to other infrastructure',
+              lifecycleEvents: ['resources', 'functions'],
+            },
           },
         },
       };
@@ -159,9 +162,11 @@ describe('PluginManager', () => {
           options: {
             resource: {
               usage: 'The resource you want to deploy (e.g. --resource db)',
+              type: 'string',
             },
             function: {
               usage: 'The function you want to deploy (e.g. --function create)',
+              type: 'string',
             },
           },
           commands: {
@@ -171,9 +176,11 @@ describe('PluginManager', () => {
               options: {
                 resource: {
                   usage: 'The resource you want to deploy (e.g. --resource db)',
+                  type: 'string',
                 },
                 function: {
                   usage: 'The function you want to deploy (e.g. --function create)',
+                  type: 'string',
                 },
               },
             },
@@ -209,9 +216,11 @@ describe('PluginManager', () => {
           options: {
             resource: {
               usage: 'The resource you want to deploy (e.g. --resource db)',
+              type: 'string',
             },
             function: {
               usage: 'The function you want to deploy (e.g. --function create)',
+              type: 'string',
             },
           },
           commands: {
@@ -222,9 +231,11 @@ describe('PluginManager', () => {
               options: {
                 resource: {
                   usage: 'The resource you want to deploy (e.g. --resource db)',
+                  type: 'string',
                 },
                 function: {
                   usage: 'The function you want to deploy (e.g. --function create)',
+                  type: 'string',
                 },
               },
             },
@@ -394,25 +405,29 @@ describe('PluginManager', () => {
       case 'BrokenPluginMock':
       case 'ServicePluginMock1':
       case 'ServicePluginMock2':
-        return { realPath: pluginPath };
+        return pluginPath;
       case './RelativePath/ServicePluginMock2':
-        return { realPath: `${serviceDir}/RelativePath/ServicePluginMock2` };
+        return `${serviceDir}/RelativePath/ServicePluginMock2`;
       default:
-        return cjsResolve(directory, pluginPath);
+        return getRequire(directory).resolve(pluginPath);
     }
   };
 
   let restoreEnv;
   let serviceDir;
-  let PluginManager = proxyquire('../../../../lib/classes/PluginManager', {
-    'ncjsm/resolve/sync': resolveStub,
+  const PluginManager = proxyquire('../../../../lib/classes/plugin-manager', {
+    '../utils/get-require': (directory) => {
+      const resultRequire = require('module').createRequire(path.resolve(directory, 'req'));
+      resultRequire.resolve = (pluginPath) => resolveStub(directory, pluginPath);
+      return resultRequire;
+    },
   });
 
   beforeEach(() => {
     ({ restoreEnv } = overrideEnv({ whitelist: ['APPDATA', 'PATH'] }));
-    serverless = new Serverless();
+    serverless = new Serverless({ commands: [], options: {} });
     serverless.cli = new CLI();
-    serverless.processedInput = { commands: [], options: {} };
+    serverless.processedInput = { commands: ['print'], options: {} };
     pluginManager = new PluginManager(serverless);
     serviceDir = pluginManager.serverless.serviceDir = 'foo';
   });
@@ -459,65 +474,6 @@ describe('PluginManager', () => {
     });
   });
 
-  describe('#updateAutocompleteCacheFile()', () => {
-    let writeFileStub;
-    let cacheFilePath;
-    let getCommandsStub;
-
-    beforeEach(() => {
-      writeFileStub = sinon.stub().returns(BbPromise.resolve());
-      PluginManager = proxyquire('../../../../lib/classes/PluginManager.js', {
-        '../utils/fs/writeFile': writeFileStub,
-        'ncjsm/resolve/sync': resolveStub,
-      });
-      pluginManager = new PluginManager(serverless);
-      pluginManager.serverless.config = { servicePath: 'somePath' };
-      serviceDir = pluginManager.serverless.serviceDir;
-      cacheFilePath = getCacheFilePath(serviceDir);
-      getCommandsStub = sinon.stub(pluginManager, 'getCommands');
-    });
-
-    afterEach(() => {
-      pluginManager.getCommands.restore();
-    });
-
-    it('should update autocomplete cache file', () => {
-      const commandsMock = {
-        deploy: {
-          options: {
-            stage: {},
-          },
-          commands: {
-            function: {},
-          },
-        },
-        invoke: {
-          options: {
-            region: {},
-          },
-          commands: {
-            local: {},
-          },
-        },
-        remove: {},
-      };
-      const expectedCommands = {
-        deploy: ['--stage', 'function'],
-        invoke: ['--region', 'local'],
-        remove: [],
-      };
-      getCommandsStub.returns(commandsMock);
-
-      return pluginManager.updateAutocompleteCacheFile().then(() => {
-        expect(getCommandsStub.calledOnce).to.equal(true);
-        expect(writeFileStub.calledOnce).to.equal(true);
-        expect(writeFileStub.getCall(0).args[0]).to.equal(cacheFilePath);
-        expect(writeFileStub.getCall(0).args[1].commands).to.deep.equal(expectedCommands);
-        expect(typeof writeFileStub.getCall(0).args[1].validationHash).to.equal('string');
-      });
-    });
-  });
-
   describe('#convertShortcutsIntoOptions()', () => {
     it('should convert shortcuts into options when a one level deep command matches', () => {
       const cliOptionsMock = { r: 'eu-central-1', region: 'us-east-1' };
@@ -561,14 +517,6 @@ describe('PluginManager', () => {
       expect(pluginManager.plugins[0]).to.be.instanceof(SynchronousPluginMock);
     });
 
-    it('should not load plugins twice', () => {
-      pluginManager.addPlugin(SynchronousPluginMock);
-      pluginManager.addPlugin(SynchronousPluginMock);
-
-      expect(pluginManager.plugins[0]).to.be.instanceof(SynchronousPluginMock);
-      expect(pluginManager.plugins.length).to.equal(1);
-    });
-
     it('should load two plugins that happen to have the same class name', () => {
       function getFirst() {
         return class PluginMock {};
@@ -657,7 +605,7 @@ describe('PluginManager', () => {
       mockRequire('ServicePluginMock1', ServicePluginMock1);
       mockRequire('ServicePluginMock2', ServicePluginMock2);
       mockRequire('BrokenPluginMock', BrokenPluginMock);
-      mockRequire('@serverless/enterprise-plugin', EnterprisePluginMock);
+      mockRequire('@serverless/dashboard-plugin', EnterprisePluginMock);
     });
 
     it('should load only core plugins when no service plugins are given', () => {
@@ -742,7 +690,7 @@ describe('PluginManager', () => {
       mockRequire.stop('ServicePluginMock1');
       mockRequire.stop('ServicePluginMock2');
       mockRequire.stop('BrokenPluginMock');
-      mockRequire.stop('@serverless/enterprise-plugin');
+      mockRequire.stop('@serverless/dashboard-plugin');
     });
   });
 
@@ -982,32 +930,20 @@ describe('PluginManager', () => {
         /Command "deploy" cannot override an existing alias/
       );
     });
-
-    it('should log the alias when SLS_DEBUG is set', () => {
-      const consoleLogStub = sinon.stub(pluginManager.serverless.cli, 'log').returns();
-      const synchronousPluginMockInstance = new SynchronousPluginMock();
-      synchronousPluginMockInstance.commands.deploy.aliases = ['info'];
-      process.env.SLS_DEBUG = '*';
-      pluginManager.loadCommands(synchronousPluginMockInstance);
-      expect(consoleLogStub).to.have.been.calledWith('  -> @info');
-    });
   });
 
   describe('#loadHooks()', () => {
     let deprecatedPluginInstance;
-    let consoleLogStub;
 
     beforeEach(() => {
       deprecatedPluginInstance = new DeprecatedLifecycleEventsPluginMock();
       pluginManager.deprecatedEvents = {
         'deprecated:deprecated': 'new:new',
       };
-      consoleLogStub = sinon.stub(pluginManager.serverless.cli, 'log').returns();
     });
 
     afterEach(() => {
       pluginManager.deprecatedEvents = {};
-      pluginManager.serverless.cli.log.restore();
     });
 
     it('should replace deprecated events with the new ones', () => {
@@ -1020,202 +956,6 @@ describe('PluginManager', () => {
       expect(pluginManager.hooks['untouched:untouched'][0].pluginName).to.equal(
         'DeprecatedLifecycleEventsPluginMock'
       );
-      expect(consoleLogStub.calledOnce).to.equal(false);
-    });
-
-    it('should log a debug message about deprecated when using SLS_DEBUG', () => {
-      process.env.SLS_DEBUG = '1';
-      pluginManager.loadHooks(deprecatedPluginInstance);
-
-      expect(consoleLogStub.calledOnce).to.equal(true);
-    });
-  });
-
-  describe('#loadVariableResolvers()', () => {
-    it('should load the plugin variable resolvers with short sytnax', () => {
-      class VariableResolverPlugin {
-        getTestVariable() {
-          return Promise.resolve('testVariable');
-        }
-        constructor() {
-          this.variableResolvers = {
-            test: this.getTestVariable,
-          };
-        }
-      }
-      pluginManager.serverless.variables = {
-        variableResolvers: [],
-      };
-      const pluginInstance = new VariableResolverPlugin();
-      pluginManager.loadVariableResolvers(pluginInstance);
-
-      expect('test:asdfsd').to.match(pluginManager.serverless.variables.variableResolvers[0].regex);
-      expect(
-        pluginManager.serverless.variables.variableResolvers[0].isDisabledAtPrepopulation
-      ).to.equal(false);
-      expect(pluginManager.serverless.variables.variableResolvers[0].serviceName).to.equal(null);
-      expect(typeof pluginManager.serverless.variables.variableResolvers[0].resolver).to.equal(
-        'function'
-      );
-    });
-
-    it('should load the plugin variable resolvers with long syntax', () => {
-      class VariableResolverPlugin {
-        getTestVariable() {
-          return Promise.resolve('testVariable');
-        }
-        constructor() {
-          this.variableResolvers = {
-            test: this.getTestVariable,
-          };
-        }
-      }
-      pluginManager.serverless.variables = {
-        variableResolvers: [],
-      };
-      const pluginInstance = new VariableResolverPlugin();
-      pluginManager.loadVariableResolvers(pluginInstance);
-
-      expect('test:asdfsd').to.match(pluginManager.serverless.variables.variableResolvers[0].regex);
-      expect(
-        pluginManager.serverless.variables.variableResolvers[0].isDisabledAtPrepopulation
-      ).to.equal(false);
-      expect(pluginManager.serverless.variables.variableResolvers[0].serviceName).to.equal(null);
-      expect(typeof pluginManager.serverless.variables.variableResolvers[0].resolver).to.equal(
-        'function'
-      );
-    });
-
-    it('should validate the plugin variable resolvers function', () => {
-      class VariableResolverPlugin {
-        getTestVariable() {
-          return Promise.resolve('testVariable');
-        }
-        constructor() {
-          this.variableResolvers = {
-            test: { resolver: 'not a function' },
-          };
-        }
-      }
-      pluginManager.serverless.variables = {
-        variableResolvers: [],
-      };
-      const pluginInstance = new VariableResolverPlugin();
-      expect(() => pluginManager.loadVariableResolvers(pluginInstance)).to.throw(
-        "Custom variable resolver for test defined by VariableResolverPlugin specifies a resolver that isn't a function: not a function"
-      );
-    });
-
-    it('should load the plugin variable resolvers name if necessary', () => {
-      class VariableResolverPlugin {
-        getTestVariable() {
-          return Promise.resolve('testVariable');
-        }
-        constructor() {
-          this.variableResolvers = {
-            test: {
-              resolver: this.getTestVariable,
-              serviceName: 'test',
-              isDisabledAtPrepopulation: true,
-            },
-          };
-        }
-      }
-      pluginManager.serverless.variables = {
-        variableResolvers: [],
-      };
-      const pluginInstance = new VariableResolverPlugin();
-      pluginManager.loadVariableResolvers(pluginInstance);
-
-      expect('test:asdfsd').to.match(pluginManager.serverless.variables.variableResolvers[0].regex);
-      expect(
-        pluginManager.serverless.variables.variableResolvers[0].isDisabledAtPrepopulation
-      ).to.equal(true);
-      expect(pluginManager.serverless.variables.variableResolvers[0].serviceName).to.equal('test');
-      expect(typeof pluginManager.serverless.variables.variableResolvers[0].resolver).to.equal(
-        'function'
-      );
-    });
-
-    it('should validate the plugin variable resolvers name if necessary', () => {
-      class VariableResolverPlugin {
-        getTestVariable() {
-          return Promise.resolve('testVariable');
-        }
-        constructor() {
-          this.variableResolvers = {
-            test: {
-              resolver: this.getTestVariable,
-              isDisabledAtPrepopulation: true,
-            },
-          };
-        }
-      }
-      pluginManager.serverless.variables = {
-        variableResolvers: [],
-      };
-      const pluginInstance = new VariableResolverPlugin();
-      expect(() => pluginManager.loadVariableResolvers(pluginInstance)).to.throw(
-        /Custom variable resolver for test defined by VariableResolverPlugin specifies isDisabledAtPrepopulation but doesn't provide a string for a name/
-      );
-    });
-  });
-
-  describe('#getEvents()', () => {
-    beforeEach(() => {
-      pluginManager.addPlugin(SynchronousPluginMock);
-    });
-
-    it('should get all the matching events for a root level command in the correct order', () => {
-      const command = pluginManager.getCommand(['deploy']);
-      const events = pluginManager.getEvents(command);
-
-      expect(events[0]).to.equal('before:deploy:resources');
-      expect(events[1]).to.equal('deploy:resources');
-      expect(events[2]).to.equal('after:deploy:resources');
-      expect(events[3]).to.equal('before:deploy:functions');
-      expect(events[4]).to.equal('deploy:functions');
-      expect(events[5]).to.equal('after:deploy:functions');
-    });
-
-    it('should get all the matching events for a nested level command in the correct order', () => {
-      const command = pluginManager.getCommand(['deploy', 'onpremises']);
-      const events = pluginManager.getEvents(command);
-
-      expect(events[0]).to.equal('before:deploy:onpremises:resources');
-      expect(events[1]).to.equal('deploy:onpremises:resources');
-      expect(events[2]).to.equal('after:deploy:onpremises:resources');
-      expect(events[3]).to.equal('before:deploy:onpremises:functions');
-      expect(events[4]).to.equal('deploy:onpremises:functions');
-      expect(events[5]).to.equal('after:deploy:onpremises:functions');
-    });
-  });
-
-  describe('#getHooks()', () => {
-    beforeEach(() => {
-      pluginManager.addPlugin(SynchronousPluginMock);
-    });
-
-    it('should get hooks for an event with some registered', () => {
-      expect(pluginManager.getHooks(['deploy:functions']))
-        .to.be.an('Array')
-        .with.length(1);
-    });
-
-    it('should have the plugin name and function on the hook', () => {
-      const hooks = pluginManager.getHooks(['deploy:functions']);
-      expect(hooks[0].pluginName).to.equal('SynchronousPluginMock');
-      expect(hooks[0].hook).to.be.a('Function');
-    });
-
-    it('should not get hooks for an event that does not have any', () => {
-      expect(pluginManager.getHooks(['deploy:resources']))
-        .to.be.an('Array')
-        .with.length(0);
-    });
-
-    it('should accept a single event in place of an array', () => {
-      expect(pluginManager.getHooks('deploy:functions')).to.be.an('Array').with.length(1);
     });
   });
 
@@ -1257,14 +997,6 @@ describe('PluginManager', () => {
         ServerlessError
       );
     });
-
-    it('should throw on entrypoints', () => {
-      pluginManager.addPlugin(EntrypointPluginMock);
-
-      expect(() => pluginManager.validateCommand(['myep', 'mysubep'])).to.throw(
-        /command ".*" not found/
-      );
-    });
   });
 
   describe('#assignDefaultOptions()', () => {
@@ -1331,7 +1063,7 @@ describe('PluginManager', () => {
     let pluginManagerInstance;
 
     beforeEach(() => {
-      serverlessInstance = new Serverless();
+      serverlessInstance = new Serverless({ commands: [], options: {} });
       serverlessInstance.configurationInput = null;
       serverlessInstance.serviceDir = 'my-service';
       pluginManagerInstance = new PluginManager(serverlessInstance);
@@ -1404,82 +1136,6 @@ describe('PluginManager', () => {
     });
   });
 
-  describe('#validateOptions()', () => {
-    it('should throw an error if a required option is not set', () => {
-      pluginManager.commands = {
-        foo: {
-          options: {
-            baz: {
-              shortcut: 'b',
-              required: true,
-            },
-          },
-        },
-        bar: {
-          options: {
-            baz: {
-              required: true,
-            },
-          },
-        },
-      };
-
-      const foo = pluginManager.commands.foo;
-      const bar = pluginManager.commands.bar;
-
-      expect(() => {
-        pluginManager.validateOptions(foo);
-      }).to.throw(Error);
-      expect(() => {
-        pluginManager.validateOptions(bar);
-      }).to.throw(Error);
-    });
-
-    it('should throw an error if a customValidation is not met', () => {
-      pluginManager.setCliOptions({ bar: 'dev' });
-
-      pluginManager.commands = {
-        foo: {
-          options: {
-            bar: {
-              customValidation: {
-                regularExpression: /^[0-9]+$/,
-                errorMessage: 'Custom Error Message',
-              },
-            },
-          },
-        },
-      };
-      const command = pluginManager.commands.foo;
-
-      expect(() => {
-        pluginManager.validateOptions(command);
-      }).to.throw(Error);
-    });
-
-    it('should succeeds if a custom regex matches in a plain commands object', () => {
-      pluginManager.setCliOptions({ bar: 100 });
-
-      pluginManager.commands = {
-        foo: {
-          options: {
-            bar: {
-              customValidation: {
-                regularExpression: /^[0-9]+$/,
-                errorMessage: 'Custom Error Message',
-              },
-            },
-          },
-        },
-      };
-      const commandsArray = ['foo'];
-
-      expect(() => {
-        pluginManager.validateOptions(commandsArray);
-      }).to.not.throw(Error);
-    });
-  });
-
   describe('#run()', () => {
     it('should throw an error when the given command is not available', () => {
       pluginManager.addPlugin(SynchronousPluginMock);
@@ -1513,27 +1169,6 @@ describe('PluginManager', () => {
       return expect(pluginManager.run(commandsArray)).to.be.rejectedWith(Error);
     });
 
-    it('should show warning if in debug mode and the given command has no hooks', () => {
-      const consoleLogStub = sinon.stub(pluginManager.serverless.cli, 'log').returns();
-      process.env.SLS_DEBUG = '*';
-      class HooklessPlugin {
-        constructor() {
-          this.commands = {
-            foo: {},
-          };
-        }
-      }
-
-      pluginManager.addPlugin(HooklessPlugin);
-
-      const commandsArray = ['foo'];
-
-      return pluginManager.run(commandsArray).then(() => {
-        expect(consoleLogStub.called).is.equal(true);
-        pluginManager.serverless.cli.log.restore();
-      });
-    });
-
     it('should run the hooks in the correct order', () => {
       class CorrectHookOrderPluginMock {
         constructor() {
@@ -1752,34 +1387,6 @@ describe('PluginManager', () => {
         },
       };
     });
-
-    it('should give a suggestion for an unknown command', (done) => {
-      try {
-        pluginManager.getCommand(['creet']);
-        done('Test failed. Expected an error to be thrown');
-      } catch (error) {
-        expect(error.name).to.eql('ServerlessError');
-        expect(error.message).to.eql(
-          'Serverless command "creet" not found. ' +
-            'Did you mean "create"? Run "serverless help" for a list of all available commands.'
-        );
-        done();
-      }
-    });
-
-    it('should not give a suggestion for valid top level command', (done) => {
-      try {
-        pluginManager.getCommand(['deploy', 'function-misspelled']);
-        done('Test failed. Expected an error to be thrown');
-      } catch (error) {
-        expect(error.name).to.eql('ServerlessError');
-        expect(error.message).to.eql(
-          '"function-misspelled" is not a valid sub command. ' +
-            'Run "serverless deploy" to see a more helpful error message for this command.'
-        );
-        done();
-      }
-    });
   });
 
   describe('#spawn()', () => {
@@ -1791,29 +1398,6 @@ describe('PluginManager', () => {
       return expect(pluginManager.spawn(commandsArray)).to.eventually.be.rejectedWith(Error);
     });
 
-    it('should show warning in debug mode and when the given command has no hooks', () => {
-      const consoleLogStub = sinon.stub(pluginManager.serverless.cli, 'log').returns();
-
-      process.env.SLS_DEBUG = '*';
-
-      class HooklessPlugin {
-        constructor() {
-          this.commands = {
-            foo: {},
-          };
-        }
-      }
-
-      pluginManager.addPlugin(HooklessPlugin);
-
-      const commandsArray = ['foo'];
-
-      return pluginManager.run(commandsArray).then(() => {
-        expect(consoleLogStub.called).is.equal(true);
-        pluginManager.serverless.cli.log.restore();
-      });
-    });
-
     describe('when invoking a command', () => {
       it('should succeed', () => {
         pluginManager.addPlugin(EntrypointPluginMock);
@@ -1944,7 +1528,7 @@ describe('PluginManager', () => {
         localPath: path.join(serviceDir, 'serverless-plugins-custom'),
         modules: ['local-plugin'],
       });
-      // Had to use contructor.name because the class will be loaded via
+      // Had to use constructor.name because the class will be loaded via
       // require and the reference will not match with SynchronousPluginMock
       expect(pluginManager.plugins).to.satisfy((plugins) =>
         plugins.some((plugin) => plugin.constructor.name === 'SynchronousPluginMock')
@@ -1960,23 +1544,7 @@ describe('PluginManager', () => {
         localPath: serviceDir,
         modules: ['local-plugin'],
       });
-      // Had to use contructor.name because the class will be loaded via
-      // require and the reference will not match with SynchronousPluginMock
-      expect(pluginManager.plugins).to.satisfy((plugins) =>
-        plugins.some((plugin) => plugin.constructor.name === 'SynchronousPluginMock')
-      );
-    });
-
-    it('should load plugins from custom folder outside of serviceDir', () => {
-      serviceDir = path.join(tmpDir, 'serverless-plugins-custom');
-      const localPluginDir = path.join(serviceDir, 'local-plugin');
-      installPlugin(localPluginDir, SynchronousPluginMock);
-
-      pluginManager.loadAllPlugins({
-        localPath: '../serverless-plugins-custom',
-        modules: ['local-plugin'],
-      });
-      // Had to use contructor.name because the class will be loaded via
+      // Had to use constructor.name because the class will be loaded via
       // require and the reference will not match with SynchronousPluginMock
       expect(pluginManager.plugins).to.satisfy((plugins) =>
         plugins.some((plugin) => plugin.constructor.name === 'SynchronousPluginMock')
@@ -1997,10 +1565,15 @@ describe('PluginManager', () => {
     this.timeout(1000 * 60 * 10);
 
     let serverlessInstance;
-    const serverlessExec = require('../../../serverlessBinary');
+    let env;
+    const serverlessExec = require('../../../serverless-binary');
+
+    before(() => {
+      env = resolveAwsEnv();
+    });
 
     beforeEach(() => {
-      serverlessInstance = new Serverless();
+      serverlessInstance = new Serverless({ commands: ['print'], options: {}, serviceDir: null });
       return serverlessInstance.init().then(() => {
         // Cannot rely on shebang in severless.js to invoke script using NodeJS on Windows.
         const tmpDir = getTmpDirPath();
@@ -2052,3 +1625,30 @@ describe('PluginManager', () => {
     });
   });
 });
+
+describe('test/unit/lib/classes/PluginManager.test.js', () => {
+  it('should pass log writers to external plugins', async () => {
+    const { serverless } = await runServerless({
+      fixture: 'plugin',
+      command: 'print',
+    });
+    const plugin = Array.from(serverless.pluginManager.externalPlugins).find(
+      (externalPlugin) => externalPlugin.constructor.name === 'TestPlugin'
+    );
+    expect(typeof plugin.utils.log).to.equal('function');
+    expect(typeof plugin.utils.progress.create).to.equal('function');
+    expect(typeof plugin.utils.writeText).to.equal('function');
+  });
+
+  it('should error out for duplicate plugin definiton', async () => {
+    await expect(
+      runServerless({
+        fixture: 'plugin',
+        command: 'print',
+        configExt: {
+          plugins: ['./plugin', './plugin'],
+        },
+      })
+    ).to.be.eventually.rejected.and.have.property('code', 'DUPLICATE_PLUGIN_DEFINITION');
+  });
+});
diff --git a/test/unit/lib/classes/Service.test.js b/test/unit/lib/classes/service.test.js
similarity index 96%
rename from test/unit/lib/classes/Service.test.js
rename to test/unit/lib/classes/service.test.js
index 0fc5cb155a8..72079479f0c 100644
--- a/test/unit/lib/classes/Service.test.js
+++ b/test/unit/lib/classes/service.test.js
@@ -121,8 +121,8 @@ describe('Service', () => {
         command: 'package',
       });
       expect(
-        cfTemplate.Resources[awsNaming.getLambdaLogicalId('foo')].Properties.FunctionName
-      ).to.include('dev-foo');
+        cfTemplate.Resources[awsNaming.getLambdaLogicalId('basic')].Properties.FunctionName
+      ).to.include('dev-basic');
     });
 
     it('should throw when receives function with non-object configuration', async () => {
@@ -132,7 +132,7 @@ describe('Service', () => {
           command: 'package',
           configExt: {
             functions: {
-              bar: null,
+              bar: true,
             },
           },
         })
diff --git a/test/unit/lib/classes/Utils.test.js b/test/unit/lib/classes/utils.test.js
similarity index 98%
rename from test/unit/lib/classes/Utils.test.js
rename to test/unit/lib/classes/utils.test.js
index 1cf640b7278..29f43bdbd7f 100644
--- a/test/unit/lib/classes/Utils.test.js
+++ b/test/unit/lib/classes/utils.test.js
@@ -4,8 +4,8 @@ const path = require('path');
 const os = require('os');
 const chai = require('chai');
 const fse = require('fs-extra');
-const Serverless = require('../../../../lib/Serverless');
-const Utils = require('../../../../lib/classes/Utils');
+const Serverless = require('../../../../lib/serverless');
+const Utils = require('../../../../lib/classes/utils');
 const { expect } = require('chai');
 const { getTmpFilePath, getTmpDirPath } = require('../../../utils/fs');
 
@@ -16,7 +16,7 @@ describe('Utils', () => {
   let serverless;
 
   beforeEach(() => {
-    serverless = new Serverless();
+    serverless = new Serverless({ commands: [], options: {} });
     utils = new Utils(serverless);
   });
 
diff --git a/test/unit/lib/classes/YamlParser.test.js b/test/unit/lib/classes/yaml-parser.test.js
similarity index 95%
rename from test/unit/lib/classes/YamlParser.test.js
rename to test/unit/lib/classes/yaml-parser.test.js
index 4b7b0c99611..3c2f1de2f04 100644
--- a/test/unit/lib/classes/YamlParser.test.js
+++ b/test/unit/lib/classes/yaml-parser.test.js
@@ -7,14 +7,14 @@
 const chai = require('chai');
 const yaml = require('js-yaml');
 const path = require('path');
-const Serverless = require('../../../../lib/Serverless');
+const Serverless = require('../../../../lib/serverless');
 const { getTmpFilePath, getTmpDirPath } = require('../../../utils/fs');
 
 // Configure chai
 chai.use(require('chai-as-promised'));
 const expect = require('chai').expect;
 
-const serverless = new Serverless();
+const serverless = new Serverless({ commands: [], options: {} });
 
 describe('YamlParser', () => {
   describe('#parse()', () => {
diff --git a/test/unit/lib/cli/commands-schema/resolve-final.test.js b/test/unit/lib/cli/commands-schema/resolve-final.test.js
index 536c4bf99bb..071f830b56c 100644
--- a/test/unit/lib/cli/commands-schema/resolve-final.test.js
+++ b/test/unit/lib/cli/commands-schema/resolve-final.test.js
@@ -20,6 +20,7 @@ describe('test/unit/lib/cli/commands-schema/resolve-final.test.js', () => {
                       resourceGroup: {
                         usage: 'Resource group for the service',
                         shortcut: 'g',
+                        type: 'string',
                       },
                     },
                   },
@@ -32,6 +33,7 @@ describe('test/unit/lib/cli/commands-schema/resolve-final.test.js', () => {
                   dryrun: {
                     usage: 'Get a summary for what the deployment would look like',
                     shortcut: 'd',
+                    type: 'boolean',
                   },
                 },
               },
@@ -91,6 +93,7 @@ describe('test/unit/lib/cli/commands-schema/resolve-final.test.js', () => {
                       resourceGroup: {
                         usage: 'Resource group for the service',
                         shortcut: 'g',
+                        type: 'string',
                       },
                     },
                   },
@@ -103,6 +106,7 @@ describe('test/unit/lib/cli/commands-schema/resolve-final.test.js', () => {
                   dryrun: {
                     usage: 'Get a summary for what the deployment would look like',
                     shortcut: 'd',
+                    type: 'boolean',
                   },
                 },
               },
diff --git a/test/unit/lib/cli/conditionally-load-dotenv.test.js b/test/unit/lib/cli/conditionally-load-dotenv.test.js
index 3a46bbc051c..550e7519bc0 100644
--- a/test/unit/lib/cli/conditionally-load-dotenv.test.js
+++ b/test/unit/lib/cli/conditionally-load-dotenv.test.js
@@ -3,7 +3,7 @@
 const chai = require('chai');
 const path = require('path');
 const overrideEnv = require('process-utils/override-env');
-const fs = require('fs');
+const fsp = require('fs').promises;
 const conditionallyLoadDotenv = require('../../../../lib/cli/conditionally-load-dotenv');
 
 chai.use(require('chai-as-promised'));
@@ -14,15 +14,14 @@ describe('test/unit/lib/cli/conditionally-load-dotenv.test.js', () => {
 
   before(async () => {
     const defaultFileContent = 'DEFAULT_ENV_VARIABLE=valuefromdefault';
-    await fs.promises.writeFile(path.resolve('.env'), defaultFileContent);
+    await fsp.writeFile(path.resolve('.env'), defaultFileContent);
 
     const stage = 'testing';
     const stageFileContent = 'STAGE_ENV_VARIABLE=valuefromstage';
-    await fs.promises.writeFile(path.resolve(`.env.${stage}`), stageFileContent);
+    await fsp.writeFile(path.resolve(`.env.${stage}`), stageFileContent);
   });
 
   beforeEach(() => {
-    conditionallyLoadDotenv.clear();
     ({ restoreEnv } = overrideEnv());
   });
   afterEach(() => {
diff --git a/test/unit/lib/cli/ensure-supported-command.test.js b/test/unit/lib/cli/ensure-supported-command.test.js
index ca21ebd3091..a58132dc796 100644
--- a/test/unit/lib/cli/ensure-supported-command.test.js
+++ b/test/unit/lib/cli/ensure-supported-command.test.js
@@ -4,7 +4,7 @@ const { expect } = require('chai');
 const overrideArgv = require('process-utils/override-argv');
 const ServerlessError = require('../../../../lib/serverless-error');
 const resolveInput = require('../../../../lib/cli/resolve-input');
-const { triggeredDeprecations } = require('../../../../lib/utils/logDeprecation');
+const { triggeredDeprecations } = require('../../../../lib/utils/log-deprecation');
 const ensureSupportedCommand = require('../../../../lib/cli/ensure-supported-command');
 
 describe('test/unit/lib/cli/ensure-supported-command.test.js', () => {
@@ -18,7 +18,6 @@ describe('test/unit/lib/cli/ensure-supported-command.test.js', () => {
       () => resolveInput()
     );
     ensureSupportedCommand();
-    expect(triggeredDeprecations.has('UNSUPPORTED_CLI_OPTIONS')).to.be.false;
   });
 
   it('should do nothing on container commmand', async () => {
@@ -26,12 +25,11 @@ describe('test/unit/lib/cli/ensure-supported-command.test.js', () => {
     triggeredDeprecations.clear();
     overrideArgv(
       {
-        args: ['serverless', 'config', 'tabcompletion'],
+        args: ['serverless', 'plugin'],
       },
       () => resolveInput()
     );
     ensureSupportedCommand();
-    expect(triggeredDeprecations.has('UNSUPPORTED_CLI_OPTIONS')).to.be.false;
   });
 
   it('should reject invalid command', async () => {
@@ -57,8 +55,9 @@ describe('test/unit/lib/cli/ensure-supported-command.test.js', () => {
       },
       () => resolveInput()
     );
-    ensureSupportedCommand();
-    expect(triggeredDeprecations.has('UNSUPPORTED_CLI_OPTIONS')).to.be.true;
+    expect(() => ensureSupportedCommand())
+      .to.throw(ServerlessError)
+      .with.property('code', 'UNSUPPORTED_CLI_OPTIONS');
   });
 
   it('should reject missing options', async () => {
diff --git a/test/unit/lib/cli/filter-supported-options.test.js b/test/unit/lib/cli/filter-supported-options.test.js
index ae0c4c8cb91..eddafba4ec4 100644
--- a/test/unit/lib/cli/filter-supported-options.test.js
+++ b/test/unit/lib/cli/filter-supported-options.test.js
@@ -57,6 +57,8 @@ describe('test/unit/lib/cli/filter-supported-options.test.js', () => {
       'app': null,
       'org': null,
       'use-local-credentials': null,
+      'verbose': null,
+      'debug': null,
     });
   });
 
@@ -77,6 +79,8 @@ describe('test/unit/lib/cli/filter-supported-options.test.js', () => {
       version: null,
       config: null,
       stage: 'marko',
+      verbose: null,
+      debug: null,
     });
   });
 });
diff --git a/test/unit/lib/cli/handle-error.test.js b/test/unit/lib/cli/handle-error.test.js
index e689cac1ec5..47cb01b9d4a 100644
--- a/test/unit/lib/cli/handle-error.test.js
+++ b/test/unit/lib/cli/handle-error.test.js
@@ -1,98 +1,56 @@
 'use strict';
 
-const { expect } = require('chai');
+const chai = require('chai');
 const sinon = require('sinon');
 
-const path = require('path');
-const overrideStdoutWrite = require('process-utils/override-stdout-write');
+const observeOutput = require('@serverless/test/observe-output');
 const handleError = require('../../../../lib/cli/handle-error');
-const isStandaloneExecutable = require('../../../../lib/utils/isStandaloneExecutable');
+const isStandaloneExecutable = require('../../../../lib/utils/is-standalone-executable');
 const ServerlessError = require('../../../../lib/serverless-error');
 
-describe('test/unit/lib/cli/handle-error.test.js', () => {
-  it('should log environment information', async () => {
-    let stdoutData = '';
-    await overrideStdoutWrite(
-      (data) => (stdoutData += data),
-      () => handleError(new ServerlessError('Test error'))
-    );
-    expect(stdoutData).to.have.string('Serverless Error');
-    expect(stdoutData).to.have.string('Test error');
-    expect(stdoutData).to.have.string('Your Environment Information');
-    expect(stdoutData).to.have.string('Operating System:');
-    expect(stdoutData).to.have.string('Node Version:');
-    expect(stdoutData).to.have.string('Framework Version:');
-    expect(stdoutData).to.have.string('Plugin Version:');
-    expect(stdoutData).to.have.string('SDK Version:');
-    expect(stdoutData).to.have.string('Components Version:');
-  });
+chai.use(require('sinon-chai'));
+
+const expect = chai.expect;
 
-  it('should support `isUncaughtException` option', async () => {
-    const processExitStub = sinon.stub(process, 'exit').returns();
-    try {
-      let stdoutData = '';
-      await overrideStdoutWrite(
-        (data) => (stdoutData += data),
-        () => handleError(new ServerlessError('Test error'), { isUncaughtException: true })
-      );
-      expect(processExitStub.called).to.be.true;
-    } finally {
-      processExitStub.restore();
-    }
+describe('test/unit/lib/cli/handle-error.test.js', () => {
+  it('should output environment information', async () => {
+    const output = await observeOutput(() => handleError(new ServerlessError('Test error')));
+    expect(output).to.have.string('Environment: ');
+    expect(output).to.have.string('node');
+    expect(output).to.have.string('framework');
+    expect(output).to.have.string('plugin');
+    expect(output).to.have.string('SDK');
   });
 
   if (isStandaloneExecutable) {
     it('should report standalone installation', async () => {
-      let stdoutData = '';
-      await overrideStdoutWrite(
-        (data) => (stdoutData += data),
-        () => handleError(new ServerlessError('Test error'))
-      );
-      expect(stdoutData).to.have.string('(standalone)');
-    });
-  } else {
-    it('should support `isLocallyInstalled` option', async () => {
-      let stdoutData = '';
-      await overrideStdoutWrite(
-        (data) => (stdoutData += data),
-        () => handleError(new ServerlessError('Test error'), { isLocallyInstalled: false })
-      );
-      expect(stdoutData).to.not.have.string('(local)');
-      stdoutData = '';
-      await overrideStdoutWrite(
-        (data) => (stdoutData += data),
-        () => handleError(new ServerlessError('Test error'), { isLocallyInstalled: true })
-      );
-      expect(stdoutData).to.have.string('(local)');
+      const output = await observeOutput(() => handleError(new ServerlessError('Test error')));
+      expect(output).to.have.string('(standalone)');
     });
   }
 
-  it('should print stack trace with SLS_DEBUG', async () => {
-    let stdoutData = '';
-    process.env.SLS_DEBUG = '1';
-    await overrideStdoutWrite(
-      (data) => (stdoutData += data),
-      () => handleError(new ServerlessError('Test error'))
-    );
-    expect(stdoutData).to.have.string(path.basename(__filename));
+  it('should handle non-error objects', async () => {
+    const output = await observeOutput(() => handleError(handleError('NON-ERROR')));
+    expect(output).to.have.string('NON-ERROR');
   });
 
-  it('should not print stack trace without SLS_DEBUG', async () => {
-    let stdoutData = '';
-    delete process.env.SLS_DEBUG;
-    await overrideStdoutWrite(
-      (data) => (stdoutData += data),
-      () => handleError(new ServerlessError('Test error'))
-    );
-    expect(stdoutData).to.not.have.string(path.basename(__filename));
-  });
+  describe('with mocked telemetry', () => {
+    beforeEach(() => {
+      sinon.resetHistory();
+    });
 
-  it('should handle non-error objects', async () => {
-    let stdoutData = '';
-    await overrideStdoutWrite(
-      (data) => (stdoutData += data),
-      () => handleError('NON-ERROR')
-    );
-    expect(stdoutData).to.have.string('NON-ERROR');
+    it('should add `location` to `failureReason` in telemetry if error code missing', async () => {
+      const {
+        telemetryData: { failureReason },
+      } = await handleError(new ServerlessError('Test error'), {});
+      expect(failureReason).to.have.property('location');
+    });
+
+    it('should add `location` to `failureReason` in telemetry for non-user errors', async () => {
+      const {
+        telemetryData: { failureReason },
+      } = await handleError(new Error('Test error'), {});
+      expect(failureReason).to.have.property('location');
+    });
   });
 });
diff --git a/test/unit/lib/cli/interactive-setup/aws-credentials.test.js b/test/unit/lib/cli/interactive-setup/aws-credentials.test.js
new file mode 100644
index 00000000000..d353cefc031
--- /dev/null
+++ b/test/unit/lib/cli/interactive-setup/aws-credentials.test.js
@@ -0,0 +1,742 @@
+'use strict';
+
+const chai = require('chai');
+const sinon = require('sinon');
+const proxyquire = require('proxyquire');
+const overrideEnv = require('process-utils/override-env');
+const overrideStdoutWrite = require('process-utils/override-stdout-write');
+const requireUncached = require('ncjsm/require-uncached');
+const { StepHistory } = require('@serverless/utils/telemetry');
+
+const { expect } = chai;
+
+chai.use(require('chai-as-promised'));
+chai.use(require('sinon-chai'));
+
+const { join, resolve } = require('path');
+const { remove: rmDir, outputFile: writeFile } = require('fs-extra');
+const { resolveFileProfiles } = require('../../../../../lib/plugins/aws/utils/credentials');
+
+const mockedSdk = {
+  organizations: {
+    get: () => {
+      return {
+        orgUid: 'org-uid',
+      };
+    },
+  },
+  getProviders: async () => {
+    return { result: [] };
+  },
+};
+
+const step = proxyquire('../../../../../lib/cli/interactive-setup/aws-credentials', {
+  '../../utils/open-browser': async (url) => {
+    openBrowserUrls.push(url);
+  },
+  '@serverless/dashboard-plugin/lib/client-utils': {
+    getPlatformClientWithAccessKey: async () => mockedSdk,
+  },
+});
+
+const inquirer = require('@serverless/utils/inquirer');
+const configureInquirerStub = require('@serverless/test/configure-inquirer-stub');
+
+const openBrowserUrls = [];
+
+describe('test/unit/lib/cli/interactive-setup/aws-credentials.test.js', () => {
+  const accessKeyId = 'AKIAIOSFODNN7EXAMPLE';
+  const secretAccessKey = 'wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY';
+
+  afterEach(() => {
+    openBrowserUrls.length = 0;
+    sinon.restore();
+  });
+
+  it('Should be ineffective, when not at service path', async () => {
+    const context = {};
+    expect(await step.isApplicable(context)).to.equal(false);
+    expect(context.inapplicabilityReasonCode).to.equal('NOT_IN_SERVICE_DIRECTORY');
+  });
+
+  it('Should be ineffective, when not at AWS service', async () => {
+    const context = {
+      serviceDir: process.cwd(),
+      configuration: {},
+      configurationFilename: 'serverless.yml',
+    };
+    expect(await step.isApplicable(context)).to.equal(false);
+    expect(context.inapplicabilityReasonCode).to.equal('NON_AWS_PROVIDER');
+  });
+
+  it('Should be ineffective, when user has default provider set', async () => {
+    const internalMockedSdk = {
+      ...mockedSdk,
+      getProviders: async () => {
+        return {
+          result: [
+            {
+              alias: 'someprovider',
+              providerName: 'aws',
+              providerType: 'roleArn',
+              providerUid: 'provideruid',
+              isDefault: true,
+              providerDetails: {
+                roleArn: 'arn:xxx',
+              },
+            },
+          ],
+        };
+      },
+    };
+    const mockedStep = proxyquire('../../../../../lib/cli/interactive-setup/aws-credentials', {
+      '@serverless/dashboard-plugin/lib/client-utils': {
+        getPlatformClientWithAccessKey: async () => internalMockedSdk,
+      },
+      '@serverless/dashboard-plugin/lib/is-authenticated': () => true,
+    });
+
+    const context = {
+      serviceDir: process.cwd(),
+      configuration: { provider: { name: 'aws' }, org: 'someorg' },
+      configurationFilename: 'serverless.yml',
+    };
+    expect(await mockedStep.isApplicable(context)).to.be.false;
+    expect(context.inapplicabilityReasonCode).to.equal('DEFAULT_PROVIDER_CONFIGURED');
+  });
+
+  it('Should be ineffective, when existing service already has a provider set', async () => {
+    const internalMockedSdk = {
+      ...mockedSdk,
+      getProviders: async () => {
+        return {
+          result: [
+            {
+              alias: 'someprovider',
+              providerName: 'aws',
+              providerType: 'roleArn',
+              providerUid: 'provideruid',
+              isDefault: false,
+              providerDetails: {
+                roleArn: 'arn:xxx',
+              },
+            },
+          ],
+        };
+      },
+    };
+    const mockedStep = proxyquire('../../../../../lib/cli/interactive-setup/aws-credentials', {
+      '@serverless/dashboard-plugin/lib/client-utils': {
+        getPlatformClientWithAccessKey: async () => internalMockedSdk,
+      },
+      '@serverless/dashboard-plugin/lib/is-authenticated': () => true,
+      './utils': {
+        doesServiceInstanceHaveLinkedProvider: () => true,
+      },
+    });
+
+    const context = {
+      history: new Set(),
+      serviceDir: process.cwd(),
+      configuration: {
+        provider: { name: 'aws' },
+        org: 'someorg',
+        app: 'someapp',
+        service: 'service',
+      },
+      options: {},
+      configurationFilename: 'serverless.yml',
+    };
+    expect(await mockedStep.isApplicable(context)).to.be.false;
+    expect(context.inapplicabilityReasonCode).to.equal('LINKED_PROVIDER_CONFIGURED');
+  });
+
+  it('Should be effective, when existing service instance does not have a provider set', async () => {
+    const internalMockedSdk = {
+      ...mockedSdk,
+      getProviders: async () => {
+        return {
+          result: [
+            {
+              alias: 'someprovider',
+              providerName: 'aws',
+              providerType: 'roleArn',
+              providerUid: 'provideruid',
+              isDefault: false,
+              providerDetails: {
+                roleArn: 'arn:xxx',
+              },
+            },
+          ],
+        };
+      },
+    };
+    const mockedStep = proxyquire('../../../../../lib/cli/interactive-setup/aws-credentials', {
+      '@serverless/dashboard-plugin/lib/client-utils': {
+        getPlatformClientWithAccessKey: async () => internalMockedSdk,
+      },
+      '@serverless/dashboard-plugin/lib/is-authenticated': () => true,
+      './utils': {
+        doesServiceInstanceHaveLinkedProvider: () => false,
+      },
+    });
+
+    expect(
+      await mockedStep.isApplicable({
+        history: new Set(),
+        serviceDir: process.cwd(),
+        configuration: {
+          provider: { name: 'aws' },
+          org: 'someorg',
+          app: 'someapp',
+          service: 'service',
+        },
+        options: {},
+        configurationFilename: 'serverless.yml',
+      })
+    ).to.be.true;
+  });
+
+  it('Should be ineffective dashboard is not available', async () => {
+    const internalMockedSdk = {
+      ...mockedSdk,
+      getProviders: async () => {
+        const err = new Error('unavailable');
+        err.statusCode = 500;
+        throw err;
+      },
+    };
+    const mockedStep = proxyquire('../../../../../lib/cli/interactive-setup/aws-credentials', {
+      '@serverless/dashboard-plugin/lib/client-utils': {
+        getPlatformClientWithAccessKey: async () => internalMockedSdk,
+      },
+      '@serverless/dashboard-plugin/lib/is-authenticated': () => true,
+    });
+
+    expect(
+      await mockedStep.isApplicable({
+        serviceDir: process.cwd(),
+        configuration: { provider: { name: 'aws' }, org: 'someorg' },
+        configurationFilename: 'serverless.yml',
+      })
+    ).to.be.false;
+  });
+
+  it('Should be effective, at AWS service and no credentials are set', async () =>
+    expect(
+      await step.isApplicable({
+        serviceDir: process.cwd(),
+        configuration: { provider: { name: 'aws' } },
+        configurationFilename: 'serverless.yml',
+      })
+    ).to.equal(true));
+
+  it('Should allow to skip credentials setup', async () => {
+    configureInquirerStub(inquirer, {
+      list: { credentialsSetupChoice: '_skip_' },
+    });
+
+    const context = {
+      serviceDir: process.cwd(),
+      configuration: { provider: { name: 'aws' } },
+      configurationFilename: 'serverless.yml',
+      stepHistory: new StepHistory(),
+      options: {},
+    };
+    let stdoutData = '';
+    await overrideStdoutWrite(
+      (data) => (stdoutData += data),
+      async () => await step.run(context)
+    );
+
+    expect(context.stepHistory.valuesMap()).to.deep.equal(
+      new Map([['credentialsSetupChoice', '_skip_']])
+    );
+  });
+
+  describe('In environment credentials', () => {
+    let restoreEnv;
+    let uncachedStep;
+
+    before(() => {
+      ({ restoreEnv } = overrideEnv({ asCopy: true }));
+      process.env.AWS_ACCESS_KEY_ID = accessKeyId;
+      process.env.AWS_SECRET_ACCESS_KEY = secretAccessKey;
+      uncachedStep = requireUncached(() =>
+        require('../../../../../lib/cli/interactive-setup/aws-credentials')
+      );
+    });
+
+    after(() => restoreEnv);
+
+    it('Should be ineffective, when credentials are set in environment', async () => {
+      expect(
+        await uncachedStep.isApplicable({
+          serviceDir: process.cwd(),
+          configuration: { provider: { name: 'aws' } },
+          configurationFilename: 'serverless.yml',
+        })
+      ).to.equal(false);
+    });
+  });
+
+  describe('AWS config handling', () => {
+    let credentialsDirPath;
+    let credentialsFilePath;
+
+    before(() => {
+      credentialsDirPath = resolve('.aws');
+      credentialsFilePath = join(credentialsDirPath, 'credentials');
+    });
+
+    afterEach(() => rmDir(credentialsDirPath));
+
+    describe('Existing credentials case', () => {
+      before(() =>
+        writeFile(
+          credentialsFilePath,
+          [
+            '[some-profile]',
+            `aws_access_key_id = ${accessKeyId}`,
+            `aws_secret_access_key = ${secretAccessKey}`,
+          ].join('\n')
+        )
+      );
+
+      it('Should be ineffective, When credentials are set in AWS config', async () =>
+        expect(
+          await step.isApplicable({
+            serviceDir: process.cwd(),
+            configuration: { provider: { name: 'aws' } },
+            configurationFilename: 'serverless.yml',
+          })
+        ).to.equal(false));
+    });
+
+    it('Should setup credentials for users not having an AWS account', async () => {
+      configureInquirerStub(inquirer, {
+        list: { credentialsSetupChoice: '_local_' },
+        confirm: { hasAwsAccount: false },
+        input: {
+          createAwsAccountPrompt: '',
+          generateAwsCredsPrompt: '',
+          accessKeyId,
+          secretAccessKey,
+        },
+      });
+      const context = {
+        configuration: { provider: {} },
+        options: {},
+        stepHistory: new StepHistory(),
+      };
+      await step.run(context);
+      expect(openBrowserUrls.length).to.equal(2);
+      expect(openBrowserUrls[0].includes('signup')).to.be.true;
+      expect(openBrowserUrls[1].includes('console.aws.amazon.com')).to.be.true;
+      resolveFileProfiles().then((profiles) => {
+        expect(profiles).to.deep.equal(new Map([['default', { accessKeyId, secretAccessKey }]]));
+      });
+      expect(context.stepHistory.valuesMap()).to.deep.equal(
+        new Map([
+          ['credentialsSetupChoice', '_local_'],
+          ['createAwsAccountPrompt', '_continuation_'],
+          ['generateAwsCredsPrompt', '_continuation_'],
+          ['accessKeyId', '_user_input_'],
+          ['secretAccessKey', '_user_input_'],
+        ])
+      );
+    });
+
+    it('Should setup credentials for users having an AWS account', async () => {
+      configureInquirerStub(inquirer, {
+        list: { credentialsSetupChoice: '_local_' },
+        confirm: { hasAwsAccount: true },
+        input: { generateAwsCredsPrompt: '', accessKeyId, secretAccessKey },
+      });
+      const context = {
+        configuration: { provider: {} },
+        options: {},
+        stepHistory: new StepHistory(),
+      };
+      await step.run(context);
+      expect(openBrowserUrls.length).to.equal(1);
+      expect(openBrowserUrls[0].includes('console.aws.amazon.com')).to.be.true;
+      expect(context.stepHistory.valuesMap()).to.deep.equal(
+        new Map([
+          ['credentialsSetupChoice', '_local_'],
+          ['generateAwsCredsPrompt', '_continuation_'],
+          ['accessKeyId', '_user_input_'],
+          ['secretAccessKey', '_user_input_'],
+        ])
+      );
+      return resolveFileProfiles().then((profiles) => {
+        expect(profiles).to.deep.equal(new Map([['default', { accessKeyId, secretAccessKey }]]));
+      });
+    });
+
+    it('Should not accept invalid access key id', async () => {
+      configureInquirerStub(inquirer, {
+        list: { credentialsSetupChoice: '_local_' },
+        confirm: { hasAwsAccount: true },
+        input: { generateAwsCredsPrompt: '', accessKeyId: 'foo', secretAccessKey },
+      });
+      const context = {
+        configuration: { provider: {} },
+        options: {},
+        stepHistory: new StepHistory(),
+      };
+      await expect(step.run(context)).to.eventually.be.rejected.and.have.property(
+        'code',
+        'INVALID_ANSWER'
+      );
+      expect(context.stepHistory.valuesMap()).to.deep.equal(
+        new Map([
+          ['credentialsSetupChoice', '_local_'],
+          ['generateAwsCredsPrompt', '_continuation_'],
+          ['accessKeyId', undefined],
+        ])
+      );
+    });
+
+    it('Should not accept invalid secret access key', async () => {
+      configureInquirerStub(inquirer, {
+        list: { credentialsSetupChoice: '_local_' },
+        confirm: { hasAwsAccount: true },
+        input: { generateAwsCredsPrompt: '', accessKeyId, secretAccessKey: 'foo' },
+      });
+      const context = {
+        configuration: { provider: {} },
+        options: {},
+        stepHistory: new StepHistory(),
+      };
+      await expect(step.run(context)).to.eventually.be.rejected.and.have.property(
+        'code',
+        'INVALID_ANSWER'
+      );
+      expect(context.stepHistory.valuesMap()).to.deep.equal(
+        new Map([
+          ['credentialsSetupChoice', '_local_'],
+          ['generateAwsCredsPrompt', '_continuation_'],
+          ['accessKeyId', '_user_input_'],
+          ['secretAccessKey', undefined],
+        ])
+      );
+    });
+  });
+
+  describe('Provider config handling', () => {
+    it('Should correctly setup with newly created provider when no previous providers exist', async () => {
+      const mockedOpenBrowser = sinon.stub().returns();
+      const mockedDisconnect = sinon.stub().returns();
+      const mockedCreateProviderLink = sinon.stub().resolves();
+      const providerUid = 'provideruid';
+      const internalMockedSdk = {
+        ...mockedSdk,
+        connect: ({ onEvent }) => {
+          onEvent({
+            data: {
+              object: {
+                provider_uid: providerUid,
+              },
+            },
+          });
+        },
+        disconnect: mockedDisconnect,
+        createProviderLink: mockedCreateProviderLink,
+      };
+      const mockedStep = proxyquire('../../../../../lib/cli/interactive-setup/aws-credentials', {
+        '@serverless/dashboard-plugin/lib/client-utils': {
+          getPlatformClientWithAccessKey: async () => internalMockedSdk,
+        },
+        '../../utils/open-browser': mockedOpenBrowser,
+        '@serverless/dashboard-plugin/lib/is-authenticated': () => true,
+      });
+
+      configureInquirerStub(inquirer, {
+        list: { credentialsSetupChoice: '_create_provider_' },
+      });
+
+      const context = {
+        serviceDir: process.cwd(),
+        configuration: {
+          service: 'someservice',
+          provider: { name: 'aws' },
+          org: 'someorg',
+          app: 'someapp',
+        },
+        options: {},
+        configurationFilename: 'serverless.yml',
+        stepHistory: new StepHistory(),
+      };
+      await mockedStep.run(context);
+
+      expect(mockedOpenBrowser).to.have.been.calledWith(
+        'https://app.serverless.com/someorg/settings/providers?source=cli&providerId=new&provider=aws'
+      );
+      expect(mockedDisconnect).to.have.been.called;
+      expect(mockedCreateProviderLink).not.to.have.been.called;
+      expect(context.stepHistory.valuesMap()).to.deep.equal(
+        new Map([['credentialsSetupChoice', '_create_provider_']])
+      );
+    });
+
+    it('Should correctly setup with newly created provider when previous providers exist', async () => {
+      const mockedOpenBrowser = sinon.stub().returns();
+      const mockedDisconnect = sinon.stub().returns();
+      const mockedCreateProviderLink = sinon.stub().resolves();
+      const providerUid = 'provideruid';
+      const internalMockedSdk = {
+        ...mockedSdk,
+        connect: ({ onEvent }) => {
+          onEvent({
+            data: {
+              object: {
+                provider_uid: providerUid,
+              },
+            },
+          });
+        },
+        getProviders: async () => {
+          return {
+            result: [
+              {
+                alias: 'someprovider',
+                providerName: 'aws',
+                providerType: 'roleArn',
+                providerUid,
+                providerDetails: {
+                  roleArn: 'arn:xxx',
+                },
+              },
+            ],
+          };
+        },
+        disconnect: mockedDisconnect,
+        createProviderLink: mockedCreateProviderLink,
+      };
+      const mockedStep = proxyquire('../../../../../lib/cli/interactive-setup/aws-credentials', {
+        '@serverless/dashboard-plugin/lib/client-utils': {
+          getPlatformClientWithAccessKey: async () => internalMockedSdk,
+        },
+        '../../utils/open-browser': mockedOpenBrowser,
+        '@serverless/dashboard-plugin/lib/is-authenticated': () => true,
+      });
+
+      configureInquirerStub(inquirer, {
+        list: { credentialsSetupChoice: '_create_provider_' },
+      });
+
+      const context = {
+        serviceDir: process.cwd(),
+        configuration: {
+          service: 'someservice',
+          provider: { name: 'aws' },
+          org: 'someorg',
+          app: 'someapp',
+        },
+        options: {},
+        configurationFilename: 'serverless.yml',
+        stepHistory: new StepHistory(),
+      };
+      await mockedStep.run(context);
+
+      expect(mockedOpenBrowser).to.have.been.calledWith(
+        'https://app.serverless.com/someorg/settings/providers?source=cli&providerId=new&provider=aws'
+      );
+      expect(mockedDisconnect).to.have.been.called;
+      expect(mockedCreateProviderLink).to.have.been.calledWith(
+        'org-uid',
+        'instance',
+        'appName|someapp|serviceName|someservice|stage|dev|region|us-east-1',
+        providerUid
+      );
+      expect(context.stepHistory.valuesMap()).to.deep.equal(
+        new Map([['credentialsSetupChoice', '_create_provider_']])
+      );
+    });
+
+    it('Should emit warning when dashboard unavailable when connecting to it', async () => {
+      const mockedOpenBrowser = sinon.stub().returns();
+      const internalMockedSdk = {
+        ...mockedSdk,
+        connect: () => {
+          const err = new Error('error');
+          err.statusCode = 500;
+          throw err;
+        },
+      };
+      const mockedStep = proxyquire('../../../../../lib/cli/interactive-setup/aws-credentials', {
+        '@serverless/dashboard-plugin/lib/client-utils': {
+          getPlatformClientWithAccessKey: async () => internalMockedSdk,
+        },
+        '../../utils/open-browser': mockedOpenBrowser,
+      });
+
+      configureInquirerStub(inquirer, {
+        list: { credentialsSetupChoice: '_create_provider_' },
+      });
+
+      const context = {
+        serviceDir: process.cwd(),
+        configuration: {
+          service: 'someservice',
+          provider: { name: 'aws' },
+          org: 'someorg',
+          app: 'someapp',
+        },
+        configurationFilename: 'serverless.yml',
+        stepHistory: new StepHistory(),
+      };
+      await mockedStep.run(context);
+
+      expect(mockedOpenBrowser).to.have.been.calledWith(
+        'https://app.serverless.com/someorg/settings/providers?source=cli&providerId=new&provider=aws'
+      );
+      expect(context.stepHistory.valuesMap()).to.deep.equal(
+        new Map([['credentialsSetupChoice', '_create_provider_']])
+      );
+    });
+
+    it('Should correctly setup with existing provider', async () => {
+      const providerUid = 'provideruid';
+      const mockedCreateProviderLink = sinon.stub().resolves();
+      const internalMockedSdk = {
+        ...mockedSdk,
+        getProviders: async () => {
+          return {
+            result: [
+              {
+                alias: 'someprovider',
+                providerName: 'aws',
+                providerType: 'accessKey',
+                providerUid,
+                providerDetails: {
+                  accessKeyId: 'axx',
+                },
+              },
+            ],
+          };
+        },
+        createProviderLink: mockedCreateProviderLink,
+      };
+      const mockedStep = proxyquire('../../../../../lib/cli/interactive-setup/aws-credentials', {
+        '@serverless/dashboard-plugin/lib/client-utils': {
+          getPlatformClientWithAccessKey: async () => internalMockedSdk,
+        },
+      });
+
+      configureInquirerStub(inquirer, {
+        list: { credentialsSetupChoice: providerUid },
+      });
+
+      const context = {
+        serviceDir: process.cwd(),
+        configuration: {
+          service: 'someservice',
+          provider: { name: 'aws' },
+          org: 'someorg',
+          app: 'someapp',
+        },
+        options: {},
+        configurationFilename: 'serverless.yml',
+        stepHistory: new StepHistory(),
+      };
+      await mockedStep.run(context);
+
+      expect(mockedCreateProviderLink).to.have.been.calledWith(
+        'org-uid',
+        'instance',
+        'appName|someapp|serviceName|someservice|stage|dev|region|us-east-1',
+        'provideruid'
+      );
+      expect(context.stepHistory.valuesMap()).to.deep.equal(
+        new Map([['credentialsSetupChoice', '_user_choice_']])
+      );
+    });
+
+    it('Should handle gently dashboard unavailabiilty when linking provider', async () => {
+      const providerUid = 'provideruid';
+      const mockedCreateProviderLink = sinon.stub().callsFake(async () => {
+        const err = new Error('error');
+        err.statusCode = 500;
+        throw err;
+      });
+      const internalMockedSdk = {
+        ...mockedSdk,
+        getProviders: async () => {
+          return {
+            result: [
+              {
+                alias: 'someprovider',
+                providerName: 'aws',
+                providerType: 'roleArn',
+                providerUid,
+                providerDetails: {
+                  roleArn: 'arn:xxx',
+                },
+              },
+            ],
+          };
+        },
+        createProviderLink: mockedCreateProviderLink,
+      };
+      const mockedStep = proxyquire('../../../../../lib/cli/interactive-setup/aws-credentials', {
+        '@serverless/dashboard-plugin/lib/client-utils': {
+          getPlatformClientWithAccessKey: async () => internalMockedSdk,
+        },
+      });
+
+      configureInquirerStub(inquirer, {
+        list: { credentialsSetupChoice: providerUid },
+      });
+
+      const context = {
+        serviceDir: process.cwd(),
+        configuration: {
+          service: 'someservice',
+          provider: { name: 'aws' },
+          org: 'someorg',
+          app: 'someapp',
+        },
+        options: {},
+        stepHistory: new StepHistory(),
+        configurationFilename: 'serverless.yml',
+      };
+      await mockedStep.run(context);
+      expect(mockedCreateProviderLink).to.have.been.calledWith(
+        'org-uid',
+        'instance',
+        'appName|someapp|serviceName|someservice|stage|dev|region|us-east-1',
+        'provideruid'
+      );
+
+      expect(context.stepHistory.valuesMap()).to.deep.equal(
+        new Map([['credentialsSetupChoice', '_user_choice_']])
+      );
+    });
+
+    it('Should handle gently dashboard unavailabiilty when fetching providers', async () => {
+      const internalMockedSdk = {
+        ...mockedSdk,
+        getProviders: async () => {
+          const err = new Error('unavailable');
+          err.statusCode = 500;
+          throw err;
+        },
+      };
+      const mockedStep = proxyquire('../../../../../lib/cli/interactive-setup/aws-credentials', {
+        '@serverless/dashboard-plugin/lib/client-utils': {
+          getPlatformClientWithAccessKey: async () => internalMockedSdk,
+        },
+        '@serverless/dashboard-plugin/lib/is-authenticated': () => true,
+      });
+
+      await mockedStep.run({
+        serviceDir: process.cwd(),
+        configuration: { provider: { name: 'aws' }, org: 'someorg' },
+        options: {},
+        configurationFilename: 'serverless.yml',
+      });
+    });
+  });
+});
diff --git a/test/unit/lib/cli/interactive-setup/dashboard-login.test.js b/test/unit/lib/cli/interactive-setup/dashboard-login.test.js
new file mode 100644
index 00000000000..8061bd02b5a
--- /dev/null
+++ b/test/unit/lib/cli/interactive-setup/dashboard-login.test.js
@@ -0,0 +1,197 @@
+'use strict';
+
+const chai = require('chai');
+const sinon = require('sinon');
+const proxyquire = require('proxyquire');
+const overrideCwd = require('process-utils/override-cwd');
+const configureInquirerStub = require('@serverless/test/configure-inquirer-stub');
+const { StepHistory } = require('@serverless/utils/telemetry');
+const inquirer = require('@serverless/utils/inquirer');
+
+const { expect } = chai;
+
+chai.use(require('chai-as-promised'));
+
+const fixtures = require('../../../../fixtures/programmatic');
+
+const ServerlessSDKMock = class ServerlessSDK {
+  constructor() {
+    this.metadata = {
+      get: async () => {
+        return {
+          awsAccountId: '377024778620',
+          supportedRuntimes: ['nodejs10.x', 'nodejs12.x', 'python2.7', 'python3.6', 'python3.7'],
+          supportedRegions: [
+            'us-east-1',
+            'us-east-2',
+            'us-west-2',
+            'eu-central-1',
+            'eu-west-1',
+            'eu-west-2',
+            'ap-northeast-1',
+            'ap-southeast-1',
+            'ap-southeast-2',
+          ],
+        };
+      },
+    };
+  }
+};
+
+const step = proxyquire('../../../../../lib/cli/interactive-setup/dashboard-login', {
+  '@serverless/platform-client': {
+    ServerlessSDK: ServerlessSDKMock,
+  },
+});
+
+describe('test/unit/lib/cli/interactive-setup/dashboard-login.test.js', function () {
+  this.timeout(1000 * 60 * 3);
+
+  const loginStub = sinon.stub().resolves();
+
+  afterEach(() => {
+    loginStub.resetHistory();
+  });
+
+  it('Should be ineffective, when not at service path', async () => {
+    const context = {};
+    expect(await step.isApplicable(context)).to.be.false;
+    expect(context.inapplicabilityReasonCode).to.equal('NOT_IN_SERVICE_DIRECTORY');
+  });
+
+  it('Should be ineffective, when not at AWS service path', async () => {
+    const context = {
+      serviceDir: process.cwd(),
+      configuration: {},
+      configurationFilename: 'serverless.yml',
+      options: {},
+      initial: {},
+      inquirer,
+    };
+    expect(await step.isApplicable(context)).to.equal(false);
+    expect(context.inapplicabilityReasonCode).to.equal('NON_AWS_PROVIDER');
+  });
+
+  it('Should be ineffective, when not at supported runtime service path', async () => {
+    const context = {
+      serviceDir: process.cwd(),
+      configuration: { provider: { name: 'aws', runtime: 'java8' } },
+      configurationFilename: 'serverless.yml',
+      options: {},
+      initial: {},
+      inquirer,
+    };
+    expect(await step.isApplicable(context)).to.equal(false);
+    expect(context.inapplicabilityReasonCode).to.equal('UNSUPPORTED_RUNTIME');
+  });
+
+  it('Should be ineffective, when logged in', async () => {
+    const { servicePath: serviceDir, serviceConfig: configuration } = await fixtures.setup(
+      'aws-loggedin-service'
+    );
+    const context = {
+      serviceDir,
+      configuration,
+      configurationFilename: 'serverless.yml',
+      options: {},
+      initial: {},
+      inquirer,
+    };
+    expect(await overrideCwd(serviceDir, async () => await step.isApplicable(context))).to.equal(
+      false
+    );
+    expect(context.inapplicabilityReasonCode).to.equal('ALREADY_LOGGED_IN');
+  });
+
+  it('Should login when user decides to login/register', async () => {
+    configureInquirerStub(inquirer, {
+      confirm: { shouldLoginOrRegister: true },
+    });
+    const loginStep = proxyquire('../../../../../lib/cli/interactive-setup/dashboard-login', {
+      '@serverless/dashboard-plugin/lib/login': loginStub,
+      '@serverless/platform-client': {
+        ServerlessSDK: ServerlessSDKMock,
+      },
+    });
+    const context = {
+      serviceDir: process.cwd(),
+      configuration: { provider: { name: 'aws', runtime: 'nodejs12.x' } },
+      configurationFilename: 'serverless.yml',
+      options: {},
+      initial: {},
+      inquirer,
+      stepHistory: new StepHistory(),
+    };
+    await loginStep.run(context);
+    expect(loginStub.calledOnce).to.be.true;
+    expect(context.stepHistory.valuesMap()).to.deep.equal(
+      new Map([['shouldLoginOrRegister', true]])
+    );
+  });
+
+  it('Should login and skip question when user providers `org` option', async () => {
+    const loginStep = proxyquire('../../../../../lib/cli/interactive-setup/dashboard-login', {
+      '@serverless/dashboard-plugin/lib/login': loginStub,
+      '@serverless/platform-client': {
+        ServerlessSDK: ServerlessSDKMock,
+      },
+    });
+    const context = {
+      serviceDir: process.cwd(),
+      configuration: { provider: { name: 'aws', runtime: 'nodejs12.x' } },
+      configurationFilename: 'serverless.yml',
+      options: { org: 'someorg' },
+      initial: {},
+      inquirer,
+      stepHistory: new StepHistory(),
+    };
+    await loginStep.run(context);
+    expect(loginStub.calledOnce).to.be.true;
+  });
+
+  it('Should login and skip question when `org` configured', async () => {
+    const loginStep = proxyquire('../../../../../lib/cli/interactive-setup/dashboard-login', {
+      '@serverless/dashboard-plugin/lib/login': loginStub,
+      '@serverless/platform-client': {
+        ServerlessSDK: ServerlessSDKMock,
+      },
+    });
+    const context = {
+      serviceDir: process.cwd(),
+      configuration: { org: 'someorg', provider: { name: 'aws', runtime: 'nodejs12.x' } },
+      configurationFilename: 'serverless.yml',
+      options: {},
+      initial: {},
+      inquirer,
+      stepHistory: new StepHistory(),
+    };
+    await loginStep.run(context);
+    expect(loginStub.calledOnce).to.be.true;
+  });
+
+  it('Should not login when user decides not to login/register', async () => {
+    configureInquirerStub(inquirer, {
+      confirm: { shouldLoginOrRegister: false },
+    });
+    const loginStep = proxyquire('../../../../../lib/cli/interactive-setup/dashboard-login', {
+      '@serverless/dashboard-plugin/lib/login': loginStub,
+      '@serverless/platform-client': {
+        ServerlessSDK: ServerlessSDKMock,
+      },
+    });
+    const context = {
+      serviceDir: process.cwd(),
+      configuration: { provider: { name: 'aws', runtime: 'nodejs12.x' } },
+      configurationFilename: 'serverless.yml',
+      options: {},
+      initial: {},
+      inquirer,
+      stepHistory: new StepHistory(),
+    };
+    await loginStep.run(context);
+    expect(loginStub.called).to.be.false;
+    expect(context.stepHistory.valuesMap()).to.deep.equal(
+      new Map([['shouldLoginOrRegister', false]])
+    );
+  });
+});
diff --git a/test/unit/lib/cli/interactive-setup/dashboard-set-org.test.js b/test/unit/lib/cli/interactive-setup/dashboard-set-org.test.js
new file mode 100644
index 00000000000..890ae637ea4
--- /dev/null
+++ b/test/unit/lib/cli/interactive-setup/dashboard-set-org.test.js
@@ -0,0 +1,1150 @@
+'use strict';
+
+const chai = require('chai');
+const { join } = require('path');
+const sinon = require('sinon');
+const proxyquire = require('proxyquire');
+const fsp = require('fs').promises;
+const yaml = require('js-yaml');
+const overrideCwd = require('process-utils/override-cwd');
+const overrideEnv = require('process-utils/override-env');
+const configureInquirerStub = require('@serverless/test/configure-inquirer-stub');
+const { StepHistory } = require('@serverless/utils/telemetry');
+const inquirer = require('@serverless/utils/inquirer');
+
+const fixtures = require('../../../../fixtures/programmatic');
+
+const { expect } = chai;
+
+chai.use(require('chai-as-promised'));
+
+describe('test/unit/lib/cli/interactive-setup/dashboard-set-org.test.js', function () {
+  this.timeout(1000 * 60 * 3);
+
+  let step;
+  let mockOrganizationsList = [
+    { tenantName: 'testinteractivecli' },
+    { tenantName: 'otherorg' },
+    { tenantName: 'orgwithoutapps' },
+  ];
+
+  before(async () => {
+    const ServerlessSDKMock = class ServerlessSDK {
+      constructor() {
+        this.metadata = {
+          get: async () => {
+            return {
+              awsAccountId: '377024778620',
+              supportedRuntimes: [
+                'nodejs10.x',
+                'nodejs12.x',
+                'python2.7',
+                'python3.6',
+                'python3.7',
+              ],
+              supportedRegions: [
+                'us-east-1',
+                'us-east-2',
+                'us-west-2',
+                'eu-central-1',
+                'eu-west-1',
+                'eu-west-2',
+                'ap-northeast-1',
+                'ap-southeast-1',
+                'ap-southeast-2',
+              ],
+            };
+          },
+        };
+
+        this.apps = {
+          create: async ({ app: { name } }) => ({ appName: name }),
+          list: async ({ orgName }) => {
+            if (orgName === 'orgwithoutapps') {
+              return [];
+            }
+
+            return [
+              { appName: 'some-aws-service-app' },
+              { appName: 'other-app' },
+              { appName: 'app-from-flag' },
+            ];
+          },
+        };
+
+        this.organizations = {
+          list: async () => {
+            return mockOrganizationsList;
+          },
+        };
+
+        this.accessKeys = {
+          get: async () => {
+            return {
+              orgName: 'fromaccesskey',
+            };
+          },
+        };
+      }
+
+      async refreshToken() {
+        return {};
+      }
+
+      config() {}
+    };
+
+    step = proxyquire('../../../../../lib/cli/interactive-setup/dashboard-set-org', {
+      '@serverless/platform-client': {
+        ServerlessSDK: ServerlessSDKMock,
+      },
+      '@serverless/dashboard-plugin/lib/client-utils': {
+        getPlatformClientWithAccessKey: async () => new ServerlessSDKMock(),
+        getOrCreateAccessKeyForOrg: async () => 'accessKey',
+      },
+    });
+  });
+
+  after(() => {
+    sinon.restore();
+  });
+
+  afterEach(async () => {
+    sinon.reset();
+  });
+
+  it('Should be ineffective, when not at service path', async () => {
+    const context = {
+      initial: {},
+    };
+    expect(await step.isApplicable(context)).to.be.false;
+    expect(context.inapplicabilityReasonCode).to.equal('NOT_IN_SERVICE_DIRECTORY');
+  });
+
+  it('Should be ineffective, when not at AWS service path', async () => {
+    const context = {
+      serviceDir: process.cwd(),
+      configuration: {},
+      configurationFilename: 'serverless.yml',
+      options: {},
+      initial: {},
+      inquirer,
+    };
+    expect(await step.isApplicable(context)).to.equal(false);
+    expect(context.inapplicabilityReasonCode).to.equal('NON_AWS_PROVIDER');
+  });
+
+  it('Should be ineffective, when not at supported runtime service path', async () => {
+    const context = {
+      serviceDir: process.cwd(),
+      configuration: { service: 'some-aws-service', provider: { name: 'aws', runtime: 'java8' } },
+      configurationFilename: 'serverless.yml',
+      options: {},
+      initial: {},
+      inquirer,
+    };
+    expect(await step.isApplicable(context)).to.equal(false);
+    expect(context.inapplicabilityReasonCode).to.equal('UNSUPPORTED_RUNTIME');
+  });
+
+  it('Should be ineffective, when not logged in', async () => {
+    const context = {
+      serviceDir: process.cwd(),
+      configuration: {
+        service: 'some-aws-service',
+        provider: { name: 'aws', runtime: 'nodejs12.x' },
+      },
+      configurationFilename: 'serverless.yml',
+      options: {},
+      initial: {},
+      inquirer,
+    };
+    expect(await step.isApplicable(context)).to.equal(false);
+    expect(context.inapplicabilityReasonCode).to.equal('NOT_LOGGED_IN');
+  });
+
+  it('Should be ineffective, when no orgs are resolved', async () => {
+    const freshStep = proxyquire('../../../../../lib/cli/interactive-setup/dashboard-set-org', {
+      '@serverless/platform-client': {
+        ServerlessSDK: class ServerlessSDK {
+          constructor() {
+            this.metadata = {
+              get: async () => {
+                return {
+                  awsAccountId: '377024778620',
+                  supportedRuntimes: ['nodejs10.x', 'nodejs12.x'],
+                  supportedRegions: ['us-east-1'],
+                };
+              },
+            };
+            this.organizations = {
+              list: async () => [],
+            };
+          }
+
+          config() {}
+        },
+      },
+    });
+    const { servicePath: serviceDir, serviceConfig: configuration } = await fixtures.setup(
+      'aws-loggedin-service'
+    );
+    const context = {
+      serviceDir,
+      configuration,
+      configurationFilename: 'serverless.yml',
+      options: {},
+      initial: {},
+      inquirer,
+    };
+    await overrideCwd(serviceDir, async () => {
+      expect(await freshStep.isApplicable(context)).to.be.false;
+    });
+    expect(context.inapplicabilityReasonCode).to.equal('NO_ORGS_AVAILABLE');
+  });
+
+  it('Should be ineffective, when project has monitoring setup with recognized org and app', async () => {
+    const { servicePath: serviceDir, serviceConfig: configuration } = await fixtures.setup(
+      'aws-loggedin-monitored-service'
+    );
+    const context = {
+      serviceDir,
+      configuration,
+      configurationFilename: 'serverless.yml',
+      options: {},
+      initial: {},
+      inquirer,
+    };
+    await overrideCwd(serviceDir, async () => {
+      expect(await step.isApplicable(context)).to.be.false;
+    });
+    expect(await overrideCwd(serviceDir, async () => await step.isApplicable(context))).to.equal(
+      false
+    );
+    expect(context.inapplicabilityReasonCode).to.equal('HAS_MONITORING_SETUP');
+  });
+
+  it('Should reject an invalid app name', async () => {
+    configureInquirerStub(inquirer, {
+      input: { newAppName: 'invalid app name /* Ć */' },
+      list: { orgName: 'testinteractivecli', appName: '_create_' },
+    });
+    const { servicePath: serviceDir, serviceConfig: configuration } = await fixtures.setup(
+      'aws-loggedin-service'
+    );
+    const context = {
+      serviceDir,
+      configuration,
+      configurationFilename: 'serverless.yml',
+      options: {},
+      initial: {},
+      inquirer,
+      stepHistory: new StepHistory(),
+    };
+    await expect(
+      overrideCwd(serviceDir, async () => {
+        const stepData = await step.isApplicable(context);
+        if (!stepData) throw new Error('Step resolved as not applicable');
+        await step.run(context, stepData);
+      })
+    ).to.eventually.be.rejected.and.have.property('code', 'INVALID_ANSWER');
+    expect(context.stepHistory.valuesMap()).to.deep.equal(
+      new Map([
+        ['orgName', '_user_choice_'],
+        ['appName', '_create_'],
+        ['newAppName', undefined],
+      ])
+    );
+  });
+
+  it('Should recognize an invalid org and allow to opt out', async () => {
+    configureInquirerStub(inquirer, {
+      confirm: { shouldUpdateOrg: false },
+    });
+    const { servicePath: serviceDir, serviceConfig: configuration } = await fixtures.setup(
+      'aws-loggedin-wrongorg-service'
+    );
+    const context = {
+      serviceDir,
+      configuration,
+      configurationFilename: 'serverless.yml',
+      options: {},
+      initial: {},
+      inquirer,
+      stepHistory: new StepHistory(),
+    };
+    await overrideCwd(serviceDir, async () => {
+      const stepData = await step.isApplicable(context);
+      if (!stepData) throw new Error('Step resolved as not applicable');
+      await step.run(context, stepData);
+    });
+    expect(context.configuration).to.not.have.property('org');
+    expect(context.configuration).to.not.have.property('app');
+    expect(context.stepHistory.valuesMap()).to.deep.equal(new Map([['shouldUpdateOrg', false]]));
+  });
+
+  it('Should recognize an invalid app and allow to opt out', async () => {
+    configureInquirerStub(inquirer, {
+      list: { appUpdateType: '_skip_' },
+    });
+    const { servicePath: serviceDir, serviceConfig: configuration } = await fixtures.setup(
+      'aws-loggedin-wrongapp-service'
+    );
+    const context = {
+      serviceDir,
+      configuration,
+      configurationFilename: 'serverless.yml',
+      options: {},
+      initial: {},
+      inquirer,
+      stepHistory: new StepHistory(),
+    };
+    await overrideCwd(serviceDir, async () => {
+      const stepData = await step.isApplicable(context);
+      if (!stepData) throw new Error('Step resolved as not applicable');
+      await step.run(context, stepData);
+    });
+    expect(context.configuration.org).to.equal('testinteractivecli');
+    expect(context.configuration.app).to.equal('not-created-app');
+    expect(context.stepHistory.valuesMap()).to.deep.equal(new Map([['appUpdateType', '_skip_']]));
+  });
+
+  describe('Monitoring setup', () => {
+    it('Should setup monitoring for chosen org and app', async () => {
+      configureInquirerStub(inquirer, {
+        list: { orgName: 'testinteractivecli', appName: 'other-app' },
+      });
+      const { servicePath: serviceDir, serviceConfig: configuration } = await fixtures.setup(
+        'aws-loggedin-service'
+      );
+      const context = {
+        serviceDir,
+        configuration,
+        configurationFilename: 'serverless.yml',
+        options: {},
+        initial: {},
+        inquirer,
+        stepHistory: new StepHistory(),
+      };
+
+      await overrideCwd(serviceDir, async () => {
+        const stepData = await step.isApplicable(context);
+        if (!stepData) throw new Error('Step resolved as not applicable');
+        await step.run(context, stepData);
+      });
+      const serviceConfig = yaml.load(
+        String(await fsp.readFile(join(serviceDir, 'serverless.yml')))
+      );
+      expect(serviceConfig.org).to.equal('testinteractivecli');
+      expect(serviceConfig.app).to.equal('other-app');
+      expect(context.configuration.org).to.equal('testinteractivecli');
+      expect(context.configuration.app).to.equal('other-app');
+      expect(context.stepHistory.valuesMap()).to.deep.equal(
+        new Map([
+          ['orgName', '_user_choice_'],
+          ['appName', '_user_choice_'],
+        ])
+      );
+    });
+
+    it('Should setup monitoring for chosen app and org based on access key', async () => {
+      configureInquirerStub(inquirer, {
+        list: { orgName: 'fromaccesskey', appName: 'other-app' },
+      });
+      const { servicePath: serviceDir, serviceConfig: configuration } = await fixtures.setup(
+        'aws-loggedin-service'
+      );
+      const context = {
+        serviceDir,
+        configuration,
+        configurationFilename: 'serverless.yml',
+        options: {},
+        initial: {},
+        inquirer,
+        stepHistory: new StepHistory(),
+      };
+      await overrideEnv({ variables: { SERVERLESS_ACCESS_KEY: 'validkey' } }, async () => {
+        await overrideCwd(serviceDir, async () => {
+          const stepData = await step.isApplicable(context);
+          if (!stepData) throw new Error('Step resolved as not applicable');
+          await step.run(context, stepData);
+        });
+      });
+      const serviceConfig = yaml.load(
+        String(await fsp.readFile(join(serviceDir, 'serverless.yml')))
+      );
+      expect(serviceConfig.org).to.equal('fromaccesskey');
+      expect(serviceConfig.app).to.equal('other-app');
+      expect(context.configuration.org).to.equal('fromaccesskey');
+      expect(context.configuration.app).to.equal('other-app');
+      expect(context.stepHistory.valuesMap()).to.deep.equal(
+        new Map([
+          ['orgName', '_user_choice_'],
+          ['appName', '_user_choice_'],
+        ])
+      );
+    });
+
+    it('Should allow to skip monitoring when org is resolved from access key', async () => {
+      configureInquirerStub(inquirer, {
+        list: { orgName: '_skip_' },
+      });
+      const { servicePath: serviceDir, serviceConfig: configuration } = await fixtures.setup(
+        'aws-loggedin-service'
+      );
+      const context = {
+        serviceDir,
+        configuration,
+        configurationFilename: 'serverless.yml',
+        options: {},
+        initial: {},
+        inquirer,
+        stepHistory: new StepHistory(),
+      };
+      await overrideEnv({ variables: { SERVERLESS_ACCESS_KEY: 'validkey' } }, async () => {
+        await overrideCwd(serviceDir, async () => {
+          const stepData = await step.isApplicable(context);
+          if (!stepData) throw new Error('Step resolved as not applicable');
+          await step.run(context, stepData);
+        });
+      });
+      const serviceConfig = yaml.load(
+        String(await fsp.readFile(join(serviceDir, 'serverless.yml')))
+      );
+      expect(serviceConfig.org).to.be.undefined;
+      expect(serviceConfig.app).to.be.undefined;
+      expect(context.configuration.org).to.be.undefined;
+      expect(context.configuration.app).to.be.undefined;
+      expect(context.stepHistory.valuesMap()).to.deep.equal(new Map([['orgName', '_skip_']]));
+    });
+
+    it('Should allow to skip setting monitoring when selecting org', async () => {
+      configureInquirerStub(inquirer, {
+        list: { orgName: '_skip_' },
+      });
+      const { servicePath: serviceDir, serviceConfig: configuration } = await fixtures.setup(
+        'aws-loggedin-service'
+      );
+      const context = {
+        serviceDir,
+        configuration,
+        configurationFilename: 'serverless.yml',
+        options: {},
+        initial: {},
+        inquirer,
+        stepHistory: new StepHistory(),
+      };
+      await overrideCwd(serviceDir, async () => {
+        const stepData = await step.isApplicable(context);
+        if (!stepData) throw new Error('Step resolved as not applicable');
+        await step.run(context, stepData);
+      });
+      const serviceConfig = yaml.load(
+        String(await fsp.readFile(join(serviceDir, 'serverless.yml')))
+      );
+      expect(serviceConfig.org).to.be.undefined;
+      expect(serviceConfig.app).to.be.undefined;
+      expect(context.configuration.org).to.be.undefined;
+      expect(context.configuration.app).to.be.undefined;
+      expect(context.stepHistory.valuesMap()).to.deep.equal(new Map([['orgName', '_skip_']]));
+    });
+  });
+
+  describe('Monitoring setup when only one org available', () => {
+    before(() => {
+      mockOrganizationsList = [{ tenantName: 'orgwithoutapps' }];
+    });
+
+    after(() => {
+      mockOrganizationsList = [
+        { tenantName: 'testinteractivecli' },
+        { tenantName: 'otherorg' },
+        { tenantName: 'orgwithoutapps' },
+      ];
+    });
+
+    it('Should not automatically pre choose single available org if login/register step was not presented', async () => {
+      configureInquirerStub(inquirer, {
+        list: { orgName: '_skip_' },
+      });
+      const { servicePath: serviceDir, serviceConfig: configuration } = await fixtures.setup(
+        'aws-loggedin-service'
+      );
+      const context = {
+        serviceDir,
+        configuration,
+        configurationFilename: 'serverless.yml',
+        options: {},
+        initial: {},
+        inquirer,
+        stepHistory: new StepHistory(),
+      };
+      await overrideCwd(serviceDir, async () => {
+        const stepData = await step.isApplicable(context);
+        if (!stepData) throw new Error('Step resolved as not applicable');
+        await step.run(context, stepData);
+      });
+      const serviceConfig = yaml.load(
+        String(await fsp.readFile(join(serviceDir, 'serverless.yml')))
+      );
+      expect(serviceConfig.org).to.be.undefined;
+      expect(serviceConfig.app).to.be.undefined;
+      expect(context.configuration.org).to.be.undefined;
+      expect(context.configuration.app).to.be.undefined;
+      expect(context.stepHistory.valuesMap()).to.deep.equal(new Map([['orgName', '_skip_']]));
+    });
+
+    it('Should not automatically pre choose single available org if context history is not available', async () => {
+      configureInquirerStub(inquirer, {
+        list: { orgName: '_skip_' },
+      });
+      const { servicePath: serviceDir, serviceConfig: configuration } = await fixtures.setup(
+        'aws-loggedin-service'
+      );
+      const context = {
+        serviceDir,
+        configuration,
+        configurationFilename: 'serverless.yml',
+        options: {},
+        initial: {},
+        inquirer,
+        stepHistory: new StepHistory(),
+      };
+      await overrideCwd(serviceDir, async () => {
+        const stepData = await step.isApplicable(context);
+        if (!stepData) throw new Error('Step resolved as not applicable');
+        await step.run(context, stepData);
+      });
+      const serviceConfig = yaml.load(
+        String(await fsp.readFile(join(serviceDir, 'serverless.yml')))
+      );
+      expect(serviceConfig.org).to.be.undefined;
+      expect(serviceConfig.app).to.be.undefined;
+      expect(context.configuration.org).to.be.undefined;
+      expect(context.configuration.app).to.be.undefined;
+      expect(context.stepHistory.valuesMap()).to.deep.equal(new Map([['orgName', '_skip_']]));
+    });
+
+    it('Should not automatically pre choose single available org if login/register step was presented but service step was not', async () => {
+      configureInquirerStub(inquirer, {
+        list: { orgName: '_skip_' },
+      });
+      const { servicePath: serviceDir, serviceConfig: configuration } = await fixtures.setup(
+        'aws-loggedin-service'
+      );
+      const context = {
+        serviceDir,
+        configuration,
+        configurationFilename: 'serverless.yml',
+        options: {},
+        initial: {},
+        inquirer,
+        history: new Map([['dashboardLogin', []]]),
+        stepHistory: new StepHistory(),
+      };
+      await overrideCwd(serviceDir, async () => {
+        const stepData = await step.isApplicable(context);
+        if (!stepData) throw new Error('Step resolved as not applicable');
+        await step.run(context, stepData);
+      });
+      const serviceConfig = yaml.load(
+        String(await fsp.readFile(join(serviceDir, 'serverless.yml')))
+      );
+      expect(serviceConfig.org).to.be.undefined;
+      expect(serviceConfig.app).to.be.undefined;
+      expect(context.configuration.org).to.be.undefined;
+      expect(context.configuration.app).to.be.undefined;
+      expect(context.stepHistory.valuesMap()).to.deep.equal(new Map([['orgName', '_skip_']]));
+    });
+
+    it('Should setup monitoring with the only available org if login/register and service steps were presented', async () => {
+      const { servicePath: serviceDir, serviceConfig: configuration } = await fixtures.setup(
+        'aws-loggedin-service'
+      );
+      const context = {
+        serviceDir,
+        configuration,
+        configurationFilename: 'serverless.yml',
+        options: {},
+        initial: {},
+        inquirer,
+        history: new Map([
+          ['dashboardLogin', []],
+          ['service', []],
+        ]),
+        stepHistory: new StepHistory(),
+      };
+
+      await overrideCwd(serviceDir, async () => {
+        const stepData = await step.isApplicable(context);
+        if (!stepData) throw new Error('Step resolved as not applicable');
+        await step.run(context, stepData);
+      });
+      const serviceConfig = yaml.load(
+        String(await fsp.readFile(join(serviceDir, 'serverless.yml')))
+      );
+      expect(serviceConfig.org).to.equal('orgwithoutapps');
+      expect(serviceConfig.app).to.equal(configuration.service);
+      expect(context.configuration.org).to.equal('orgwithoutapps');
+      expect(context.configuration.app).to.equal(configuration.service);
+      expect(context.stepHistory.valuesMap()).to.deep.equal(new Map());
+    });
+  });
+
+  describe('Monitoring setup from CLI flags', () => {
+    it('Should setup monitoring for chosen org and app', async () => {
+      const { servicePath: serviceDir, serviceConfig: configuration } = await fixtures.setup(
+        'aws-loggedin-service'
+      );
+      const context = {
+        serviceDir,
+        configuration,
+        configurationFilename: 'serverless.yml',
+        options: { org: 'testinteractivecli', app: 'other-app' },
+        initial: {},
+        inquirer,
+        history: new Map(),
+        stepHistory: new StepHistory(),
+      };
+
+      await overrideCwd(serviceDir, async () => {
+        const stepData = await step.isApplicable(context);
+        if (!stepData) throw new Error('Step resolved as not applicable');
+        await step.run(context, stepData);
+      });
+      const serviceConfig = yaml.load(
+        String(await fsp.readFile(join(serviceDir, 'serverless.yml')))
+      );
+      expect(serviceConfig.org).to.equal('testinteractivecli');
+      expect(serviceConfig.app).to.equal('other-app');
+      expect(context.configuration.org).to.equal('testinteractivecli');
+      expect(context.configuration.app).to.equal('other-app');
+      expect(context.stepHistory.valuesMap()).to.deep.equal(new Map());
+    });
+
+    it('Should setup monitoring for chosen org and app even if already configured', async () => {
+      configureInquirerStub(inquirer, {
+        confirm: { shouldOverrideDashboardConfig: true },
+      });
+      const { servicePath: serviceDir, serviceConfig: configuration } = await fixtures.setup(
+        'aws-loggedin-monitored-service'
+      );
+      const context = {
+        serviceDir,
+        configuration,
+        configurationFilename: 'serverless.yml',
+        options: { org: 'otherorg', app: 'app-from-flag' },
+        initial: {},
+        inquirer,
+        history: new Map(),
+        stepHistory: new StepHistory(),
+      };
+
+      await overrideCwd(serviceDir, async () => {
+        const stepData = await step.isApplicable(context);
+        if (!stepData) throw new Error('Step resolved as not applicable');
+        await step.run(context, stepData);
+      });
+      const serviceConfig = yaml.load(
+        String(await fsp.readFile(join(serviceDir, 'serverless.yml')))
+      );
+      expect(serviceConfig.org).to.equal('otherorg');
+      expect(serviceConfig.app).to.equal('app-from-flag');
+      expect(context.configuration.org).to.equal('otherorg');
+      expect(context.configuration.app).to.equal('app-from-flag');
+      expect(context.stepHistory.valuesMap()).to.deep.equal(
+        new Map([['shouldOverrideDashboardConfig', true]])
+      );
+    });
+
+    it('Should not setup monitoring for chosen org and app even if already configured if rejected', async () => {
+      configureInquirerStub(inquirer, {
+        confirm: { shouldOverrideDashboardConfig: false },
+      });
+
+      const { servicePath: serviceDir, serviceConfig: configuration } = await fixtures.setup(
+        'aws-loggedin-monitored-service'
+      );
+      const context = {
+        serviceDir,
+        configuration,
+        configurationFilename: 'serverless.yml',
+        options: { org: 'otherorg', app: 'app-from-flag' },
+        initial: {},
+        inquirer,
+        history: new Map(),
+        stepHistory: new StepHistory(),
+      };
+
+      await overrideCwd(serviceDir, async () => {
+        const stepData = await step.isApplicable(context);
+        if (!stepData) throw new Error('Step resolved as not applicable');
+        await step.run(context, stepData);
+      });
+      expect(context.configuration).to.not.have.property('org');
+      expect(context.configuration).to.not.have.property('app');
+      expect(context.stepHistory.valuesMap()).to.deep.equal(
+        new Map([['shouldOverrideDashboardConfig', false]])
+      );
+    });
+
+    it('Should ask for org if passed in one is invalid', async () => {
+      configureInquirerStub(inquirer, {
+        list: { orgName: 'testinteractivecli', appName: 'other-app' },
+      });
+      const { servicePath: serviceDir, serviceConfig: configuration } = await fixtures.setup(
+        'aws-loggedin-service'
+      );
+      const context = {
+        serviceDir,
+        configuration,
+        configurationFilename: 'serverless.yml',
+        options: { org: 'invalid-testinteractivecli', app: 'irrelevant' },
+        initial: {},
+        inquirer,
+        history: new Map(),
+        stepHistory: new StepHistory(),
+      };
+
+      await overrideCwd(serviceDir, async () => {
+        const stepData = await step.isApplicable(context);
+        if (!stepData) throw new Error('Step resolved as not applicable');
+        await step.run(context, stepData);
+      });
+      const serviceConfig = yaml.load(
+        String(await fsp.readFile(join(serviceDir, 'serverless.yml')))
+      );
+      expect(serviceConfig.org).to.equal('testinteractivecli');
+      expect(serviceConfig.app).to.equal('other-app');
+      expect(context.configuration.org).to.equal('testinteractivecli');
+      expect(context.configuration.app).to.equal('other-app');
+
+      expect(context.stepHistory.valuesMap()).to.deep.equal(
+        new Map([
+          ['orgName', '_user_choice_'],
+          ['appName', '_user_choice_'],
+        ])
+      );
+    });
+
+    it('Should ask for org if passed in one is invalid and there is a valid on in config', async () => {
+      configureInquirerStub(inquirer, {
+        confirm: { shouldOverrideDashboardConfig: true },
+        list: { orgName: 'otherorg', appName: 'other-app' },
+      });
+
+      const { servicePath: serviceDir, serviceConfig: configuration } = await fixtures.setup(
+        'aws-loggedin-monitored-service'
+      );
+      const context = {
+        serviceDir,
+        configuration,
+        configurationFilename: 'serverless.yml',
+        options: { org: 'invalid-testinteractivecli', app: 'irrelevant' },
+        initial: {},
+        inquirer,
+        history: new Map(),
+        stepHistory: new StepHistory(),
+      };
+
+      await overrideCwd(serviceDir, async () => {
+        const stepData = await step.isApplicable(context);
+        if (!stepData) throw new Error('Step resolved as not applicable');
+        await step.run(context, stepData);
+      });
+      const serviceConfig = yaml.load(
+        String(await fsp.readFile(join(serviceDir, 'serverless.yml')))
+      );
+      expect(serviceConfig.org).to.equal('otherorg');
+      expect(serviceConfig.app).to.equal('other-app');
+      expect(context.configuration.org).to.equal('otherorg');
+      expect(context.configuration.app).to.equal('other-app');
+
+      expect(context.stepHistory.valuesMap()).to.deep.equal(
+        new Map([
+          ['orgName', '_user_choice_'],
+          ['appName', '_user_choice_'],
+          ['shouldOverrideDashboardConfig', true],
+        ])
+      );
+    });
+
+    it('Should ask for app if passed in one is invalid and there is a valid on in config', async () => {
+      configureInquirerStub(inquirer, {
+        confirm: { shouldOverrideDashboardConfig: true },
+        list: { orgName: 'testinteractivecli', appName: 'other-app' },
+      });
+      const { servicePath: serviceDir, serviceConfig: configuration } = await fixtures.setup(
+        'aws-loggedin-monitored-service'
+      );
+      const context = {
+        serviceDir,
+        configuration,
+        configurationFilename: 'serverless.yml',
+        options: { org: 'invalid-testinteractivecli', app: 'irrelevant' },
+        initial: {},
+        inquirer,
+        history: new Map(),
+        stepHistory: new StepHistory(),
+      };
+      await overrideCwd(serviceDir, async () => {
+        const stepData = await step.isApplicable(context);
+        if (!stepData) throw new Error('Step resolved as not applicable');
+        await step.run(context, stepData);
+      });
+      const serviceConfig = yaml.load(
+        String(await fsp.readFile(join(serviceDir, 'serverless.yml')))
+      );
+      expect(serviceConfig.org).to.equal('testinteractivecli');
+      expect(serviceConfig.app).to.equal('other-app');
+      expect(context.configuration.org).to.equal('testinteractivecli');
+      expect(context.configuration.app).to.equal('other-app');
+      expect(context.stepHistory.valuesMap()).to.deep.equal(
+        new Map([
+          ['orgName', '_user_choice_'],
+          ['appName', '_user_choice_'],
+          ['shouldOverrideDashboardConfig', true],
+        ])
+      );
+    });
+
+    it('Should ask for app if passed in one is invalid', async () => {
+      configureInquirerStub(inquirer, {
+        list: { orgName: 'testinteractivecli', appName: 'other-app' },
+      });
+      const { servicePath: serviceDir, serviceConfig: configuration } = await fixtures.setup(
+        'aws-loggedin-service'
+      );
+      const context = {
+        serviceDir,
+        configuration,
+        configurationFilename: 'serverless.yml',
+        options: { org: 'testinteractivecli', app: 'invalid' },
+        initial: {},
+        inquirer,
+        history: new Map(),
+        stepHistory: new StepHistory(),
+      };
+
+      await overrideCwd(serviceDir, async () => {
+        const stepData = await step.isApplicable(context);
+        if (!stepData) throw new Error('Step resolved as not applicable');
+        await step.run(context, stepData);
+      });
+      const serviceConfig = yaml.load(
+        String(await fsp.readFile(join(serviceDir, 'serverless.yml')))
+      );
+      expect(serviceConfig.org).to.equal('testinteractivecli');
+      expect(serviceConfig.app).to.equal('other-app');
+      expect(context.configuration.org).to.equal('testinteractivecli');
+      expect(context.configuration.app).to.equal('other-app');
+
+      expect(context.stepHistory.valuesMap()).to.deep.equal(
+        new Map([['appName', '_user_choice_']])
+      );
+    });
+
+    it('Should create new app when requested, and setup monitoring with it', async () => {
+      configureInquirerStub(inquirer, {
+        input: { newAppName: 'frominput' },
+        list: { orgName: 'testinteractivecli', appName: '_create_' },
+      });
+      const { servicePath: serviceDir, serviceConfig: configuration } = await fixtures.setup(
+        'aws-loggedin-service'
+      );
+      const context = {
+        serviceDir,
+        configuration,
+        configurationFilename: 'serverless.yml',
+        inquirer,
+        options: {},
+        initial: {},
+        history: new Map(),
+        stepHistory: new StepHistory(),
+      };
+      await overrideCwd(serviceDir, async () => {
+        const stepData = await step.isApplicable(context);
+        if (!stepData) throw new Error('Step resolved as not applicable');
+        await step.run(context, stepData);
+      });
+      const serviceConfig = yaml.load(
+        String(await fsp.readFile(join(serviceDir, 'serverless.yml')))
+      );
+      expect(serviceConfig.org).to.equal('testinteractivecli');
+      expect(serviceConfig.app).to.equal('frominput');
+      expect(context.configuration.org).to.equal('testinteractivecli');
+      expect(context.configuration.app).to.equal('frominput');
+
+      expect(context.stepHistory.valuesMap()).to.deep.equal(
+        new Map([
+          ['orgName', '_user_choice_'],
+          ['appName', '_create_'],
+          ['newAppName', '_user_input_'],
+        ])
+      );
+    });
+  });
+
+  describe('Monitoring setup when invalid org', () => {
+    it('Should provide a way to setup monitoring with an invalid org setting', async () => {
+      configureInquirerStub(inquirer, {
+        confirm: { shouldUpdateOrg: true },
+        list: { orgName: 'testinteractivecli', appName: 'other-app' },
+      });
+      const { servicePath: serviceDir, serviceConfig: configuration } = await fixtures.setup(
+        'aws-loggedin-wrongorg-service'
+      );
+      const context = {
+        serviceDir,
+        configuration,
+        configurationFilename: 'serverless.yml',
+        inquirer,
+        options: {},
+        initial: {},
+        history: new Map(),
+        stepHistory: new StepHistory(),
+      };
+      await overrideCwd(serviceDir, async () => {
+        const stepData = await step.isApplicable(context);
+        if (!stepData) throw new Error('Step resolved as not applicable');
+        await step.run(context, stepData);
+      });
+      const serviceConfig = yaml.load(
+        String(await fsp.readFile(join(serviceDir, 'serverless.yml')))
+      );
+      expect(serviceConfig.org).to.equal('testinteractivecli');
+      expect(serviceConfig.app).to.equal('other-app');
+      expect(context.configuration.org).to.equal('testinteractivecli');
+      expect(context.configuration.app).to.equal('other-app');
+      expect(context.stepHistory.valuesMap()).to.deep.equal(
+        new Map([
+          ['shouldUpdateOrg', true],
+          ['orgName', '_user_choice_'],
+          ['appName', '_user_choice_'],
+        ])
+      );
+    });
+  });
+
+  describe('Monitoring setup when no app', () => {
+    it('Should allow to setup app', async () => {
+      configureInquirerStub(inquirer, {
+        list: { appName: 'other-app' },
+      });
+      const { servicePath: serviceDir, serviceConfig: configuration } = await fixtures.setup(
+        'aws-loggedin-noapp-service'
+      );
+      const context = {
+        serviceDir,
+        configuration,
+        configurationFilename: 'serverless.yml',
+        inquirer,
+        options: {},
+        initial: {},
+        history: new Map(),
+        stepHistory: new StepHistory(),
+      };
+
+      await overrideCwd(serviceDir, async () => {
+        const stepData = await step.isApplicable(context);
+        if (!stepData) throw new Error('Step resolved as not applicable');
+        await step.run(context, stepData);
+      });
+      const serviceConfig = yaml.load(
+        String(await fsp.readFile(join(serviceDir, 'serverless.yml')))
+      );
+      expect(serviceConfig.org).to.equal('testinteractivecli');
+      expect(serviceConfig.app).to.equal('other-app');
+      expect(context.configuration.org).to.equal('testinteractivecli');
+      expect(context.configuration.app).to.equal('other-app');
+      expect(context.stepHistory.valuesMap()).to.deep.equal(
+        new Map([['appName', '_user_choice_']])
+      );
+    });
+  });
+
+  describe('Monitoring setup when no app with --app flag', () => {
+    it('Should allow to setup app', async () => {
+      const { servicePath: serviceDir, serviceConfig: configuration } = await fixtures.setup(
+        'aws-loggedin-noapp-service'
+      );
+      const context = {
+        serviceDir,
+        configuration,
+        configurationFilename: 'serverless.yml',
+        inquirer,
+        options: { app: 'app-from-flag' },
+        initial: {},
+        history: new Map(),
+        stepHistory: new StepHistory(),
+      };
+
+      await overrideCwd(serviceDir, async () => {
+        const stepData = await step.isApplicable(context);
+        if (!stepData) throw new Error('Step resolved as not applicable');
+        await step.run(context, stepData);
+      });
+      const serviceConfig = yaml.load(
+        String(await fsp.readFile(join(serviceDir, 'serverless.yml')))
+      );
+      expect(serviceConfig.org).to.equal('testinteractivecli');
+      expect(serviceConfig.app).to.equal('app-from-flag');
+      expect(context.configuration.org).to.equal('testinteractivecli');
+      expect(context.configuration.app).to.equal('app-from-flag');
+      expect(context.stepHistory.valuesMap()).to.deep.equal(new Map());
+    });
+
+    it('Should create a default app if no apps exist', async () => {
+      const { servicePath: serviceDir, serviceConfig: configuration } = await fixtures.setup(
+        'aws-loggedin-noapp-service',
+        { configExt: { org: 'orgwithoutapps' } }
+      );
+      const context = {
+        serviceDir,
+        configuration,
+        configurationFilename: 'serverless.yml',
+        inquirer,
+        options: {},
+        initial: {},
+        history: new Map(),
+        stepHistory: new StepHistory(),
+      };
+
+      await overrideCwd(serviceDir, async () => {
+        const stepData = await step.isApplicable(context);
+        if (!stepData) throw new Error('Step resolved as not applicable');
+        await step.run(context, stepData);
+      });
+      const serviceConfig = yaml.load(
+        String(await fsp.readFile(join(serviceDir, 'serverless.yml')))
+      );
+      expect(serviceConfig.org).to.equal('orgwithoutapps');
+      expect(serviceConfig.app).to.equal(configuration.service);
+      expect(context.configuration.org).to.equal('orgwithoutapps');
+      expect(context.configuration.app).to.equal(configuration.service);
+      expect(context.stepHistory.valuesMap()).to.deep.equal(new Map());
+    });
+
+    it('Should allow to setup app when app is invalid', async () => {
+      configureInquirerStub(inquirer, {
+        list: { appName: 'other-app' },
+      });
+      const { servicePath: serviceDir, serviceConfig: configuration } = await fixtures.setup(
+        'aws-loggedin-noapp-service'
+      );
+      const context = {
+        serviceDir,
+        configuration,
+        configurationFilename: 'serverless.yml',
+        inquirer,
+        options: { app: 'invalid-app-from-flag' },
+        initial: {},
+        history: new Map(),
+        stepHistory: new StepHistory(),
+      };
+
+      await overrideCwd(serviceDir, async () => {
+        const stepData = await step.isApplicable(context);
+        if (!stepData) throw new Error('Step resolved as not applicable');
+        await step.run(context, stepData);
+      });
+      const serviceConfig = yaml.load(
+        String(await fsp.readFile(join(serviceDir, 'serverless.yml')))
+      );
+      expect(serviceConfig.org).to.equal('testinteractivecli');
+      expect(serviceConfig.app).to.equal('other-app');
+      expect(context.configuration.org).to.equal('testinteractivecli');
+      expect(context.configuration.app).to.equal('other-app');
+      expect(context.stepHistory.valuesMap()).to.deep.equal(
+        new Map([['appName', '_user_choice_']])
+      );
+    });
+  });
+
+  describe('Monitoring setup when invalid app', () => {
+    it('Should recognize an invalid app and allow to create it', async () => {
+      configureInquirerStub(inquirer, {
+        list: { appUpdateType: '_create_' },
+      });
+      const { servicePath: serviceDir, serviceConfig: configuration } = await fixtures.setup(
+        'aws-loggedin-service',
+        {
+          configExt: {
+            org: 'testinteractivecli',
+            app: 'not-created-app',
+          },
+        }
+      );
+      const context = {
+        serviceDir,
+        configuration,
+        configurationFilename: 'serverless.yml',
+        inquirer,
+        options: {},
+        initial: {},
+        history: new Map(),
+        stepHistory: new StepHistory(),
+      };
+
+      await overrideCwd(serviceDir, async () => {
+        const stepData = await step.isApplicable(context);
+        if (!stepData) throw new Error('Step resolved as not applicable');
+        await step.run(context, stepData);
+      });
+      const serviceConfig = yaml.load(
+        String(await fsp.readFile(join(serviceDir, 'serverless.yml')))
+      );
+      expect(serviceConfig.org).to.equal('testinteractivecli');
+      expect(serviceConfig.app).to.equal('not-created-app');
+      expect(context.configuration.org).to.equal('testinteractivecli');
+      expect(context.configuration.app).to.equal('not-created-app');
+      expect(context.stepHistory.valuesMap()).to.deep.equal(
+        new Map([['appUpdateType', '_create_']])
+      );
+    });
+
+    it('Should recognize an invalid app and allow to replace it with existing one', async () => {
+      configureInquirerStub(inquirer, {
+        list: { appUpdateType: '_choose_existing_', appName: 'other-app' },
+      });
+      const { servicePath: serviceDir, serviceConfig: configuration } = await fixtures.setup(
+        'aws-loggedin-service',
+        {
+          configExt: {
+            org: 'testinteractivecli',
+            app: 'not-created-app',
+          },
+        }
+      );
+      const context = {
+        serviceDir,
+        configuration,
+        configurationFilename: 'serverless.yml',
+        inquirer,
+        options: {},
+        initial: {},
+        history: new Map(),
+        stepHistory: new StepHistory(),
+      };
+
+      await overrideCwd(serviceDir, async () => {
+        const stepData = await step.isApplicable(context);
+        if (!stepData) throw new Error('Step resolved as not applicable');
+        await step.run(context, stepData);
+      });
+      const serviceConfig = yaml.load(
+        String(await fsp.readFile(join(serviceDir, 'serverless.yml')))
+      );
+      expect(serviceConfig.org).to.equal('testinteractivecli');
+      expect(serviceConfig.app).to.equal('other-app');
+      expect(context.configuration.org).to.equal('testinteractivecli');
+      expect(context.configuration.app).to.equal('other-app');
+      expect(context.stepHistory.valuesMap()).to.deep.equal(
+        new Map([
+          ['appUpdateType', '_choose_existing_'],
+          ['appName', '_user_choice_'],
+        ])
+      );
+    });
+  });
+});
diff --git a/test/unit/lib/cli/interactive-setup/deploy.test.js b/test/unit/lib/cli/interactive-setup/deploy.test.js
new file mode 100644
index 00000000000..6e5e28dbbdb
--- /dev/null
+++ b/test/unit/lib/cli/interactive-setup/deploy.test.js
@@ -0,0 +1,361 @@
+'use strict';
+
+const chai = require('chai');
+const sinon = require('sinon');
+const configureInquirerStub = require('@serverless/test/configure-inquirer-stub');
+const overrideEnv = require('process-utils/override-env');
+const step = require('../../../../../lib/cli/interactive-setup/deploy');
+const proxyquire = require('proxyquire');
+const { StepHistory } = require('@serverless/utils/telemetry');
+
+const { expect } = chai;
+
+chai.use(require('chai-as-promised'));
+chai.use(require('sinon-chai'));
+
+const inquirer = require('@serverless/utils/inquirer');
+
+describe('test/unit/lib/cli/interactive-setup/deploy.test.js', () => {
+  it('Should be not applied, when not at service path', async () => {
+    const context = {
+      options: {},
+    };
+    expect(await step.isApplicable(context)).to.equal(false);
+    expect(context.inapplicabilityReasonCode).to.equal('NOT_IN_SERVICE_DIRECTORY');
+  });
+
+  it('Should be not applied, when service is not configured with AWS provider', async () => {
+    const context = {
+      configuration: { provider: { name: 'notaws' } },
+      serviceDir: '/foo',
+      options: {},
+      history: new Map([['service', []]]),
+    };
+    expect(await step.isApplicable(context)).to.equal(false);
+    expect(context.inapplicabilityReasonCode).to.equal('NON_AWS_PROVIDER');
+  });
+
+  it('Should be applied if user configured local credentials', async () => {
+    await overrideEnv(
+      { variables: { AWS_ACCESS_KEY_ID: 'somekey', AWS_SECRET_ACCESS_KEY: 'somesecret' } },
+      async () => {
+        expect(
+          await step.isApplicable({
+            configuration: { provider: { name: 'aws' } },
+            serviceDir: '/foo',
+            options: {},
+            history: new Map([['awsCredentials', []]]),
+          })
+        ).to.equal(true);
+      }
+    );
+  });
+
+  it('Should be applied if service instance has a linked provider', async () => {
+    const mockedStep = proxyquire('../../../../../lib/cli/interactive-setup/deploy', {
+      '@serverless/dashboard-plugin/lib/is-authenticated': () => true,
+      './utils': {
+        doesServiceInstanceHaveLinkedProvider: () => true,
+      },
+    });
+
+    expect(
+      await mockedStep.isApplicable({
+        configuration: { provider: { name: 'aws' }, org: 'someorg' },
+        serviceDir: '/foo',
+        options: {},
+        history: new Map([['awsCredentials', []]]),
+      })
+    ).to.equal(true);
+  });
+
+  describe('run', () => {
+    it('should correctly handle skipping deployment for new service not configured with dashboard', async () => {
+      configureInquirerStub(inquirer, {
+        confirm: { shouldDeploy: false },
+      });
+
+      const context = {
+        serviceDir: process.cwd(),
+        configuration: {
+          service: 'someservice',
+          provider: { name: 'aws' },
+        },
+        configurationFilename: 'serverless.yml',
+        stepHistory: new StepHistory(),
+        initial: {
+          isInServiceContext: false,
+        },
+      };
+      await step.run(context);
+
+      expect(context.stepHistory.valuesMap()).to.deep.equal(new Map([['shouldDeploy', false]]));
+    });
+
+    it('should correctly handle skipping deployment for existing service not configured with dashboard', async () => {
+      configureInquirerStub(inquirer, {
+        confirm: { shouldDeploy: false },
+      });
+
+      const context = {
+        serviceDir: process.cwd(),
+        configuration: {
+          service: 'someservice',
+          provider: { name: 'aws' },
+        },
+        configurationFilename: 'serverless.yml',
+        stepHistory: new StepHistory(),
+        initial: {
+          isInServiceContext: true,
+        },
+      };
+      await step.run(context);
+
+      expect(context.stepHistory.valuesMap()).to.deep.equal(new Map([['shouldDeploy', false]]));
+    });
+
+    it('should correctly handle skipping deployment for new service configured with dashboard', async () => {
+      configureInquirerStub(inquirer, {
+        confirm: { shouldDeploy: false },
+      });
+
+      const context = {
+        serviceDir: process.cwd(),
+        configuration: {
+          service: 'someservice',
+          provider: { name: 'aws' },
+          org: 'someorg',
+          app: 'someapp',
+        },
+        configurationFilename: 'serverless.yml',
+        stepHistory: new StepHistory(),
+        initial: {
+          isInServiceContext: false,
+        },
+      };
+      await step.run(context);
+
+      expect(context.stepHistory.valuesMap()).to.deep.equal(new Map([['shouldDeploy', false]]));
+    });
+
+    it('should correctly handle skipping deployment for existing service configured with dashboard', async () => {
+      configureInquirerStub(inquirer, {
+        confirm: { shouldDeploy: false },
+      });
+
+      const context = {
+        serviceDir: process.cwd(),
+        configuration: {
+          service: 'someservice',
+          provider: { name: 'aws' },
+          org: 'someorg',
+          app: 'someapp',
+        },
+        configurationFilename: 'serverless.yml',
+        stepHistory: new StepHistory(),
+        initial: {
+          isInServiceContext: true,
+        },
+      };
+      await step.run(context);
+
+      expect(context.stepHistory.valuesMap()).to.deep.equal(new Map([['shouldDeploy', false]]));
+    });
+
+    it('should correctly handle deployment for new service configured with dashboard', async () => {
+      const mockedInit = sinon.stub().resolves();
+      const mockedRun = sinon.stub().resolves();
+      class MockedServerless {
+        constructor() {
+          this.init = mockedInit;
+          this.run = mockedRun;
+          this.pluginManager = {
+            addPlugin: () => ({}),
+            plugins: [
+              {
+                constructor: {
+                  name: 'InteractiveDeployProgress',
+                },
+                progress: {},
+              },
+            ],
+            dashboardPlugin: {},
+          };
+        }
+      }
+
+      const mockedStep = proxyquire('../../../../../lib/cli/interactive-setup/deploy', {
+        '../../serverless': MockedServerless,
+        '@serverless/dashboard-plugin/lib/dashboard': {
+          getDashboardInteractUrl: () => 'https://app.serverless-dev.com/path/to/dashboard',
+        },
+      });
+
+      configureInquirerStub(inquirer, {
+        confirm: { shouldDeploy: true },
+      });
+
+      const context = {
+        serviceDir: process.cwd(),
+        configuration: {
+          service: 'someservice',
+          provider: { name: 'aws' },
+          org: 'someorg',
+          app: 'someapp',
+        },
+        configurationFilename: 'serverless.yml',
+        stepHistory: new StepHistory(),
+        initial: {
+          isInServiceContext: false,
+        },
+      };
+      await mockedStep.run(context);
+
+      expect(context.stepHistory.valuesMap()).to.deep.equal(new Map([['shouldDeploy', true]]));
+    });
+
+    it('should correctly handle deployment for existing service configured with dashboard', async () => {
+      const mockedInit = sinon.stub().resolves();
+      const mockedRun = sinon.stub().resolves();
+      class MockedServerless {
+        constructor() {
+          this.init = mockedInit;
+          this.run = mockedRun;
+          this.pluginManager = {
+            addPlugin: () => ({}),
+            plugins: [
+              {
+                constructor: {
+                  name: 'InteractiveDeployProgress',
+                },
+                progress: {},
+              },
+            ],
+            dashboardPlugin: {},
+          };
+        }
+      }
+
+      const mockedStep = proxyquire('../../../../../lib/cli/interactive-setup/deploy', {
+        '../../serverless': MockedServerless,
+        '@serverless/dashboard-plugin/lib/dashboard': {
+          getDashboardInteractUrl: () => 'https://app.serverless-dev.com/path/to/dashboard',
+        },
+      });
+
+      configureInquirerStub(inquirer, {
+        confirm: { shouldDeploy: true },
+      });
+
+      const context = {
+        serviceDir: process.cwd(),
+        configuration: {
+          service: 'someservice',
+          provider: { name: 'aws' },
+          org: 'someorg',
+          app: 'someapp',
+        },
+        configurationFilename: 'serverless.yml',
+        stepHistory: new StepHistory(),
+        initial: {
+          isInServiceContext: true,
+        },
+      };
+      await mockedStep.run(context);
+
+      expect(context.stepHistory.valuesMap()).to.deep.equal(new Map([['shouldDeploy', true]]));
+    });
+
+    it('should correctly handle deployment for new service not configured with dashboard', async () => {
+      const mockedInit = sinon.stub().resolves();
+      const mockedRun = sinon.stub().resolves();
+      class MockedServerless {
+        constructor() {
+          this.init = mockedInit;
+          this.run = mockedRun;
+          this.pluginManager = {
+            addPlugin: () => ({}),
+            plugins: [
+              {
+                constructor: {
+                  name: 'InteractiveDeployProgress',
+                },
+                progress: {},
+              },
+            ],
+          };
+        }
+      }
+
+      const mockedStep = proxyquire('../../../../../lib/cli/interactive-setup/deploy', {
+        '../../serverless': MockedServerless,
+      });
+
+      configureInquirerStub(inquirer, {
+        confirm: { shouldDeploy: true },
+      });
+
+      const context = {
+        serviceDir: process.cwd(),
+        configuration: {
+          service: 'someservice',
+          provider: { name: 'aws' },
+        },
+        configurationFilename: 'serverless.yml',
+        stepHistory: new StepHistory(),
+        initial: {
+          isInServiceContext: false,
+        },
+      };
+      await mockedStep.run(context);
+
+      expect(context.stepHistory.valuesMap()).to.deep.equal(new Map([['shouldDeploy', true]]));
+    });
+
+    it('should correctly handle deployment for existing service not configured with dashboard', async () => {
+      const mockedInit = sinon.stub().resolves();
+      const mockedRun = sinon.stub().resolves();
+      class MockedServerless {
+        constructor() {
+          this.init = mockedInit;
+          this.run = mockedRun;
+          this.pluginManager = {
+            addPlugin: () => ({}),
+            plugins: [
+              {
+                constructor: {
+                  name: 'InteractiveDeployProgress',
+                },
+                progress: {},
+              },
+            ],
+          };
+        }
+      }
+
+      const mockedStep = proxyquire('../../../../../lib/cli/interactive-setup/deploy', {
+        '../../serverless': MockedServerless,
+      });
+
+      configureInquirerStub(inquirer, {
+        confirm: { shouldDeploy: true },
+      });
+
+      const context = {
+        serviceDir: process.cwd(),
+        configuration: {
+          service: 'someservice',
+          provider: { name: 'aws' },
+        },
+        configurationFilename: 'serverless.yml',
+        stepHistory: new StepHistory(),
+        initial: {
+          isInServiceContext: true,
+        },
+      };
+      await mockedStep.run(context);
+
+      expect(context.stepHistory.valuesMap()).to.deep.equal(new Map([['shouldDeploy', true]]));
+    });
+  });
+});
diff --git a/test/unit/lib/cli/interactive-setup/index.test.js b/test/unit/lib/cli/interactive-setup/index.test.js
new file mode 100644
index 00000000000..94e8df296cf
--- /dev/null
+++ b/test/unit/lib/cli/interactive-setup/index.test.js
@@ -0,0 +1,76 @@
+// Sanity tests that confirms a happy path interactive setup flow e2e way
+
+'use strict';
+
+const spawn = require('child-process-ext/spawn');
+const path = require('path');
+
+const serverlessPath = path.resolve(__dirname, '../../../../../scripts/serverless.js');
+const templatesPath = path.resolve(__dirname, '../../../../../lib/plugins/create/templates');
+
+describe('test/unit/lib/cli/interactive-setup/index.test.js', () => {
+  it('should configure interactive setup flow', async () => {
+    const slsProcessPromise = spawn(
+      'node',
+      [serverlessPath, '--template-path', path.join(templatesPath, 'aws-nodejs')],
+      {
+        env: {
+          ...process.env,
+          SLS_INTERACTIVE_SETUP_ENABLE: '1',
+          SLS_INTERACTIVE_SETUP_TEST: '1',
+          BROWSER: 'none',
+        },
+      }
+    );
+    const slsProcess = slsProcessPromise.child;
+    let output = '';
+    const program = [
+      // service
+      {
+        instructionString: 'What do you want to call this project?',
+        input: 'interactive-setup-test',
+      },
+
+      // dashboard-login
+      {
+        instructionString: 'Do you want to login/register to Serverless Dashboard?',
+        input: '\u001b[B', // Move cursor down by one line
+      },
+
+      // dashboard-set-org
+      // Skipped, as internally depends on remote state of data and cannot be easily tested offline
+
+      // aws-credentials
+      {
+        instructionString: 'No AWS credentials found, what credentials do you want to use?',
+      },
+      { instructionString: 'AWS account', input: 'Y' },
+      { instructionString: 'Press Enter to continue' },
+      {
+        instructionString: 'AWS Access Key Id',
+        input: 'AKIAIOSFODNN7EXAMPLE',
+      },
+      {
+        instructionString: 'AWS Secret Access Key',
+        input: 'wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY',
+      },
+
+      // deploy
+      { instructionString: 'Do you want to deploy now?', input: 'n' },
+    ];
+    slsProcess.stdout.on('data', (data) => {
+      output += data;
+      const programItem = program[0];
+      if (!programItem) return;
+      if (output.includes(programItem.instructionString)) {
+        program.shift();
+        output = '';
+        slsProcess.stdin.write(`${programItem.input || ''}\n`);
+      }
+    });
+    slsProcess.stdout.pipe(process.stdout);
+    slsProcess.stderr.pipe(process.stderr);
+
+    await slsProcessPromise;
+  });
+});
diff --git a/test/unit/lib/cli/interactive-setup/service.test.js b/test/unit/lib/cli/interactive-setup/service.test.js
new file mode 100644
index 00000000000..8738b13be3c
--- /dev/null
+++ b/test/unit/lib/cli/interactive-setup/service.test.js
@@ -0,0 +1,521 @@
+'use strict';
+
+const chai = require('chai');
+const path = require('path');
+const sinon = require('sinon');
+const configureInquirerStub = require('@serverless/test/configure-inquirer-stub');
+const step = require('../../../../../lib/cli/interactive-setup/service');
+const proxyquire = require('proxyquire');
+const ServerlessError = require('../../../../../lib/serverless-error');
+const { StepHistory } = require('@serverless/utils/telemetry');
+
+const templatesPath = path.resolve(__dirname, '../../../../../lib/plugins/create/templates');
+
+const { expect } = chai;
+
+chai.use(require('chai-as-promised'));
+chai.use(require('sinon-chai'));
+
+const fsp = require('fs').promises;
+const inquirer = require('@serverless/utils/inquirer');
+
+const confirmEmptyWorkingDir = async () =>
+  expect(await fsp.readdir(process.cwd())).to.deep.equal([]);
+
+describe('test/unit/lib/cli/interactive-setup/service.test.js', () => {
+  afterEach(() => {
+    sinon.restore();
+  });
+
+  it('Should be not applied, when at service path', () => {
+    const context = {
+      serviceDir: '/foo',
+      options: {},
+    };
+    expect(step.isApplicable(context)).to.equal(false);
+    expect(context.inapplicabilityReasonCode).to.equal('IN_SERVICE_DIRECTORY');
+  });
+
+  it('Should be applied, when not at service path', () => {
+    const context = { options: {} };
+    expect(step.isApplicable(context)).to.equal(true);
+    expect(context.inapplicabilityReasonCode).to.be.undefined;
+  });
+
+  it('Should result in an error when at service path with `template-path` options provided', () => {
+    expect(() =>
+      step.isApplicable({ serviceDir: '/foo', options: { 'template-path': 'path/to/template' } })
+    )
+      .to.throw()
+      .and.have.property('code', 'NOT_APPLICABLE_SERVICE_OPTIONS');
+  });
+
+  it('Should result in an error when at service path with `template` option provided', () => {
+    expect(() => step.isApplicable({ serviceDir: '/foo', options: { template: 'test-template' } }))
+      .to.throw()
+      .and.have.property('code', 'NOT_APPLICABLE_SERVICE_OPTIONS');
+  });
+
+  it('Should result in an error when at service path with `template-url` option provided', () => {
+    expect(() =>
+      step.isApplicable({ serviceDir: '/foo', options: { 'template-url': 'test-template' } })
+    )
+      .to.throw()
+      .and.have.property('code', 'NOT_APPLICABLE_SERVICE_OPTIONS');
+  });
+
+  it("Should abort if user choses 'other' template", async () => {
+    configureInquirerStub(inquirer, {
+      list: { projectType: 'other' },
+    });
+    const context = { options: {}, stepHistory: new StepHistory() };
+    await step.run(context);
+    expect(context.stepHistory.valuesMap()).to.deep.equal(new Map([['projectType', 'other']]));
+    return confirmEmptyWorkingDir();
+  });
+
+  describe('Create new project', () => {
+    it('Should create project at not existing directory', async () => {
+      const downloadTemplateFromRepoStub = sinon.stub();
+      const mockedStep = proxyquire('../../../../../lib/cli/interactive-setup/service', {
+        '../../utils/download-template-from-repo': {
+          downloadTemplateFromRepo: downloadTemplateFromRepoStub.callsFake(
+            async (templateUrl, projectType, projectName) => {
+              await fsp.mkdir(projectName);
+              const serverlessYmlContent = `
+            service: service
+            provider:
+              name: aws
+           `;
+
+              await fsp.writeFile(path.join(projectName, 'serverless.yml'), serverlessYmlContent);
+            }
+          ),
+        },
+      });
+
+      configureInquirerStub(inquirer, {
+        list: { projectType: 'aws-nodejs' },
+        input: { projectName: 'test-project' },
+      });
+      const context = { options: {}, stepHistory: new StepHistory() };
+      await mockedStep.run(context);
+      const stats = await fsp.lstat('test-project/serverless.yml');
+      expect(stats.isFile()).to.be.true;
+      expect(downloadTemplateFromRepoStub).to.have.been.calledWith(
+        'https://github.com/serverless/examples/tree/v3/aws-nodejs',
+        'aws-nodejs',
+        'test-project'
+      );
+      expect(context.stepHistory.valuesMap()).to.deep.equal(
+        new Map([
+          ['projectType', 'aws-nodejs'],
+          ['projectName', '_user_input_'],
+        ])
+      );
+    });
+
+    it('Should remove `serverless.template.yml` if its a part of the template', async () => {
+      const downloadTemplateFromRepoStub = sinon.stub();
+      const mockedStep = proxyquire('../../../../../lib/cli/interactive-setup/service', {
+        '../../utils/download-template-from-repo': {
+          downloadTemplateFromRepo: downloadTemplateFromRepoStub.callsFake(
+            async (templateUrl, projectType, projectName) => {
+              await fsp.mkdir(projectName);
+              const serverlessYmlContent = `
+            service: service
+            provider:
+              name: aws
+           `;
+
+              await fsp.writeFile(path.join(projectName, 'serverless.yml'), serverlessYmlContent);
+              await fsp.writeFile(path.join(projectName, 'serverless.template.yml'), '');
+            }
+          ),
+        },
+      });
+
+      configureInquirerStub(inquirer, {
+        list: { projectType: 'aws-nodejs' },
+        input: { projectName: 'test-project-template' },
+      });
+      const context = { options: {}, stepHistory: new StepHistory() };
+      await mockedStep.run(context);
+      const stats = await fsp.lstat('test-project-template/serverless.yml');
+      expect(stats.isFile()).to.be.true;
+      expect(downloadTemplateFromRepoStub).to.have.been.calledWith(
+        'https://github.com/serverless/examples/tree/v3/aws-nodejs',
+        'aws-nodejs',
+        'test-project-template'
+      );
+      await expect(
+        fsp.lstat('test-proejct-template/serverless.template.yml')
+      ).to.eventually.be.rejected.and.have.property('code', 'ENOENT');
+
+      expect(context.stepHistory.valuesMap()).to.deep.equal(
+        new Map([
+          ['projectType', 'aws-nodejs'],
+          ['projectName', '_user_input_'],
+        ])
+      );
+    });
+
+    it('Should run `npm install` if `package.json` present', async () => {
+      const downloadTemplateFromRepoStub = sinon.stub();
+      const spawnStub = sinon.stub();
+      const mockedStep = proxyquire('../../../../../lib/cli/interactive-setup/service', {
+        'child-process-ext/spawn': spawnStub,
+        '../../utils/download-template-from-repo': {
+          downloadTemplateFromRepo: downloadTemplateFromRepoStub.callsFake(
+            async (templateUrl, projectType, projectName) => {
+              await fsp.mkdir(projectName);
+              const serverlessYmlContent = `
+            service: service
+            provider:
+              name: aws
+           `;
+
+              await fsp.writeFile(path.join(projectName, 'serverless.yml'), serverlessYmlContent);
+              await fsp.writeFile(path.join(projectName, 'package.json'), '{}');
+            }
+          ),
+        },
+      });
+
+      configureInquirerStub(inquirer, {
+        list: { projectType: 'aws-nodejs' },
+        input: { projectName: 'test-project-package-json' },
+      });
+      const context = { options: {}, stepHistory: new StepHistory() };
+      await mockedStep.run(context);
+      const stats = await fsp.lstat('test-project-package-json/serverless.yml');
+      expect(stats.isFile()).to.be.true;
+      expect(downloadTemplateFromRepoStub).to.have.been.calledWith(
+        'https://github.com/serverless/examples/tree/v3/aws-nodejs',
+        'aws-nodejs',
+        'test-project-package-json'
+      );
+      expect(spawnStub).to.have.been.calledWith('npm', ['install'], {
+        cwd: path.join(process.cwd(), 'test-project-package-json'),
+      });
+
+      expect(context.stepHistory.valuesMap()).to.deep.equal(
+        new Map([
+          ['projectType', 'aws-nodejs'],
+          ['projectName', '_user_input_'],
+        ])
+      );
+    });
+
+    it('Should emit warning if npm installation not found', async () => {
+      const downloadTemplateFromRepoStub = sinon.stub();
+      const mockedStep = proxyquire('../../../../../lib/cli/interactive-setup/service', {
+        'child-process-ext/spawn': sinon.stub().rejects({ message: 'Error message' }),
+        '../../utils/download-template-from-repo': {
+          downloadTemplateFromRepo: downloadTemplateFromRepoStub.callsFake(
+            async (templateUrl, projectType, projectName) => {
+              await fsp.mkdir(projectName);
+              const serverlessYmlContent = `
+            service: service
+            provider:
+              name: aws
+           `;
+
+              await fsp.writeFile(path.join(projectName, 'serverless.yml'), serverlessYmlContent);
+              await fsp.writeFile(path.join(projectName, 'package.json'), '{}');
+            }
+          ),
+        },
+      });
+
+      configureInquirerStub(inquirer, {
+        list: { projectType: 'aws-nodejs' },
+        input: { projectName: 'test-project-failed-install' },
+      });
+
+      const context = { options: {}, stepHistory: new StepHistory() };
+      await expect(mockedStep.run(context)).to.be.eventually.rejected.and.have.property(
+        'code',
+        'DEPENDENCIES_INSTALL_FAILED'
+      );
+
+      expect(context.stepHistory.valuesMap()).to.deep.equal(
+        new Map([
+          ['projectType', 'aws-nodejs'],
+          ['projectName', '_user_input_'],
+        ])
+      );
+    });
+
+    it('Should create project at not existing directory from a provided `template-path`', async () => {
+      configureInquirerStub(inquirer, {
+        input: { projectName: 'test-project-from-local-template' },
+      });
+      const context = {
+        options: { 'template-path': path.join(templatesPath, 'aws-nodejs') },
+        stepHistory: new StepHistory(),
+      };
+      await step.run(context);
+      const stats = await fsp.lstat('test-project-from-local-template/serverless.yml');
+      expect(stats.isFile()).to.be.true;
+
+      expect(context.stepHistory.valuesMap()).to.deep.equal(
+        new Map([['projectName', '_user_input_']])
+      );
+    });
+
+    it('Should create project at not existing directory with provided `name`', async () => {
+      const mockedStep = proxyquire('../../../../../lib/cli/interactive-setup/service', {
+        '../../utils/download-template-from-repo': {
+          downloadTemplateFromRepo: sinon
+            .stub()
+            .callsFake(async (templateUrl, projectType, projectName) => {
+              await fsp.mkdir(projectName);
+              const serverlessYmlContent = `
+            service: service
+            provider:
+              name: aws
+           `;
+
+              await fsp.writeFile(path.join(projectName, 'serverless.yml'), serverlessYmlContent);
+            }),
+        },
+      });
+      configureInquirerStub(inquirer, {
+        list: { projectType: 'aws-nodejs' },
+      });
+      const context = {
+        options: { name: 'test-project-from-cli-option' },
+        stepHistory: new StepHistory(),
+      };
+      await mockedStep.run(context);
+      const stats = await fsp.lstat('test-project-from-cli-option/serverless.yml');
+      expect(stats.isFile()).to.be.true;
+      expect(context.stepHistory.valuesMap()).to.deep.equal(
+        new Map([['projectType', 'aws-nodejs']])
+      );
+    });
+
+    it('Should create project at not existing directory with provided template', async () => {
+      const downloadTemplateFromRepoStub = sinon.stub();
+      const mockedStep = proxyquire('../../../../../lib/cli/interactive-setup/service', {
+        '../../utils/download-template-from-repo': {
+          downloadTemplateFromRepo: downloadTemplateFromRepoStub.callsFake(
+            async (templateUrl, projectType, projectName) => {
+              const serverlessYmlContent = `
+            service: service
+            provider:
+              name: aws
+           `;
+
+              await fsp.mkdir(projectName);
+              await fsp.writeFile(path.join(projectName, 'serverless.yml'), serverlessYmlContent);
+            }
+          ),
+        },
+      });
+      configureInquirerStub(inquirer, {
+        input: { projectName: 'test-project-from-provided-template' },
+      });
+      const context = { options: { template: 'test-template' }, stepHistory: new StepHistory() };
+      await mockedStep.run(context);
+      const stats = await fsp.lstat('test-project-from-provided-template/serverless.yml');
+      expect(stats.isFile()).to.be.true;
+      expect(downloadTemplateFromRepoStub).to.have.been.calledWith(
+        'https://github.com/serverless/examples/tree/v3/test-template',
+        'test-template',
+        'test-project-from-provided-template'
+      );
+
+      expect(context.stepHistory.valuesMap()).to.deep.equal(
+        new Map([['projectName', '_user_input_']])
+      );
+    });
+
+    it('Should create project at not existing directory with provided `template-url`', async () => {
+      const providedTemplateUrl = 'https://github.com/serverless/examples/tree/v3/test-template';
+      const downloadTemplateFromRepoStub = sinon.stub();
+      const mockedStep = proxyquire('../../../../../lib/cli/interactive-setup/service', {
+        '../../utils/download-template-from-repo': {
+          downloadTemplateFromRepo: downloadTemplateFromRepoStub.callsFake(
+            async (templateUrl, projectType, projectName) => {
+              const serverlessYmlContent = `
+            service: service
+            provider:
+              name: aws
+           `;
+
+              await fsp.mkdir(projectName);
+              await fsp.writeFile(path.join(projectName, 'serverless.yml'), serverlessYmlContent);
+            }
+          ),
+        },
+      });
+      configureInquirerStub(inquirer, {
+        input: { projectName: 'test-project-from-provided-template-url' },
+      });
+      const context = {
+        options: { 'template-url': providedTemplateUrl },
+        stepHistory: new StepHistory(),
+      };
+      await mockedStep.run(context);
+      const stats = await fsp.lstat('test-project-from-provided-template-url/serverless.yml');
+      expect(stats.isFile()).to.be.true;
+      expect(downloadTemplateFromRepoStub).to.have.been.calledWith(
+        providedTemplateUrl,
+        null,
+        'test-project-from-provided-template-url'
+      );
+
+      expect(context.stepHistory.valuesMap()).to.deep.equal(
+        new Map([['projectName', '_user_input_']])
+      );
+    });
+
+    it('Should throw an error when template cannot be downloaded', async () => {
+      const mockedStep = proxyquire('../../../../../lib/cli/interactive-setup/service', {
+        '../../utils/download-template-from-repo': {
+          downloadTemplateFromRepo: sinon.stub().callsFake(async () => {
+            throw new ServerlessError();
+          }),
+        },
+      });
+      configureInquirerStub(inquirer, {
+        list: { projectType: 'aws-nodejs' },
+        input: { projectName: 'test-error-during-download' },
+      });
+      const context = { options: {}, stepHistory: new StepHistory() };
+      await expect(mockedStep.run(context)).to.be.eventually.rejected.and.have.property(
+        'code',
+        'TEMPLATE_DOWNLOAD_FAILED'
+      );
+
+      expect(context.stepHistory.valuesMap()).to.deep.equal(
+        new Map([
+          ['projectType', 'aws-nodejs'],
+          ['projectName', '_user_input_'],
+        ])
+      );
+    });
+
+    it('Should throw an error when provided template cannot be found', async () => {
+      const mockedStep = proxyquire('../../../../../lib/cli/interactive-setup/service', {
+        '../../utils/download-template-from-repo': {
+          downloadTemplateFromRepo: sinon.stub().rejects({ code: 'ENOENT' }),
+        },
+      });
+      configureInquirerStub(inquirer, {
+        input: { projectName: 'test-error-during-download' },
+      });
+      const context = { options: { template: 'test-template' }, stepHistory: new StepHistory() };
+      await expect(mockedStep.run(context)).to.be.eventually.rejected.and.have.property(
+        'code',
+        'INVALID_TEMPLATE'
+      );
+      expect(context.stepHistory.valuesMap()).to.deep.equal(
+        new Map([['projectName', '_user_input_']])
+      );
+    });
+
+    it('Should throw an error when template provided with url cannot be found', async () => {
+      const mockedStep = proxyquire('../../../../../lib/cli/interactive-setup/service', {
+        '../../utils/download-template-from-repo': {
+          downloadTemplateFromRepo: sinon.stub().callsFake(async () => {
+            throw new ServerlessError();
+          }),
+        },
+      });
+      configureInquirerStub(inquirer, {
+        input: { projectName: 'test-error-during-download-custom-template' },
+      });
+      const context = {
+        options: { 'template-url': 'test-template-url' },
+        stepHistory: new StepHistory(),
+      };
+      await expect(mockedStep.run(context)).to.be.eventually.rejected.and.have.property(
+        'code',
+        'INVALID_TEMPLATE_URL'
+      );
+
+      expect(context.stepHistory.valuesMap()).to.deep.equal(
+        new Map([['projectName', '_user_input_']])
+      );
+    });
+  });
+
+  it('Should not allow project creation in a directory in which already service is configured', async () => {
+    configureInquirerStub(inquirer, {
+      list: { projectType: 'aws-nodejs' },
+      input: { projectName: 'existing' },
+    });
+
+    await fsp.mkdir('existing');
+
+    const context = { options: {}, stepHistory: new StepHistory() };
+    await expect(step.run(context)).to.eventually.be.rejected.and.have.property(
+      'code',
+      'INVALID_ANSWER'
+    );
+
+    expect(context.stepHistory.valuesMap()).to.deep.equal(
+      new Map([
+        ['projectType', 'aws-nodejs'],
+        ['projectName', undefined],
+      ])
+    );
+  });
+
+  it('Should not allow project creation in a directory in which already service is configured when `name` flag provided', async () => {
+    configureInquirerStub(inquirer, {
+      list: { projectType: 'aws-nodejs' },
+    });
+
+    await fsp.mkdir('anotherexisting');
+
+    const context = { options: { name: 'anotherexisting' }, stepHistory: new StepHistory() };
+    await expect(step.run(context)).to.eventually.be.rejected.and.have.property(
+      'code',
+      'TARGET_FOLDER_ALREADY_EXISTS'
+    );
+
+    expect(context.stepHistory.valuesMap()).to.deep.equal(new Map([['projectType', 'aws-nodejs']]));
+  });
+
+  it('Should not allow project creation using an invalid project name', async () => {
+    configureInquirerStub(inquirer, {
+      list: { projectType: 'aws-nodejs' },
+      input: { projectName: 'elo grzegżółka' },
+    });
+    const context = { options: {}, stepHistory: new StepHistory() };
+    await expect(step.run(context)).to.eventually.be.rejected.and.have.property(
+      'code',
+      'INVALID_ANSWER'
+    );
+
+    expect(context.stepHistory.valuesMap()).to.deep.equal(
+      new Map([
+        ['projectType', 'aws-nodejs'],
+        ['projectName', undefined],
+      ])
+    );
+  });
+
+  it('Should not allow project creation using an invalid project name when `name` flag provided', async () => {
+    configureInquirerStub(inquirer, {
+      list: { projectType: 'aws-nodejs' },
+    });
+    const context = { options: { name: 'elo grzegżółka' }, stepHistory: new StepHistory() };
+    await expect(step.run(context)).to.eventually.be.rejected.and.have.property(
+      'code',
+      'INVALID_PROJECT_NAME'
+    );
+
+    expect(context.stepHistory.valuesMap()).to.deep.equal(new Map([['projectType', 'aws-nodejs']]));
+  });
+
+  it('Should not allow project creation if multiple template-related options are provided', async () => {
+    await expect(
+      step.run({ options: { 'template': 'some-template', 'template-url': 'https://template.com' } })
+    ).to.eventually.be.rejected.and.have.property('code', 'MULTIPLE_TEMPLATE_OPTIONS_PROVIDED');
+  });
+});
diff --git a/test/unit/lib/cli/interactive-setup/utils.test.js b/test/unit/lib/cli/interactive-setup/utils.test.js
new file mode 100644
index 00000000000..b079c1814a1
--- /dev/null
+++ b/test/unit/lib/cli/interactive-setup/utils.test.js
@@ -0,0 +1,106 @@
+'use strict';
+
+const chai = require('chai');
+
+const proxyquire = require('proxyquire');
+
+const { expect } = chai;
+
+chai.use(require('chai-as-promised'));
+
+describe('test/unit/lib/cli/interactive-setup/utils.test.js', () => {
+  describe('doesServiceInstanceHaveLinkedProvider', () => {
+    const configuration = {
+      app: 'someapp',
+      service: 'someservice',
+      org: 'someorg',
+    };
+    const options = {};
+
+    it('correctly resolves when credentials resolved', async () => {
+      const { doesServiceInstanceHaveLinkedProvider } = proxyquire(
+        '../../../../../lib/cli/interactive-setup/utils',
+        {
+          '@serverless/dashboard-plugin/lib/resolve-provider-credentials': () => {
+            return {
+              accessKeyId: 'someaccess',
+              secretAccessKey: 'somesecret',
+              sessionToken: 'sometoken',
+            };
+          },
+        }
+      );
+      expect(await doesServiceInstanceHaveLinkedProvider({ configuration, options })).to.be.true;
+    });
+
+    it('correctly resolves when credentials missing', async () => {
+      const { doesServiceInstanceHaveLinkedProvider } = proxyquire(
+        '../../../../../lib/cli/interactive-setup/utils',
+        {
+          '@serverless/dashboard-plugin/lib/resolve-provider-credentials': () => {
+            return null;
+          },
+        }
+      );
+      expect(await doesServiceInstanceHaveLinkedProvider({ configuration, options })).to.be.false;
+    });
+
+    it('throws when credentials resolution results in an error', async () => {
+      const { doesServiceInstanceHaveLinkedProvider } = proxyquire(
+        '../../../../../lib/cli/interactive-setup/utils',
+        {
+          '@serverless/dashboard-plugin/lib/resolve-provider-credentials': () => {
+            const err = new Error('Error');
+            err.statusCode = 500;
+            throw err;
+          },
+        }
+      );
+      expect(
+        doesServiceInstanceHaveLinkedProvider({ configuration, options })
+      ).to.eventually.be.rejected.and.have.property('code', 'DASHBOARD_UNAVAILABLE');
+    });
+  });
+
+  describe('resolveInitialContext', () => {
+    it('correctly resolves for service context and dashboard enabled', async () => {
+      const configuration = {
+        app: 'someapp',
+        service: 'someservice',
+        org: 'someorg',
+      };
+      const serviceDir = '/path/to/service/dir';
+      const { resolveInitialContext } = proxyquire(
+        '../../../../../lib/cli/interactive-setup/utils',
+        {
+          '@serverless/dashboard-plugin/lib/is-authenticated': () => true,
+          '../../aws/has-local-credentials': () => true,
+        }
+      );
+      expect(resolveInitialContext({ configuration, serviceDir })).to.deep.equal({
+        hasLocalAwsCredentials: true,
+        isLoggedIntoDashboard: true,
+        isDashboardEnabled: true,
+        isInServiceContext: true,
+      });
+    });
+
+    it('correctly resolves without service context', async () => {
+      const configuration = null;
+      const serviceDir = null;
+      const { resolveInitialContext } = proxyquire(
+        '../../../../../lib/cli/interactive-setup/utils',
+        {
+          '@serverless/dashboard-plugin/lib/is-authenticated': () => true,
+          '../../aws/has-local-credentials': () => true,
+        }
+      );
+      expect(resolveInitialContext({ configuration, serviceDir })).to.deep.equal({
+        hasLocalAwsCredentials: true,
+        isLoggedIntoDashboard: true,
+        isDashboardEnabled: false,
+        isInServiceContext: false,
+      });
+    });
+  });
+});
diff --git a/test/unit/lib/cli/load-dotenv.test.js b/test/unit/lib/cli/load-dotenv.test.js
index a2b48e38fa0..fe7fd6bf9c9 100644
--- a/test/unit/lib/cli/load-dotenv.test.js
+++ b/test/unit/lib/cli/load-dotenv.test.js
@@ -4,7 +4,7 @@ const chai = require('chai');
 const path = require('path');
 const sinon = require('sinon');
 const overrideEnv = require('process-utils/override-env');
-const fs = require('fs');
+const fsp = require('fs').promises;
 const loadEnv = require('../../../../lib/cli/load-dotenv');
 const dotenv = require('dotenv');
 const ServerlessError = require('../../../../lib/serverless-error');
@@ -18,10 +18,10 @@ describe('test/unit/lib/cli/load-dotenv.test.js', () => {
   before(async () => {
     const stage = 'testing';
     const stageFileContent = 'FROM_STAGE=valuefromstage';
-    await fs.promises.writeFile(path.join(process.cwd(), `.env.${stage}`), stageFileContent);
+    await fsp.writeFile(path.join(process.cwd(), `.env.${stage}`), stageFileContent);
 
     const defaultFileContent = 'FROM_DEFAULT=valuefromdefault';
-    await fs.promises.writeFile(path.join(process.cwd(), '.env'), defaultFileContent);
+    await fsp.writeFile(path.join(process.cwd(), '.env'), defaultFileContent);
   });
 
   beforeEach(() => {
diff --git a/test/unit/lib/cli/local-serverless-path.test.js b/test/unit/lib/cli/local-serverless-path.test.js
new file mode 100644
index 00000000000..b702b9478b9
--- /dev/null
+++ b/test/unit/lib/cli/local-serverless-path.test.js
@@ -0,0 +1,35 @@
+'use strict';
+
+const { expect } = require('chai');
+const path = require('path');
+const os = require('os');
+const fsp = require('fs').promises;
+const fse = require('fs-extra');
+
+describe('test/unit/lib/cli/local-serverless.test.js', () => {
+  beforeEach(() => {
+    delete require.cache[require.resolve('../../../../lib/cli/local-serverless-path')];
+  });
+
+  it('should resolve with `null` when no local installation is found', () => {
+    expect(require('../../../../lib/cli/local-serverless-path')).to.equal(null);
+  });
+
+  it('should resolve with `null` when no local installation is found', async () => {
+    const tmpServerlessPath = path.resolve(
+      await fsp.realpath(os.homedir()),
+      'node_modules/serverless'
+    );
+    await fse.ensureDir(path.resolve(tmpServerlessPath, 'lib'));
+    await Promise.all([
+      fse.ensureFile(path.resolve(tmpServerlessPath, 'lib/serverless.js')),
+      fsp.writeFile(
+        path.resolve(tmpServerlessPath, 'package.json'),
+        JSON.stringify({ main: 'lib/serverless.js' })
+      ),
+    ]);
+    expect(await fsp.realpath(require('../../../../lib/cli/local-serverless-path'))).to.equal(
+      tmpServerlessPath
+    );
+  });
+});
diff --git a/test/unit/lib/cli/parse-args.test.js b/test/unit/lib/cli/parse-args.test.js
index 2323ed4a396..a474cc55099 100644
--- a/test/unit/lib/cli/parse-args.test.js
+++ b/test/unit/lib/cli/parse-args.test.js
@@ -139,6 +139,11 @@ describe('test/unit/lib/cli/parse-args.test.js', () => {
     expect(parsedArgs).to.deep.equal({});
   });
 
+  it('should not throw if -h or --help param', () => {
+    parseArgs(['-ab=foo', '--help'], {});
+    parseArgs(['--boolean=value', '-h'], { boolean: new Set(['boolean']) });
+  });
+
   it('should reject value for mutliple boolean properties alias', () =>
     expect(() => parseArgs(['-ab=foo'], {}))
       .to.throw(ServerlessError)
diff --git a/test/unit/lib/cli/render-help/command.test.js b/test/unit/lib/cli/render-help/command.test.js
index 02e8a8e1728..ae465163284 100644
--- a/test/unit/lib/cli/render-help/command.test.js
+++ b/test/unit/lib/cli/render-help/command.test.js
@@ -1,31 +1,23 @@
 'use strict';
 
 const { expect } = require('chai');
-const overrideStdoutWrite = require('process-utils/override-stdout-write');
 const renderCommandHelp = require('../../../../../lib/cli/render-help/command');
 const commandsSchema = require('../../../../../lib/cli/commands-schema');
+const observeOutput = require('@serverless/test/observe-output');
 
 describe('test/unit/lib/cli/render-help/command.test.js', () => {
-  it('should show help', () => {
-    let stdoutData = '';
-    overrideStdoutWrite(
-      (data) => (stdoutData += data),
-      () => renderCommandHelp('deploy')
-    );
-    expect(stdoutData).to.have.string('deploy');
-    expect(stdoutData).to.have.string('deploy function');
-    expect(stdoutData).to.have.string('--help');
-    expect(stdoutData).to.have.string(commandsSchema.get('deploy').usage);
-    expect(stdoutData).to.have.string(commandsSchema.get('deploy function').usage);
+  it('should show help', async () => {
+    const output = await observeOutput(() => renderCommandHelp('deploy'));
+    expect(output).to.have.string('deploy');
+    expect(output).to.have.string('deploy function');
+    expect(output).to.have.string('--help');
+    expect(output).to.have.string(commandsSchema.get('deploy').usage);
+    expect(output).to.have.string(commandsSchema.get('deploy function').usage);
   });
-  it('should show help for container command', () => {
-    let stdoutData = '';
-    overrideStdoutWrite(
-      (data) => (stdoutData += data),
-      () => renderCommandHelp('config tabcompletion')
-    );
-    expect(stdoutData).to.have.string('config tabcompletion install');
-    expect(stdoutData).to.have.string(commandsSchema.get('config tabcompletion install').usage);
-    expect(stdoutData).to.have.string(commandsSchema.get('config tabcompletion uninstall').usage);
+  it('should show help for container command', async () => {
+    const output = await observeOutput(() => renderCommandHelp('plugin'));
+    expect(output).to.have.string('plugin install');
+    expect(output).to.have.string(commandsSchema.get('plugin install').usage);
+    expect(output).to.have.string(commandsSchema.get('plugin uninstall').usage);
   });
 });
diff --git a/test/unit/lib/cli/render-help/general.test.js b/test/unit/lib/cli/render-help/general.test.js
index 9e5fb8b3e58..240a1d63328 100644
--- a/test/unit/lib/cli/render-help/general.test.js
+++ b/test/unit/lib/cli/render-help/general.test.js
@@ -1,17 +1,13 @@
 'use strict';
 
 const { expect } = require('chai');
-const overrideStdoutWrite = require('process-utils/override-stdout-write');
 const renderGeneralHelp = require('../../../../../lib/cli/render-help/general');
+const observeOutput = require('@serverless/test/observe-output');
 
 describe('test/unit/lib/cli/render-help/general.test.js', () => {
-  it('should show help', () => {
-    let stdoutData = '';
-    overrideStdoutWrite(
-      (data) => (stdoutData += data),
-      () => renderGeneralHelp(new Set())
-    );
-    expect(stdoutData).to.have.string('General Commands');
-    expect(stdoutData).to.have.string('deploy function');
+  it('should show help', async () => {
+    const output = await observeOutput(() => renderGeneralHelp(new Set()));
+    expect(output).to.have.string('Usage');
+    expect(output).to.have.string('deploy function');
   });
 });
diff --git a/test/unit/lib/cli/render-help/index.test.js b/test/unit/lib/cli/render-help/index.test.js
index 986c45a1668..54d6f0cc0a9 100644
--- a/test/unit/lib/cli/render-help/index.test.js
+++ b/test/unit/lib/cli/render-help/index.test.js
@@ -3,11 +3,11 @@
 const { expect } = require('chai');
 const overrideArgv = require('process-utils/override-argv');
 const resolveInput = require('../../../../../lib/cli/resolve-input');
-const overrideStdoutWrite = require('process-utils/override-stdout-write');
 const renderHelp = require('../../../../../lib/cli/render-help');
+const observeOutput = require('@serverless/test/observe-output');
 
 describe('test/unit/lib/cli/render-help/index.test.js', () => {
-  it('should show general help on main command', () => {
+  it('should show general help on main command', async () => {
     resolveInput.clear();
     overrideArgv(
       {
@@ -15,16 +15,12 @@ describe('test/unit/lib/cli/render-help/index.test.js', () => {
       },
       () => resolveInput()
     );
-    let stdoutData = '';
-    overrideStdoutWrite(
-      (data) => (stdoutData += data),
-      () => renderHelp(new Set())
-    );
-    expect(stdoutData).to.have.string('General Commands');
-    expect(stdoutData).to.have.string('deploy function');
+    const output = await observeOutput(() => renderHelp(new Set()));
+    expect(output).to.have.string('Usage');
+    expect(output).to.have.string('deploy function');
   });
 
-  it('should show interactive help when requested', () => {
+  it('should show interactive help when requested', async () => {
     resolveInput.clear();
     overrideArgv(
       {
@@ -32,16 +28,12 @@ describe('test/unit/lib/cli/render-help/index.test.js', () => {
       },
       () => resolveInput()
     );
-    let stdoutData = '';
-    overrideStdoutWrite(
-      (data) => (stdoutData += data),
-      () => renderHelp(new Set())
-    );
-    expect(stdoutData).to.have.string('Interactive CLI');
-    expect(stdoutData).to.have.string('--help-interactive');
+    const output = await observeOutput(() => renderHelp(new Set()));
+    expect(output).to.have.string('Interactive CLI');
+    expect(output).to.have.string('--help-interactive');
   });
 
-  it('should show general help on help command', () => {
+  it('should show general help on help command', async () => {
     resolveInput.clear();
     overrideArgv(
       {
@@ -49,16 +41,12 @@ describe('test/unit/lib/cli/render-help/index.test.js', () => {
       },
       () => resolveInput()
     );
-    let stdoutData = '';
-    overrideStdoutWrite(
-      (data) => (stdoutData += data),
-      () => renderHelp(new Set())
-    );
-    expect(stdoutData).to.have.string('General Commands');
-    expect(stdoutData).to.have.string('deploy function');
+    const output = await observeOutput(() => renderHelp(new Set()));
+    expect(output).to.have.string('Usage');
+    expect(output).to.have.string('deploy function');
   });
 
-  it('should show specific commmand help with specific command', () => {
+  it('should show specific commmand help with specific command', async () => {
     resolveInput.clear();
     const { commandsSchema } = overrideArgv(
       {
@@ -66,15 +54,11 @@ describe('test/unit/lib/cli/render-help/index.test.js', () => {
       },
       () => resolveInput()
     );
-    let stdoutData = '';
-    overrideStdoutWrite(
-      (data) => (stdoutData += data),
-      () => renderHelp(new Set())
-    );
-    expect(stdoutData).to.have.string('deploy');
-    expect(stdoutData).to.have.string('deploy function');
-    expect(stdoutData).to.have.string('--help');
-    expect(stdoutData).to.have.string(commandsSchema.get('deploy').usage);
-    expect(stdoutData).to.have.string(commandsSchema.get('deploy function').usage);
+    const output = await observeOutput(() => renderHelp(new Set()));
+    expect(output).to.have.string('deploy');
+    expect(output).to.have.string('deploy function');
+    expect(output).to.have.string('--help');
+    expect(output).to.have.string(commandsSchema.get('deploy').usage);
+    expect(output).to.have.string(commandsSchema.get('deploy function').usage);
   });
 });
diff --git a/test/unit/lib/cli/render-help/interactive-setup.test.js b/test/unit/lib/cli/render-help/interactive-setup.test.js
index 7bdf98bc25b..03ed8c0ff0f 100644
--- a/test/unit/lib/cli/render-help/interactive-setup.test.js
+++ b/test/unit/lib/cli/render-help/interactive-setup.test.js
@@ -1,17 +1,13 @@
 'use strict';
 
 const { expect } = require('chai');
-const overrideStdoutWrite = require('process-utils/override-stdout-write');
 const renderInteractiveSetupHelp = require('../../../../../lib/cli/render-help/interactive-setup');
+const observeOutput = require('@serverless/test/observe-output');
 
 describe('test/unit/lib/cli/render-help/interactive-setup.test.js', () => {
-  it('should show help', () => {
-    let stdoutData = '';
-    overrideStdoutWrite(
-      (data) => (stdoutData += data),
-      () => renderInteractiveSetupHelp()
-    );
-    expect(stdoutData).to.have.string('Interactive CLI');
-    expect(stdoutData).to.have.string('--help-interactive');
+  it('should show help', async () => {
+    const output = await observeOutput(() => renderInteractiveSetupHelp());
+    expect(output).to.have.string('Interactive CLI');
+    expect(output).to.have.string('--help-interactive');
   });
 });
diff --git a/test/unit/lib/cli/render-help/options.test.js b/test/unit/lib/cli/render-help/options.test.js
index 81ee6f9cd86..901440504f3 100644
--- a/test/unit/lib/cli/render-help/options.test.js
+++ b/test/unit/lib/cli/render-help/options.test.js
@@ -1,29 +1,26 @@
 'use strict';
 
 const { expect } = require('chai');
-const overrideStdoutWrite = require('process-utils/override-stdout-write');
 const renderOptionsHelp = require('../../../../../lib/cli/render-help/options');
+const observeOutput = require('@serverless/test/observe-output');
 
 describe('test/unit/lib/cli/render-help/options.test.js', () => {
-  it('should list options', () => {
-    let stdoutData = '';
-    overrideStdoutWrite(
-      (data) => (stdoutData += data),
-      () =>
-        renderOptionsHelp({
-          foo: {
-            usage: 'Some option',
-            shortcut: 'b',
-            required: true,
-          },
-          bar: {
-            usage: 'Elo',
-          },
-          noData: {},
-        })
+  it('should list options', async () => {
+    const output = await observeOutput(() =>
+      renderOptionsHelp({
+        foo: {
+          usage: 'Some option',
+          shortcut: 'b',
+          required: true,
+        },
+        bar: {
+          usage: 'Elo',
+        },
+        noData: {},
+      })
     );
-    expect(stdoutData).to.have.string('--foo');
-    expect(stdoutData).to.have.string('-b');
-    expect(stdoutData).to.have.string('Some option');
+    expect(output).to.have.string('--foo');
+    expect(output).to.have.string('-b');
+    expect(output).to.have.string('Some option');
   });
 });
diff --git a/test/unit/lib/cli/render-version.test.js b/test/unit/lib/cli/render-version.test.js
index 1ec9cf8a0dd..fbe4d239256 100644
--- a/test/unit/lib/cli/render-version.test.js
+++ b/test/unit/lib/cli/render-version.test.js
@@ -1,17 +1,13 @@
 'use strict';
 
 const { expect } = require('chai');
-const overrideStdoutWrite = require('process-utils/override-stdout-write');
 const listVersion = require('../../../../lib/cli/render-version');
+const observeOutput = require('@serverless/test/observe-output');
 
 describe('test/unit/lib/cli/list-version.test.js', () => {
   it('should log version', async () => {
-    let stdoutData = '';
-    await overrideStdoutWrite(
-      (data) => (stdoutData += data),
-      () => listVersion()
-    );
-    expect(stdoutData).to.have.string('Framework Core: ');
-    expect(stdoutData).to.have.string('SDK: ');
+    const output = await observeOutput(() => listVersion());
+    expect(output).to.have.string('Framework Core: ');
+    expect(output).to.have.string('SDK: ');
   });
 });
diff --git a/test/unit/lib/cli/resolve-configuration-path.test.js b/test/unit/lib/cli/resolve-configuration-path.test.js
index fd88fa36afb..c3bcccc5f7c 100644
--- a/test/unit/lib/cli/resolve-configuration-path.test.js
+++ b/test/unit/lib/cli/resolve-configuration-path.test.js
@@ -6,19 +6,20 @@ chai.use(require('chai-as-promised'));
 const { expect } = chai;
 
 const path = require('path');
-const fs = require('fs').promises;
+const fsp = require('fs').promises;
 const fse = require('fs-extra');
 const overrideArgv = require('process-utils/override-argv');
+const overrideEnv = require('process-utils/override-env');
+const requireUncached = require('ncjsm/require-uncached');
 const resolveServerlessConfigPath = require('../../../../lib/cli/resolve-configuration-path');
 const resolveInput = require('../../../../lib/cli/resolve-input');
-const { triggeredDeprecations } = require('../../../../lib/utils/logDeprecation');
 
-describe('test/unit/lib/cli/resolve-service-config-path.test.js', () => {
+describe('test/unit/lib/cli/resolve-configuration-path.test.js', () => {
   let configurationPath;
   afterEach(async () => {
     if (!configurationPath) return;
     try {
-      await fs.unlink(configurationPath);
+      await fsp.unlink(configurationPath);
     } catch {
       // Ignore any error
     }
@@ -68,10 +69,8 @@ describe('test/unit/lib/cli/resolve-service-config-path.test.js', () => {
       ])
     );
     beforeEach(() => {
-      triggeredDeprecations.clear();
       resolveInput.clear();
     });
-    after(() => triggeredDeprecations.clear());
 
     it('should accept absolute path, pointing configuration in current working directory', async () => {
       await overrideArgv(
@@ -83,15 +82,25 @@ describe('test/unit/lib/cli/resolve-service-config-path.test.js', () => {
     });
 
     it('should temporarily support nested path', async () => {
-      await overrideArgv(
-        {
-          args: ['serverless', '--config', 'nested/custom.yml'],
-        },
-        async () => {
-          expect(await resolveServerlessConfigPath()).to.equal(path.resolve('nested/custom.yml'));
-          expect(triggeredDeprecations.has('NESTED_CUSTOM_CONFIGURATION_PATH')).to.be.true;
-        }
-      );
+      await overrideEnv(async () => {
+        process.env.SLS_DEPRECATION_NOTIFICATION_MODE = 'warn';
+        const uncached = requireUncached(() => ({
+          resolveServerlessConfigPath: require('../../../../lib/cli/resolve-configuration-path'),
+        }));
+        await overrideArgv(
+          {
+            args: ['serverless', '--config', 'nested/custom.yml'],
+          },
+          async () => {
+            await expect(
+              uncached.resolveServerlessConfigPath()
+            ).to.eventually.be.rejected.and.have.property(
+              'code',
+              'NESTED_CUSTOM_CONFIGURATION_PATH'
+            );
+          }
+        );
+      });
     });
     it('should reject unsupported extension', async () => {
       await overrideArgv(
@@ -146,4 +155,27 @@ describe('test/unit/lib/cli/resolve-service-config-path.test.js', () => {
       );
     });
   });
+
+  describe('options support', () => {
+    before(async () =>
+      Promise.all([
+        fse.ensureFile(path.resolve('custom/custom.yml')),
+        fse.ensureFile(path.resolve('normal/serverless.yml')),
+      ])
+    );
+    beforeEach(() => {
+      resolveInput.clear();
+    });
+
+    it('should support custom cwd', async () => {
+      expect(await resolveServerlessConfigPath({ cwd: 'normal' })).to.equal(
+        path.resolve('normal/serverless.yml')
+      );
+    });
+    it('should support custom cli options', async () => {
+      expect(
+        await resolveServerlessConfigPath({ cwd: 'custom', options: { config: 'custom.yml' } })
+      ).to.equal(path.resolve('custom/custom.yml'));
+    });
+  });
 });
diff --git a/test/unit/lib/cli/resolve-input.test.js b/test/unit/lib/cli/resolve-input.test.js
index 69c2ad3a931..4fc5bf661c5 100644
--- a/test/unit/lib/cli/resolve-input.test.js
+++ b/test/unit/lib/cli/resolve-input.test.js
@@ -10,6 +10,8 @@ describe('test/unit/lib/cli/resolve-input.test.js', () => {
     let data;
     before(() => {
       resolveInput.clear();
+      delete require.cache[require.resolve('../../../../lib/utils/log-deprecation')];
+      process.env.SLS_DEPRECATION_DISABLE = 'CLI_OPTIONS_BEFORE_COMMAND';
       data = overrideArgv(
         {
           args: [
@@ -31,7 +33,7 @@ describe('test/unit/lib/cli/resolve-input.test.js', () => {
     });
 
     it('should resolve commands', async () => {
-      expect(data.commands).to.deep.equal(['cmd1', 'cmd2', 'ver', 'h', 'elo', 'other']);
+      expect(data.commands).to.deep.equal(['cmd1', 'cmd2']);
     });
 
     it('should recognize --version as boolean', async () => {
@@ -45,46 +47,6 @@ describe('test/unit/lib/cli/resolve-input.test.js', () => {
     it('should recognize --config', async () => {
       expect(data.options.config).to.equal('conf');
     });
-
-    describe('"-v" handling', () => {
-      before(() => {
-        resolveInput.clear();
-        data = overrideArgv(
-          {
-            args: ['serverless', 'cmd1', 'cmd2', '-v', 'ver', 'other'],
-          },
-          () => resolveInput()
-        );
-      });
-      it('should not recognize as version alias', async () => {
-        expect(data.options).to.not.have.property('version');
-      });
-      it('should recognize as boolean', async () => {
-        expect(data.options.v).to.equal(true);
-      });
-    });
-
-    describe('Command with initially not recognized boolean', () => {
-      before(() => {
-        resolveInput.clear();
-        data = overrideArgv(
-          {
-            args: ['serverless', 'deploy', '--force', 'function', '-f', 'foo'],
-          },
-          () => resolveInput()
-        );
-      });
-
-      it('should recognize target command', async () => {
-        expect(data).to.deep.equal({
-          commandSchema: commandsSchema.get('deploy function'),
-          command: 'deploy function',
-          commands: ['deploy', 'function'],
-          options: { force: true, function: 'foo' },
-          commandsSchema,
-        });
-      });
-    });
   });
 
   describe('"-s" handling', () => {
diff --git a/test/unit/lib/cli/resolve-local-serverless-path.test.js b/test/unit/lib/cli/resolve-local-serverless-path.test.js
deleted file mode 100644
index f20cce25570..00000000000
--- a/test/unit/lib/cli/resolve-local-serverless-path.test.js
+++ /dev/null
@@ -1,23 +0,0 @@
-'use strict';
-
-const { expect } = require('chai');
-const path = require('path');
-const os = require('os');
-const fs = require('fs');
-const fse = require('fs-extra');
-const resolveLocalServerless = require('../../../../lib/cli/resolve-local-serverless-path');
-
-describe('test/unit/lib/cli/resolve-local-serverless.test.js', () => {
-  it('should resolve with `null` when no local installation is found', async () => {
-    expect(await resolveLocalServerless()).to.equal(null);
-  });
-  it('should resolve with `null` when no local installation is found', async () => {
-    resolveLocalServerless.delete();
-    const tmpServerlessPath = path.resolve(
-      await fs.promises.realpath(os.homedir()),
-      'node_modules/serverless.js'
-    );
-    await fse.ensureFile(tmpServerlessPath);
-    expect(await fs.promises.realpath(await resolveLocalServerless())).to.equal(tmpServerlessPath);
-  });
-});
diff --git a/test/unit/lib/cli/triage/fixtures/@serverless/cli/js/component/serverless.js b/test/unit/lib/cli/triage/fixtures/@serverless/cli/js/component/serverless.js
new file mode 100644
index 00000000000..216349131bb
--- /dev/null
+++ b/test/unit/lib/cli/triage/fixtures/@serverless/cli/js/component/serverless.js
@@ -0,0 +1,3 @@
+'use strict';
+
+module.exports = { foo: { component: 'foo' } };
diff --git a/test/unit/lib/cli/triage/fixtures/@serverless/cli/js/function/serverless.js b/test/unit/lib/cli/triage/fixtures/@serverless/cli/js/function/serverless.js
new file mode 100644
index 00000000000..529aa95af4c
--- /dev/null
+++ b/test/unit/lib/cli/triage/fixtures/@serverless/cli/js/function/serverless.js
@@ -0,0 +1,3 @@
+'use strict';
+
+module.exports = () => {};
diff --git a/test/unit/lib/cli/triage/fixtures/@serverless/cli/json/component/serverless.json b/test/unit/lib/cli/triage/fixtures/@serverless/cli/json/component/serverless.json
new file mode 100644
index 00000000000..20e58a33042
--- /dev/null
+++ b/test/unit/lib/cli/triage/fixtures/@serverless/cli/json/component/serverless.json
@@ -0,0 +1,3 @@
+{
+  "foo": { "component": "foo" }
+}
diff --git a/test/unit/lib/cli/triage/fixtures/@serverless/cli/yml/component/serverless.yml b/test/unit/lib/cli/triage/fixtures/@serverless/cli/yml/component/serverless.yml
new file mode 100644
index 00000000000..3f3c5a23c8d
--- /dev/null
+++ b/test/unit/lib/cli/triage/fixtures/@serverless/cli/yml/component/serverless.yml
@@ -0,0 +1,2 @@
+foo:
+  component: foo
diff --git a/test/unit/lib/cli/triage/fixtures/platform/js/template/foo/instance/serverless.js b/test/unit/lib/cli/triage/fixtures/platform/js/template/foo/instance/serverless.js
new file mode 100644
index 00000000000..b0676f30071
--- /dev/null
+++ b/test/unit/lib/cli/triage/fixtures/platform/js/template/foo/instance/serverless.js
@@ -0,0 +1,3 @@
+'use strict';
+
+module.exports = { component: 'foo' };
diff --git a/test/unit/lib/cli/triage/fixtures/platform/js/template/foo/serverless.js b/test/unit/lib/cli/triage/fixtures/platform/js/template/foo/serverless.js
new file mode 100644
index 00000000000..b0676f30071
--- /dev/null
+++ b/test/unit/lib/cli/triage/fixtures/platform/js/template/foo/serverless.js
@@ -0,0 +1,3 @@
+'use strict';
+
+module.exports = { component: 'foo' };
diff --git a/test/unit/lib/cli/triage/fixtures/platform/json/component/serverless.component.json b/test/unit/lib/cli/triage/fixtures/platform/json/component/serverless.component.json
new file mode 100644
index 00000000000..0967ef424bc
--- /dev/null
+++ b/test/unit/lib/cli/triage/fixtures/platform/json/component/serverless.component.json
@@ -0,0 +1 @@
+{}
diff --git a/test/unit/lib/cli/triage/fixtures/platform/json/instance/serverless.json b/test/unit/lib/cli/triage/fixtures/platform/json/instance/serverless.json
new file mode 100644
index 00000000000..f3c7bc43068
--- /dev/null
+++ b/test/unit/lib/cli/triage/fixtures/platform/json/instance/serverless.json
@@ -0,0 +1,3 @@
+{
+  "component": "foo"
+}
diff --git a/test/unit/lib/cli/triage/fixtures/platform/json/template/foo/serverless.json b/test/unit/lib/cli/triage/fixtures/platform/json/template/foo/serverless.json
new file mode 100644
index 00000000000..5f4c4daba5e
--- /dev/null
+++ b/test/unit/lib/cli/triage/fixtures/platform/json/template/foo/serverless.json
@@ -0,0 +1 @@
+{ "component": "foo" }
diff --git a/test/unit/lib/cli/triage/fixtures/platform/yml/component/serverless.component.yaml b/test/unit/lib/cli/triage/fixtures/platform/yml/component/serverless.component.yaml
new file mode 100644
index 00000000000..0967ef424bc
--- /dev/null
+++ b/test/unit/lib/cli/triage/fixtures/platform/yml/component/serverless.component.yaml
@@ -0,0 +1 @@
+{}
diff --git a/test/unit/lib/cli/triage/fixtures/platform/yml/instance/serverless.yml b/test/unit/lib/cli/triage/fixtures/platform/yml/instance/serverless.yml
new file mode 100644
index 00000000000..e3e6ecdf9ed
--- /dev/null
+++ b/test/unit/lib/cli/triage/fixtures/platform/yml/instance/serverless.yml
@@ -0,0 +1 @@
+component: foo
diff --git a/test/unit/lib/cli/triage/fixtures/platform/yml/template-with-root-config/foo/serverless.yml b/test/unit/lib/cli/triage/fixtures/platform/yml/template-with-root-config/foo/serverless.yml
new file mode 100644
index 00000000000..e3e6ecdf9ed
--- /dev/null
+++ b/test/unit/lib/cli/triage/fixtures/platform/yml/template-with-root-config/foo/serverless.yml
@@ -0,0 +1 @@
+component: foo
diff --git a/test/unit/lib/cli/triage/fixtures/platform/yml/template-with-root-config/serverless.yml b/test/unit/lib/cli/triage/fixtures/platform/yml/template-with-root-config/serverless.yml
new file mode 100644
index 00000000000..5127bd8469d
--- /dev/null
+++ b/test/unit/lib/cli/triage/fixtures/platform/yml/template-with-root-config/serverless.yml
@@ -0,0 +1 @@
+app: foo
diff --git a/test/unit/lib/cli/triage/fixtures/platform/yml/template/foo/serverless.yml b/test/unit/lib/cli/triage/fixtures/platform/yml/template/foo/serverless.yml
new file mode 100644
index 00000000000..e3e6ecdf9ed
--- /dev/null
+++ b/test/unit/lib/cli/triage/fixtures/platform/yml/template/foo/serverless.yml
@@ -0,0 +1 @@
+component: foo
diff --git a/test/unit/lib/cli/triage/fixtures/serverless/js/component-in-custom/serverless.js b/test/unit/lib/cli/triage/fixtures/serverless/js/component-in-custom/serverless.js
new file mode 100644
index 00000000000..1901b327078
--- /dev/null
+++ b/test/unit/lib/cli/triage/fixtures/serverless/js/component-in-custom/serverless.js
@@ -0,0 +1,3 @@
+'use strict';
+
+module.exports = { service: 'foo', provider: { name: 'foo' }, custom: { component: 'foo' } };
diff --git a/test/unit/lib/cli/triage/fixtures/serverless/js/projects/bar/serverless.yml b/test/unit/lib/cli/triage/fixtures/serverless/js/projects/bar/serverless.yml
new file mode 100644
index 00000000000..27b360ba434
--- /dev/null
+++ b/test/unit/lib/cli/triage/fixtures/serverless/js/projects/bar/serverless.yml
@@ -0,0 +1,3 @@
+service: foo
+provider:
+  name: any
diff --git a/test/unit/lib/cli/triage/fixtures/serverless/js/projects/foo/serverless.js b/test/unit/lib/cli/triage/fixtures/serverless/js/projects/foo/serverless.js
new file mode 100644
index 00000000000..b0676f30071
--- /dev/null
+++ b/test/unit/lib/cli/triage/fixtures/serverless/js/projects/foo/serverless.js
@@ -0,0 +1,3 @@
+'use strict';
+
+module.exports = { component: 'foo' };
diff --git a/test/unit/lib/cli/triage/fixtures/serverless/json/component-in-custom/serverless.json b/test/unit/lib/cli/triage/fixtures/serverless/json/component-in-custom/serverless.json
new file mode 100644
index 00000000000..97fa86a70b5
--- /dev/null
+++ b/test/unit/lib/cli/triage/fixtures/serverless/json/component-in-custom/serverless.json
@@ -0,0 +1 @@
+{ "service": "foo", "provider": { "name": "foo" }, "custom": { "component": "foo" } }
diff --git a/test/unit/lib/cli/triage/fixtures/serverless/json/projects/bar/serverless.yml b/test/unit/lib/cli/triage/fixtures/serverless/json/projects/bar/serverless.yml
new file mode 100644
index 00000000000..27b360ba434
--- /dev/null
+++ b/test/unit/lib/cli/triage/fixtures/serverless/json/projects/bar/serverless.yml
@@ -0,0 +1,3 @@
+service: foo
+provider:
+  name: any
diff --git a/test/unit/lib/cli/triage/fixtures/serverless/json/projects/foo/serverless.json b/test/unit/lib/cli/triage/fixtures/serverless/json/projects/foo/serverless.json
new file mode 100644
index 00000000000..5f4c4daba5e
--- /dev/null
+++ b/test/unit/lib/cli/triage/fixtures/serverless/json/projects/foo/serverless.json
@@ -0,0 +1 @@
+{ "component": "foo" }
diff --git a/test/unit/lib/cli/triage/fixtures/serverless/ts/any/serverless.ts b/test/unit/lib/cli/triage/fixtures/serverless/ts/any/serverless.ts
new file mode 100644
index 00000000000..ee9b714f4db
--- /dev/null
+++ b/test/unit/lib/cli/triage/fixtures/serverless/ts/any/serverless.ts
@@ -0,0 +1,3 @@
+module.exports = {
+  foo: { component: 'foo' },
+};
diff --git a/test/unit/lib/cli/triage/fixtures/serverless/yml/component-in-custom/serverless.yml b/test/unit/lib/cli/triage/fixtures/serverless/yml/component-in-custom/serverless.yml
new file mode 100644
index 00000000000..c3e3f12ab00
--- /dev/null
+++ b/test/unit/lib/cli/triage/fixtures/serverless/yml/component-in-custom/serverless.yml
@@ -0,0 +1,7 @@
+service: foo
+
+provider:
+  name: aws
+
+custom:
+  component: foo
diff --git a/test/unit/lib/cli/triage/fixtures/serverless/yml/projects/bar/serverless.yml b/test/unit/lib/cli/triage/fixtures/serverless/yml/projects/bar/serverless.yml
new file mode 100644
index 00000000000..27b360ba434
--- /dev/null
+++ b/test/unit/lib/cli/triage/fixtures/serverless/yml/projects/bar/serverless.yml
@@ -0,0 +1,3 @@
+service: foo
+provider:
+  name: any
diff --git a/test/unit/lib/cli/triage/fixtures/serverless/yml/projects/foo/serverless.yml b/test/unit/lib/cli/triage/fixtures/serverless/yml/projects/foo/serverless.yml
new file mode 100644
index 00000000000..e3e6ecdf9ed
--- /dev/null
+++ b/test/unit/lib/cli/triage/fixtures/serverless/yml/projects/foo/serverless.yml
@@ -0,0 +1 @@
+component: foo
diff --git a/test/unit/lib/cli/triage/index.test.js b/test/unit/lib/cli/triage/index.test.js
new file mode 100644
index 00000000000..521eb7e7579
--- /dev/null
+++ b/test/unit/lib/cli/triage/index.test.js
@@ -0,0 +1,99 @@
+'use strict';
+
+const { expect } = require('chai');
+const fs = require('fs');
+const overrideCwd = require('process-utils/override-cwd');
+const overrideEnv = require('process-utils/override-env');
+const overrideArgv = require('process-utils/override-argv');
+const path = require('path');
+const triage = require('../../../../../lib/cli/triage');
+
+const fixturesDirname = path.resolve(__dirname, 'fixtures');
+
+describe('test/unit/lib/cli/triage/index.test.js', () => {
+  before(() => overrideEnv({ variables: { SLS_GEO_LOCATION: 'us' } }));
+
+  describe('CLI params', () => {
+    it('should recognize "serverless-tencent" unonditionally when in China and not at service context', async () =>
+      overrideEnv({ variables: { SLS_GEO_LOCATION: 'cn' } }, async () =>
+        overrideArgv({ args: ['sls any'] }, async () => {
+          expect(await triage()).to.equal('serverless-tencent');
+        })
+      ));
+
+    it('should unconditionally favor "serverless" for version check', async () =>
+      overrideEnv(
+        { variables: { SERVERLESS_PLATFORM_VENDOR: 'tencent', SLS_GEO_LOCATION: 'cn' } },
+        async () => {
+          await overrideArgv({ args: ['sls', '-v'] }, async () => {
+            expect(await triage()).to.equal('serverless');
+          });
+          await overrideArgv({ args: ['sls', '--version'] }, async () => {
+            expect(await triage()).to.equal('serverless');
+          });
+        }
+      ));
+
+    it('should favor "serverless" in other cases', async () => {
+      await overrideArgv({ args: ['sls', 'print'] }, async () => {
+        expect(await triage()).to.equal('serverless');
+      });
+      await overrideArgv({ args: ['sls', 'deploy'] }, async () => {
+        expect(await triage()).to.equal('serverless');
+      });
+      await overrideArgv({ args: ['sls'] }, async () => {
+        expect(await triage()).to.equal('serverless');
+      });
+      await overrideArgv({ args: ['sls', '--help'] }, async () => {
+        expect(await triage()).to.equal('serverless');
+      });
+    });
+  });
+
+  describe('Service configuration', () => {
+    let restoreArgv;
+    before(() => {
+      ({ restoreArgv } = overrideArgv({ args: ['sls', 'deploy'] }));
+    });
+    after(() => restoreArgv());
+
+    for (const cliName of ['serverless', '@serverless/cli']) {
+      for (const extension of fs.readdirSync(path.resolve(fixturesDirname, cliName))) {
+        for (const fixtureName of fs.readdirSync(
+          path.resolve(fixturesDirname, cliName, extension)
+        )) {
+          const testName = `should recognize "${cliName}" at "${cliName}/${extension}/${fixtureName}"`;
+          it(testName, async () =>
+            overrideCwd(
+              path.resolve(fixturesDirname, cliName, extension, fixtureName),
+              async () => {
+                expect(await triage()).to.equal(cliName);
+              }
+            )
+          );
+        }
+      }
+    }
+    for (const extension of fs.readdirSync(path.resolve(fixturesDirname, 'platform'))) {
+      for (const fixtureName of fs.readdirSync(
+        path.resolve(fixturesDirname, 'platform', extension)
+      )) {
+        const register = (cliName, geoLocation) => {
+          const testName = `should recognize "${cliName}" at "platform/${extension}/${fixtureName}" for "${geoLocation}" location`;
+          it(testName, async () =>
+            overrideEnv({ variables: { SLS_GEO_LOCATION: geoLocation } }, async () =>
+              overrideCwd(
+                path.resolve(fixturesDirname, 'platform', extension, fixtureName),
+                async () => {
+                  expect(await triage()).to.equal(cliName);
+                }
+              )
+            )
+          );
+        };
+        register('serverless-tencent', 'cn');
+        register('@serverless/components', 'us');
+      }
+    }
+  });
+});
diff --git a/test/unit/lib/configSchema.test.js b/test/unit/lib/config-schema.test.js
similarity index 62%
rename from test/unit/lib/configSchema.test.js
rename to test/unit/lib/config-schema.test.js
index 7fd86a8e065..43b62d71edd 100644
--- a/test/unit/lib/configSchema.test.js
+++ b/test/unit/lib/config-schema.test.js
@@ -3,7 +3,7 @@
 const runServerless = require('../../utils/run-serverless');
 const expect = require('chai').expect;
 
-describe('#configSchema', () => {
+describe('test/unit/lib/configSchema.test.js', () => {
   const cases = [
     {
       isValid: true,
@@ -12,56 +12,26 @@ describe('#configSchema', () => {
     },
     {
       isValid: false,
-      errorMessage: "should have required property 'name'",
+      errorMessage: "must have required property 'name'",
       description: 'service required properties',
       mutation: {
-        service: {},
+        provider: { name: null },
       },
     },
     {
       isValid: false,
-      errorMessage: 'should match pattern "^[a-zA-Z][0-9a-zA-Z-]+$"',
+      errorMessage: 'must match pattern "^[a-zA-Z][0-9a-zA-Z-]+$"',
       description: 'service name in string typed service',
       mutation: {
         service: '1-first-number-is-not-allowed',
       },
     },
-    {
-      isValid: false,
-      errorMessage: 'should match pattern "^[a-zA-Z][0-9a-zA-Z-]+$"',
-      description: 'service name in object typed service',
-      mutation: {
-        service: { name: '1-first-number-is-not-allowed' },
-      },
-    },
-    {
-      isValid: false,
-      errorMessage: 'should match pattern "^arn:aws[a-z-]*:kms',
-      description: 'service awsKmsKeyArn',
-      mutation: {
-        service: {
-          name: 'some-service',
-          awsKmsKeyArn: 'invalidArn',
-        },
-      },
-    },
-    {
-      isValid: true,
-      description: 'service awsKmsKeyArn',
-      mutation: {
-        service: {
-          name: 'some-service',
-          awsKmsKeyArn: 'arn:aws:kms:us-east-1:123456789012:key/some-hash',
-        },
-      },
-    },
     {
       isValid: false,
       errorMessage: 'unrecognized property',
       description: 'service unknown property',
       mutation: {
-        service: {
-          name: 'some-service',
+        provider: {
           unknownProp: 'this is not supported',
         },
       },
@@ -93,7 +63,6 @@ describe('#configSchema', () => {
     },
     {
       isValid: true,
-      logMessage: 'Unrecognized provider',
       description: 'provider not existing name',
       mutation: {
         provider: { name: 'awssss' },
@@ -108,8 +77,7 @@ describe('#configSchema', () => {
           individually: true,
           path: undefined,
           artifact: 'path/to/my-artifact.zip',
-          exclude: ['.git/**', '.travis.yml'],
-          include: ['src/**', 'handler.js'],
+          patterns: ['!.git/**', '!.travis.yml', 'src/**', 'handler.js'],
           excludeDevDependencies: false,
         },
       },
@@ -120,15 +88,14 @@ describe('#configSchema', () => {
     const passOrFail = someCase.isValid ? 'pass' : 'fail';
     it(`should ${passOrFail} validation for ${someCase.description}`, () =>
       runServerless({
-        fixture: 'configSchemaExtensions',
+        fixture: 'config-schema-extensions',
         configExt: someCase.mutation,
         command: 'info',
       }).then(
-        ({ stdoutData }) => {
+        () => {
           if (!someCase.isValid) {
             expect(false).to.be.true;
           }
-          if (someCase.logMessage) expect(stdoutData).to.include(someCase.logMessage);
           return;
         },
         (err) => {
diff --git a/test/unit/lib/configuration/read.test.js b/test/unit/lib/configuration/read.test.js
index 67bfe91d321..2f278383cf6 100644
--- a/test/unit/lib/configuration/read.test.js
+++ b/test/unit/lib/configuration/read.test.js
@@ -5,7 +5,7 @@ chai.use(require('chai-as-promised'));
 
 const { expect } = chai;
 
-const fs = require('fs').promises;
+const fsp = require('fs').promises;
 const fse = require('fs-extra');
 const proxyquire = require('proxyquire');
 const readConfiguration = require('../../../../lib/configuration/read');
@@ -14,13 +14,13 @@ describe('test/unit/lib/configuration/read.test.js', () => {
   let configurationPath;
 
   afterEach(async () => {
-    if (configurationPath) await fs.unlink(configurationPath);
+    if (configurationPath) await fsp.unlink(configurationPath);
     configurationPath = null;
   });
 
   it('should read "serverless.yml"', async () => {
     configurationPath = 'serverless.yml';
-    await fs.writeFile(configurationPath, 'service: test-yml\nprovider:\n  name: aws\n');
+    await fsp.writeFile(configurationPath, 'service: test-yml\nprovider:\n  name: aws\n');
     expect(await readConfiguration(configurationPath)).to.deep.equal({
       service: 'test-yml',
       provider: { name: 'aws' },
@@ -29,7 +29,7 @@ describe('test/unit/lib/configuration/read.test.js', () => {
 
   it('should read "serverless.yaml"', async () => {
     configurationPath = 'serverless.yaml';
-    await fs.writeFile(configurationPath, 'service: test-yaml\nprovider:\n  name: aws\n');
+    await fsp.writeFile(configurationPath, 'service: test-yaml\nprovider:\n  name: aws\n');
     expect(await readConfiguration(configurationPath)).to.deep.equal({
       service: 'test-yaml',
       provider: { name: 'aws' },
@@ -38,7 +38,7 @@ describe('test/unit/lib/configuration/read.test.js', () => {
 
   it('should support AWS CloudFormation shortcut syntax', async () => {
     configurationPath = 'serverless.yml';
-    await fs.writeFile(
+    await fsp.writeFile(
       configurationPath,
       'service: test-cf-shortcut\nprovider:\n  name: aws\n  cfProperty: !GetAtt MyResource.Arn'
     );
@@ -54,7 +54,7 @@ describe('test/unit/lib/configuration/read.test.js', () => {
       service: 'test-json',
       provider: { name: 'aws' },
     };
-    await fs.writeFile(configurationPath, JSON.stringify(configuration));
+    await fsp.writeFile(configurationPath, JSON.stringify(configuration));
     expect(await readConfiguration(configurationPath)).to.deep.equal(configuration);
   });
 
@@ -64,20 +64,20 @@ describe('test/unit/lib/configuration/read.test.js', () => {
       service: 'test-js',
       provider: { name: 'aws' },
     };
-    await fs.writeFile(configurationPath, `module.exports = ${JSON.stringify(configuration)}`);
+    await fsp.writeFile(configurationPath, `module.exports = ${JSON.stringify(configuration)}`);
     expect(await readConfiguration(configurationPath)).to.deep.equal(configuration);
   });
 
   it('should read "serverless.ts"', async () => {
     await fse.ensureDir('node_modules');
     try {
-      await fse.writeFile('node_modules/ts-node.js', 'module.exports.register = () => null;');
+      await fsp.writeFile('node_modules/ts-node.js', 'module.exports.register = () => null;');
       configurationPath = 'serverless.ts';
       const configuration = {
         service: 'test-ts',
         provider: { name: 'aws' },
       };
-      await fs.writeFile(configurationPath, `module.exports = ${JSON.stringify(configuration)}`);
+      await fsp.writeFile(configurationPath, `module.exports = ${JSON.stringify(configuration)}`);
       expect(await readConfiguration(configurationPath)).to.deep.equal(configuration);
     } finally {
       await fse.remove('node_modules');
@@ -93,7 +93,7 @@ describe('test/unit/lib/configuration/read.test.js', () => {
         service: 'test-ts',
         provider: { name: 'aws' },
       };
-      await fs.writeFile(configurationPath, `module.exports = ${JSON.stringify(configuration)}`);
+      await fsp.writeFile(configurationPath, `module.exports = ${JSON.stringify(configuration)}`);
       expect(await readConfiguration(configurationPath)).to.deep.equal(configuration);
     } finally {
       delete process[Symbol.for('ts-node.register.instance')];
@@ -108,7 +108,7 @@ describe('test/unit/lib/configuration/read.test.js', () => {
       service: 'test-deferred',
       provider: { name: 'aws' },
     };
-    await fs.writeFile(
+    await fsp.writeFile(
       configurationPath,
       `module.exports = Promise.resolve(${JSON.stringify(configuration)})`
     );
@@ -134,7 +134,7 @@ describe('test/unit/lib/configuration/read.test.js', () => {
 
   it('should reject YAML syntax error', async () => {
     configurationPath = 'serverless.yaml';
-    await fs.writeFile(configurationPath, 'service: test-yaml\np [\nr\novider:\n  name: aws\n');
+    await fsp.writeFile(configurationPath, 'service: test-yaml\np [\nr\novider:\n  name: aws\n');
     await expect(readConfiguration(configurationPath)).to.eventually.be.rejected.and.have.property(
       'code',
       'CONFIGURATION_PARSE_ERROR'
@@ -143,7 +143,7 @@ describe('test/unit/lib/configuration/read.test.js', () => {
 
   it('should reject JSON syntax error', async () => {
     configurationPath = 'serverless.json';
-    await fs.writeFile(configurationPath, '{foom,sdfs}');
+    await fsp.writeFile(configurationPath, '{foom,sdfs}');
     await expect(readConfiguration(configurationPath)).to.eventually.be.rejected.and.have.property(
       'code',
       'CONFIGURATION_PARSE_ERROR'
@@ -152,7 +152,7 @@ describe('test/unit/lib/configuration/read.test.js', () => {
 
   it('should reject JS intialization error', async () => {
     configurationPath = 'serverless-errored.js';
-    await fs.writeFile(configurationPath, 'throw new Error("Stop!")');
+    await fsp.writeFile(configurationPath, 'throw new Error("Stop!")');
     await expect(readConfiguration(configurationPath)).to.eventually.be.rejected.and.have.property(
       'code',
       'CONFIGURATION_INITIALIZATION_ERROR'
@@ -160,12 +160,14 @@ describe('test/unit/lib/configuration/read.test.js', () => {
   });
 
   it('should reject TS configuration if "ts-node" is not found', async () => {
-    configurationPath = 'serverless-errored.ts';
+    // Test against different service dir, to not fall into cached `require.resolve` value
+    configurationPath = 'other/serverless-errored.ts';
     const configuration = {
       service: 'test-ts',
       provider: { name: 'aws' },
     };
-    await fs.writeFile(configurationPath, `module.exports = ${JSON.stringify(configuration)}`);
+    await fse.ensureFile(configurationPath);
+    await fsp.writeFile(configurationPath, `module.exports = ${JSON.stringify(configuration)}`);
     await expect(
       proxyquire('../../../../lib/configuration/read', {
         'child-process-ext/spawn': async () => {
@@ -177,7 +179,7 @@ describe('test/unit/lib/configuration/read.test.js', () => {
 
   it('should reject non object configuration', async () => {
     configurationPath = 'serverless.json';
-    await fs.writeFile(configurationPath, JSON.stringify([]));
+    await fsp.writeFile(configurationPath, JSON.stringify([]));
     await expect(readConfiguration(configurationPath)).to.eventually.be.rejected.and.have.property(
       'code',
       'INVALID_CONFIGURATION_EXPORT'
@@ -185,7 +187,7 @@ describe('test/unit/lib/configuration/read.test.js', () => {
   });
   it('should reject non JSON like structures', async () => {
     configurationPath = 'serverless-custom.js';
-    await fs.writeFile(configurationPath, 'exports.foo = exports');
+    await fsp.writeFile(configurationPath, 'exports.foo = exports');
     await expect(readConfiguration(configurationPath)).to.eventually.be.rejected.and.have.property(
       'code',
       'INVALID_CONFIGURATION_STRUCTURE'
diff --git a/test/unit/lib/configuration/resolve-provider-name.test.js b/test/unit/lib/configuration/resolve-provider-name.test.js
index ee24c19e8a2..10288b07310 100644
--- a/test/unit/lib/configuration/resolve-provider-name.test.js
+++ b/test/unit/lib/configuration/resolve-provider-name.test.js
@@ -3,8 +3,9 @@
 const { expect } = require('chai');
 
 const resolveProviderName = require('../../../../lib/configuration/resolve-provider-name');
+const ServerlessError = require('../../../../lib/serverless-error');
 
-describe('test/unit/lib/configuration/resolve-provider.name.test.js', () => {
+describe('test/unit/lib/configuration/resolve-provider-name.test.js', () => {
   it('should read name from "provider"', () => {
     expect(resolveProviderName({ provider: 'foo' })).to.equal('foo');
   });
@@ -12,14 +13,18 @@ describe('test/unit/lib/configuration/resolve-provider.name.test.js', () => {
     expect(resolveProviderName({ provider: { name: 'foo' } })).to.equal('foo');
   });
   it('should reject missing "provider.name"', () => {
-    expect(() => resolveProviderName({ provider: {} })).to.throw('Invalid service configuration');
+    expect(() => resolveProviderName({ provider: {} }))
+      .to.throw(ServerlessError)
+      .with.property('code', 'INVALID_CONFIGURATION_PROVIDER_NAME_MISSING');
   });
   it('should reject invalid "provider.name"', () => {
-    expect(() => resolveProviderName({ provider: { name: {} } })).to.throw(
-      'Invalid service configuration'
-    );
+    expect(() => resolveProviderName({ provider: { name: {} } }))
+      .to.throw(ServerlessError)
+      .with.property('code', 'INVALID_CONFIGURATION_PROVIDER_NAME_MISSING');
   });
   it('should reject missing "provider"', () => {
-    expect(() => resolveProviderName({})).to.throw('Invalid service configuration');
+    expect(() => resolveProviderName({}))
+      .to.throw(ServerlessError)
+      .with.property('code', 'INVALID_CONFIGURATION_PROVIDER_NAME_MISSING');
   });
 });
diff --git a/test/unit/lib/configuration/variables/eventually-report-resolution-errors.test.js b/test/unit/lib/configuration/variables/eventually-report-resolution-errors.test.js
index 3a3020ba069..101fd5fb3d6 100644
--- a/test/unit/lib/configuration/variables/eventually-report-resolution-errors.test.js
+++ b/test/unit/lib/configuration/variables/eventually-report-resolution-errors.test.js
@@ -3,7 +3,6 @@
 const { expect } = require('chai');
 
 const overrideArgv = require('process-utils/override-argv');
-const overrideStdoutWrite = require('process-utils/override-stdout-write');
 const ServerlessError = require('../../../../../lib/serverless-error');
 const resolveCliInput = require('../../../../../lib/cli/resolve-input');
 const resolveMeta = require('../../../../../lib/configuration/variables/resolve-meta');
@@ -23,42 +22,9 @@ describe('test/unit/lib/configuration/variables/eventually-report-resolution-err
   });
 
   describe('On errors', () => {
-    it('should log errors with help command', () => {
+    it('should throw error in regular circumstances', () => {
       const configuration = { foo: '${foo:raz' };
       const variablesMeta = resolveMeta(configuration);
-      let stdoutData = '';
-      overrideArgv({ args: ['serverless', '--help'] }, () =>
-        overrideStdoutWrite(
-          (data) => (stdoutData += data),
-          () =>
-            expect(
-              eventuallyReportResolutionErrors(process.cwd(), configuration, variablesMeta)
-            ).to.equal(true)
-        )
-      );
-
-      expect(stdoutData).to.include('Resolution of service configuration failed');
-    });
-
-    it('should log deprecation with no "variablesResolutionMode" set', () => {
-      const configuration = { foo: '${foo:raz' };
-      const variablesMeta = resolveMeta(configuration);
-      let stdoutData = '';
-      overrideArgv({ args: ['serverless', 'foo'] }, () =>
-        overrideStdoutWrite(
-          (data) => (stdoutData += data),
-          () =>
-            expect(
-              eventuallyReportResolutionErrors(process.cwd(), configuration, variablesMeta)
-            ).to.equal(true)
-        )
-      );
-
-      expect(stdoutData).to.include('NEW_VARIABLES_RESOLVER');
-    });
-    it('should throw with no "variablesResolutionMode" set', () => {
-      const configuration = { foo: '${foo:raz', variablesResolutionMode: 20210326 };
-      const variablesMeta = resolveMeta(configuration);
       overrideArgv({ args: ['serverless', 'foo'] }, () =>
         expect(() => eventuallyReportResolutionErrors(process.cwd(), configuration, variablesMeta))
           .to.throw(ServerlessError)
diff --git a/test/unit/lib/configuration/variables/index.test.js b/test/unit/lib/configuration/variables/index.test.js
index 7a74e691864..1afa1ad1661 100644
--- a/test/unit/lib/configuration/variables/index.test.js
+++ b/test/unit/lib/configuration/variables/index.test.js
@@ -2,14 +2,14 @@
 
 const { expect } = require('chai');
 
-const fs = require('fs').promises;
+const fsp = require('fs').promises;
 const resolve = require('../../../../../lib/configuration/variables');
 
 describe('test/unit/lib/configuration/variables/index.test.js', () => {
   let configuration;
   before(async () => {
     process.env.ENV_SOURCE_TEST = 'foobar';
-    await fs.writeFile('foo.json', JSON.stringify({ json: 'content' }));
+    await fsp.writeFile('foo.json', JSON.stringify({ json: 'content' }));
     configuration = {
       env: '${env:ENV_SOURCE_TEST}',
       file: '${file(foo.json)}',
diff --git a/test/unit/lib/configuration/variables/parse.test.js b/test/unit/lib/configuration/variables/parse.test.js
index 53bd00d7221..0cdd8ceb809 100644
--- a/test/unit/lib/configuration/variables/parse.test.js
+++ b/test/unit/lib/configuration/variables/parse.test.js
@@ -32,6 +32,12 @@ describe('test/unit/lib/configuration/variables/parse.test.js', () => {
         { sources: [{ type: 'type', address: { value: 'address' } }] },
       ]));
 
+    // ${type:address:with:colons}
+    it('should support type and address with colons', () =>
+      expect(parse('${type:address:with:colons}')).to.deep.equal([
+        { sources: [{ type: 'type', address: { value: 'address:with:colons' } }] },
+      ]));
+
     // ${type(param)}
     it('should support param', () =>
       expect(parse('${type(param)}')).to.deep.equal([
@@ -394,12 +400,6 @@ describe('test/unit/lib/configuration/variables/parse.test.js', () => {
         .to.throw(ServerlessError)
         .with.property('code', 'INVALID_VARIABLE_TYPE'));
 
-    // ${type:foo:bar}
-    it('should reject ":" strings in address literal', () =>
-      expect(() => parse('${type:foo:bar}'))
-        .to.throw(ServerlessError)
-        .with.property('code', 'INVALID_VARIABLE_ADDRESS'));
-
     // ${type:address
     it('should detect not closed variable', () => {
       expect(() => parse('${type:address'))
@@ -543,8 +543,8 @@ describe('test/unit/lib/configuration/variables/parse.test.js', () => {
       expect(parse('e\\${s:}n\\$${s:}qe\\\\\\${s:}qn\\\\${s:}')).to.deep.equal([
         {
           start: 1,
-          end: 2,
-          value: '',
+          end: 3,
+          value: '$',
         },
         {
           start: 10,
@@ -553,8 +553,8 @@ describe('test/unit/lib/configuration/variables/parse.test.js', () => {
         },
         {
           start: 17,
-          end: 20,
-          value: '\\',
+          end: 21,
+          value: '\\$',
         },
         {
           start: 27,
diff --git a/test/unit/lib/configuration/variables/resolve-unresolved-source-types.test.js b/test/unit/lib/configuration/variables/resolve-unresolved-source-types.test.js
index ab694ea8d64..83318f32055 100644
--- a/test/unit/lib/configuration/variables/resolve-unresolved-source-types.test.js
+++ b/test/unit/lib/configuration/variables/resolve-unresolved-source-types.test.js
@@ -3,44 +3,79 @@
 const { expect } = require('chai');
 
 const resolveMeta = require('../../../../../lib/configuration/variables/resolve-meta');
+const resolve = require('../../../../../lib/configuration/variables/resolve');
 const resolveUnresolvedSourceTypes = require('../../../../../lib/configuration/variables/resolve-unresolved-source-types');
 
 describe('test/unit/lib/configuration/variables/resolve-unresolved-source-types.test.js', () => {
   const configuration = {
-    foo: {
-      params: '${sourceParam(param1, param2)}',
-      varParam: '${sourceParam(${sourceDirect:})}',
+    resolved: 'foo${recognized:}',
+    unrecognized: 'foo${unrecognized:}',
+    unrecognizedInParens: 'foo${recognized(${unrecognized:}, ${unrecognized2:})}',
+    unrecognizedInAddress: 'foo${recognized:${unrecognized:}}',
+    unrecognizedInParensAndAddress:
+      'foo${recognized(${unrecognized:}, ${unrecognized2:}):${unrecognized3:}}',
+    unrecognizedFallback: 'foo${recognized:, unrecognized:}',
+    otherUnrecognizedFallback: 'foo${unrecognized:, unrecognized4:}',
+    deep: {
+      resolved: 'foo${recognized:}',
+      unrecognized: 'foo${unrecognized:}',
+      unrecognizedInParens: 'foo${recognized(${unrecognized:}, ${unrecognized2:})}',
+      unrecognizedInAddress: 'foo${recognized:${unrecognized:}}',
+      unrecognizedInParensAndAddress:
+        'foo${recognized(${unrecognized:}, ${unrecognized2:}):${unrecognized3:}}',
+      unrecognizedFallback: 'foo${recognized:, unrecognized:}',
+      otherUnrecognizedFallback: 'foo${unrecognized:, unrecognized4:}',
     },
-    static: true,
-    address: 'foo${sourceAddress:address-result}',
-    varAddress: 'foo${sourceAddress:${sourceDirect:}}',
+  };
 
-    nonStringStringPart: 'elo${sourceMissing:, null}',
-    notExistingProperty: "${sourceProperty(not, existing), 'notExistingFallback'}",
-    nestUnrecognized: {
-      unrecognized:
-        '${sourceDirect:}|${sourceUnrecognized:}|${sourceDirect(${sourceUnrecognized:})}' +
-        '${sourceDirect:${sourceUnrecognized:}}',
+  const sources = {
+    recognized: {
+      resolve: () => ({ value: 234 }),
     },
   };
   let resultMap;
 
   before(async () => {
-    resultMap = resolveUnresolvedSourceTypes(resolveMeta(configuration));
+    const variablesMeta = resolveMeta(configuration);
+    await resolve({
+      serviceDir: process.cwd(),
+      configuration,
+      variablesMeta,
+      sources,
+      options: {},
+      fulfilledSources: new Set('recognized'),
+    });
+
+    resultMap = resolveUnresolvedSourceTypes(variablesMeta);
   });
 
   it('should resolve all not resolved sources', () => {
     expect(resultMap).to.deep.equal(
       new Map([
-        ['sourceParam', new Set(['foo\0params', 'foo\0varParam'])],
         [
-          'sourceDirect',
-          new Set(['foo\0varParam', 'varAddress', 'nestUnrecognized\0unrecognized']),
+          'unrecognized',
+          new Set([
+            'unrecognized',
+            'unrecognizedInParens',
+            'unrecognizedInAddress',
+            'unrecognizedInParensAndAddress',
+            'otherUnrecognizedFallback',
+            'deep\0unrecognized',
+            'deep\0unrecognizedInParens',
+            'deep\0unrecognizedInAddress',
+            'deep\0unrecognizedInParensAndAddress',
+            'deep\0otherUnrecognizedFallback',
+          ]),
+        ],
+        [
+          'unrecognized2',
+          new Set([
+            'unrecognizedInParens',
+            'unrecognizedInParensAndAddress',
+            'deep\0unrecognizedInParens',
+            'deep\0unrecognizedInParensAndAddress',
+          ]),
         ],
-        ['sourceAddress', new Set(['address', 'varAddress'])],
-        ['sourceMissing', new Set(['nonStringStringPart'])],
-        ['sourceProperty', new Set(['notExistingProperty'])],
-        ['sourceUnrecognized', new Set(['nestUnrecognized\0unrecognized'])],
       ])
     );
   });
diff --git a/test/unit/lib/configuration/variables/resolve.test.js b/test/unit/lib/configuration/variables/resolve.test.js
index ca492efc2cc..e16239204e6 100644
--- a/test/unit/lib/configuration/variables/resolve.test.js
+++ b/test/unit/lib/configuration/variables/resolve.test.js
@@ -34,10 +34,23 @@ describe('test/unit/lib/configuration/variables/resolve.test.js', () => {
       propertyDeepCircularC: '${sourceProperty(propertyDeepCircularA)}',
       propertyRoot: '${sourceProperty:}',
       withString: 'foo${sourceDirect:}',
-      resolvesVariablesObject: '${sourceVariables(object)}',
-      resolvesVariablesArray: '${sourceVariables(array)}',
-      resolvesVariablesString: '${sourceVariables(string)}',
-      resolvesVariablesStringInvalid: '${sourceVariables(stringInvalid)}',
+      resolvesResultVariablesObject: '${sourceResultVariables(object)}',
+      resolvesResultVariablesArray: '${sourceResultVariables(array)}',
+      resolvesResultVariablesString: '${sourceResultVariables(string)}',
+      resolvesResultVariablesStringInvalid: '${sourceResultVariables(stringInvalid)}',
+      resolveDeepVariablesConcat:
+        '${sourceResultVariables(string)}foo${sourceResultVariables(string)}',
+      resolveDeepVariablesConcatInParam:
+        '${sourceParam(${sourceResultVariables(string)}foo${sourceResultVariables(string)})}',
+      resolveDeepVariablesConcatInAddress:
+        '${sourceAddress:${sourceResultVariables(string)}foo${sourceResultVariables(string)}}',
+      infiniteDeepVariablesConcat:
+        '${sourceAddress:${sourceInfiniteString:}foo${sourceResultVariables(string)}}',
+      resolveVariablesInString: "${sourceResolveVariablesInString('${sourceProperty(foo)}')}",
+      resolvesVariables: '${sourceResolveVariable("sourceParam(${sourceDirect:})")}',
+      resolvesVariablesFallback: '${sourceResolveVariable("sourceMissing:, null"), null}',
+      resolvesVariablesInvalid1: '${sourceResolveVariable("sourceDirect(")}',
+      resolvesVariablesInvalid2: '${sourceResolveVariable("sourceDirect")}',
       incomplete: '${sourceDirect:}elo${sourceIncomplete:}',
       missing: '${sourceDirect:}elo${sourceMissing:}other${sourceMissing:}',
       missingFallback: '${sourceDirect:}elo${sourceMissing:, "foo"}',
@@ -69,10 +82,12 @@ describe('test/unit/lib/configuration/variables/resolve.test.js', () => {
     let variablesMeta;
     const sources = {
       sourceParam: {
-        resolve: ({ params }) => ({ value: params.join('|') }),
+        resolve: ({ params }) => ({ value: params.join('|').split('').reverse().join('') }),
       },
       sourceAddress: {
-        resolve: ({ address }) => ({ value: address }),
+        resolve: ({ address }) => ({
+          value: typeof address === 'string' ? address.split('').reverse().join('') : address,
+        }),
       },
       sourceDirect: {
         resolve: () => ({ value: 234 }),
@@ -83,7 +98,17 @@ describe('test/unit/lib/configuration/variables/resolve.test.js', () => {
           return { value: result == null ? null : result };
         },
       },
-      sourceVariables: {
+      sourceResolveVariable: {
+        resolve: async ({ params, resolveVariable }) => {
+          return { value: await resolveVariable(params[0]) };
+        },
+      },
+      sourceResolveVariablesInString: {
+        resolve: async ({ params, resolveVariablesInString }) => {
+          return { value: await resolveVariablesInString(params[0]) };
+        },
+      },
+      sourceResultVariables: {
         resolve: ({ params: [type] }) => {
           switch (type) {
             case 'object':
@@ -137,6 +162,9 @@ describe('test/unit/lib/configuration/variables/resolve.test.js', () => {
       sourceInfinite: {
         resolve: () => ({ value: { nest: '${sourceInfinite:}' } }),
       },
+      sourceInfiniteString: {
+        resolve: () => ({ value: '${sourceInfiniteString:}' }),
+      },
       sourceShared: {
         resolve: () => ({
           value: {
@@ -154,6 +182,9 @@ describe('test/unit/lib/configuration/variables/resolve.test.js', () => {
         }),
       },
     };
+
+    const variableSourcesInConfig = new Set();
+
     before(async () => {
       variablesMeta = resolveMeta(configuration);
       await resolve({
@@ -163,6 +194,7 @@ describe('test/unit/lib/configuration/variables/resolve.test.js', () => {
         sources,
         options: {},
         fulfilledSources: new Set(),
+        variableSourcesInConfig,
       });
     });
 
@@ -175,15 +207,15 @@ describe('test/unit/lib/configuration/variables/resolve.test.js', () => {
     });
 
     it('should pass params to source resolvers', () => {
-      expect(configuration.foo.params).to.equal('param1|param2');
+      expect(configuration.foo.params).to.equal('2marap|1marap');
     });
 
     it('should pass address to source resolvers', () => {
-      expect(configuration.address).to.equal('fooaddress-result');
+      expect(configuration.address).to.equal('footluser-sserdda');
     });
 
     it('should resolve variables in params', () => {
-      expect(configuration.foo.varParam).to.equal('234');
+      expect(configuration.foo.varParam).to.equal('432');
     });
 
     it('should resolve variables in address', () => {
@@ -195,14 +227,14 @@ describe('test/unit/lib/configuration/variables/resolve.test.js', () => {
       expect(configuration.otherProperty).to.equal('foo234');
       expect(configuration.static).to.equal(true);
       expect(configuration.deepProperty).to.deep.equal({
-        params: 'param1|param2',
-        varParam: '234',
+        params: '2marap|1marap',
+        varParam: '432',
       });
     });
 
     it('should clear escapes', () => {
       expect(configuration.escape).to.equal(
-        'e${sourceDirect:}n\\$fooaddress-resultqe\\${sourceProperty(direct)}qn\\fooaddress-result'
+        'e${sourceDirect:}n\\$footluser-sserddaqe\\${sourceProperty(direct)}qn\\footluser-sserdda'
       );
     });
 
@@ -229,9 +261,22 @@ describe('test/unit/lib/configuration/variables/resolve.test.js', () => {
     });
 
     it('should resolve variables in returned results', () => {
-      expect(configuration.resolvesVariablesObject).to.deep.equal({ foo: 234 });
-      expect(configuration.resolvesVariablesArray).to.deep.equal([1, 234]);
-      expect(configuration.resolvesVariablesString).to.equal(234);
+      expect(configuration.resolvesResultVariablesObject).to.deep.equal({ foo: 234 });
+      expect(configuration.resolvesResultVariablesArray).to.deep.equal([1, 234]);
+      expect(configuration.resolvesResultVariablesString).to.equal(234);
+    });
+
+    it('should resolve variables in resolved strings which are subject to concatenation', () => {
+      expect(configuration.resolveDeepVariablesConcat).to.equal('234foo234');
+      expect(configuration.resolveDeepVariablesConcatInParam).to.equal('432oof432');
+      expect(configuration.resolveDeepVariablesConcatInAddress).to.equal('432oof432');
+    });
+
+    it('should provide working resolveVariablesInString util', () => {
+      expect(configuration.resolveVariablesInString).to.deep.equal({
+        params: '2marap|1marap',
+        varParam: '432',
+      });
     });
 
     // https://github.com/serverless/serverless/issues/9016
@@ -310,6 +355,12 @@ describe('test/unit/lib/configuration/variables/resolve.test.js', () => {
       expect(valueMeta.error.code).to.equal('VARIABLE_RESOLUTION_ERROR');
     });
 
+    it('should error on infinite variables resolution recursion', () => {
+      const valueMeta = variablesMeta.get('infiniteDeepVariablesConcat');
+      expect(valueMeta).to.not.have.property('variables');
+      expect(valueMeta.error.code).to.equal('EXCESSIVE_RESOLVED_VARIABLES_NEST_DEPTH');
+    });
+
     it('should mark deep circular dependency among properties with error', () => {
       const valueMeta = variablesMeta.get('propertyDeepCircularA');
       expect(valueMeta).to.not.have.property('variables');
@@ -340,7 +391,7 @@ describe('test/unit/lib/configuration/variables/resolve.test.js', () => {
     });
 
     it('should error on invalid variable notation in returned result', () => {
-      const valueMeta = variablesMeta.get('resolvesVariablesStringInvalid');
+      const valueMeta = variablesMeta.get('resolvesResultVariablesStringInvalid');
       expect(valueMeta).to.not.have.property('variables');
       expect(valueMeta.error.code).to.equal('UNTERMINATED_VARIABLE');
     });
@@ -375,7 +426,10 @@ describe('test/unit/lib/configuration/variables/resolve.test.js', () => {
         'propertyDeepCircularB',
         'propertyDeepCircularC',
         'propertyRoot',
-        'resolvesVariablesStringInvalid',
+        'resolvesResultVariablesStringInvalid',
+        'infiniteDeepVariablesConcat',
+        'resolvesVariablesInvalid1',
+        'resolvesVariablesInvalid2',
         'missing',
         'nonStringStringPart',
         'nestUnrecognized\0unrecognized',
@@ -391,6 +445,45 @@ describe('test/unit/lib/configuration/variables/resolve.test.js', () => {
         `infiniteResolutionRecursion${'\0nest'.repeat(10)}`,
       ]);
     });
+
+    it('should correctly record encountered variable sources', () => {
+      expect(Array.from(variableSourcesInConfig)).to.deep.equal([
+        'sourceParam',
+        'sourceDirect',
+        'sourceAddress',
+        'sourceProperty',
+        'sourceResultVariables',
+        'sourceInfiniteString',
+        'sourceResolveVariablesInString',
+        'sourceResolveVariable',
+        'sourceIncomplete',
+        'sourceMissing',
+        'sourceUnrecognized',
+        'sourceError',
+        'sourceInfinite',
+        'sourceShared',
+        'sourceSharedProperty',
+      ]);
+    });
+
+    describe('"resolveVariable" source util', () => {
+      it('should resolve variable', () => {
+        expect(configuration.resolvesVariables).to.equal('432');
+      });
+      it('should support multiple sources', () => {
+        expect(configuration.resolvesVariablesFallback).to.equal(null);
+      });
+
+      it('should error on invalid input', () => {
+        let valueMeta = variablesMeta.get('resolvesVariablesInvalid1');
+        expect(valueMeta).to.not.have.property('variables');
+        expect(valueMeta.error.code).to.equal('VARIABLE_RESOLUTION_ERROR');
+
+        valueMeta = variablesMeta.get('resolvesVariablesInvalid2');
+        expect(valueMeta).to.not.have.property('variables');
+        expect(valueMeta.error.code).to.equal('VARIABLE_RESOLUTION_ERROR');
+      });
+    });
   });
 
   describe('Partial resolution', () => {
diff --git a/test/unit/lib/configuration/variables/sources/file.test.js b/test/unit/lib/configuration/variables/sources/file.test.js
index d568a39be49..c911f5ff9fe 100644
--- a/test/unit/lib/configuration/variables/sources/file.test.js
+++ b/test/unit/lib/configuration/variables/sources/file.test.js
@@ -18,11 +18,17 @@ describe('test/unit/lib/configuration/variables/sources/file.test.js', () => {
       json: '${file(file.json)}',
       tfstate: '${file(file.tfstate)}',
       js: '${file(file.js)}',
-      variablesResolutionMode: '20210326',
       jsFunction: '${file(file-function.js)}',
       jsPropertyFunction: '${file(file-property-function.js):property}',
       jsPropertyFunctionProperty: '${file(file-property-function.js):property.result}',
       addressSupport: '${file(file.json):result}',
+      jsFunctionResolveVariable: '${file(file-function-variable.js)}',
+      jsFunctionResolveVariableMissingSource: '${file(file-function-variable-missing-source.js)}',
+      jsFunctionResolveManyVariables: '${file(file-function-many-variables.js)}',
+      jsPropertyFunctionResolveVariable: '${file(file-property-function-variable.js):property}',
+      jsPropertyFunctionResolveVariableMissingSource:
+        '${file(file-property-function-variable-missing-source.js):property}',
+      nestedVariablesAddressResolution: '${file(file-variables-nest-1.yaml):n1.n2.n3}',
       nonExistingYaml: '${file(not-existing.yaml), null}',
       nonExistingJson: '${file(not-existing.json), null}',
       nonExistingJs: '${file(not-existing.js), null}',
@@ -43,7 +49,6 @@ describe('test/unit/lib/configuration/variables/sources/file.test.js', () => {
       notFile: '${file(dir.yaml)}',
       noParams: '${file:}',
       noParams2: '${file():}',
-      external: '${file(../file.test.js)}',
       invalidYaml: '${file(invalid.yml)}',
       invalidJson: '${file(invalid.json)}',
       invalidJs: '${file(invalid.js)}',
@@ -89,6 +94,21 @@ describe('test/unit/lib/configuration/variables/sources/file.test.js', () => {
   it('should support "address" argument', () =>
     expect(configuration.addressSupport).to.equal('json'));
 
+  it('should support internal variable resolution', () => {
+    expect(configuration.jsFunctionResolveVariable).to.deep.equal({
+      varResult: { result: 'yaml' },
+    });
+    expect(configuration.jsPropertyFunctionResolveVariable).to.deep.equal({
+      varResult: { result: 'json' },
+    });
+    expect(configuration.jsFunctionResolveManyVariables).to.deep.equal({
+      varResult: { result: ['yml', 'yml', 'yml', 'yml', 'yml', 'yml', 'yml', 'yml', 'yml', 'yml'] },
+    });
+  });
+
+  it('should resolve variables across address resolution', () => {
+    expect(configuration.nestedVariablesAddressResolution).to.deep.equal('result');
+  });
   it('should uncoditionally split "address" property keys by "."', () =>
     expect(configuration.ambiguousAddress).to.equal('object'));
 
@@ -160,9 +180,6 @@ describe('test/unit/lib/configuration/variables/sources/file.test.js', () => {
     expect(variablesMeta.get('noParams2').error.code).to.equal('VARIABLE_RESOLUTION_ERROR');
   });
 
-  it('should report with an error attempt to access external path', () =>
-    expect(variablesMeta.get('external').error.code).to.equal('VARIABLE_RESOLUTION_ERROR'));
-
   it('should report with an error an invalid YAML file', () =>
     expect(variablesMeta.get('invalidYaml').error.code).to.equal('VARIABLE_RESOLUTION_ERROR'));
 
@@ -174,23 +191,29 @@ describe('test/unit/lib/configuration/variables/sources/file.test.js', () => {
     expect(variablesMeta.get('invalidJs2').error.code).to.equal('VARIABLE_RESOLUTION_ERROR');
   });
 
-  it('should not support function resolvers in "js" file sources not confirmed to work with new resolver', async () => {
+  it('should report with an error if JS function attempts to resolve missing source', () =>
+    expect(variablesMeta.get('jsFunctionResolveVariableMissingSource').error.code).to.equal(
+      'MISSING_VARIABLE_RESULT'
+    ));
+
+  it('should report with an error if JS function property attempts to resolve missing source', () =>
+    expect(variablesMeta.get('jsPropertyFunctionResolveVariableMissingSource').error.code).to.equal(
+      'MISSING_VARIABLE_RESULT'
+    ));
+
+  it('should support reaching out beyond service directory', async () => {
     configuration = {
-      jsFunction: '${file(file-function.js)}',
-      jsPropertyFunction: '${file(file-property-function.js):property}',
+      yml: '${file(../file.yml)}',
     };
     variablesMeta = resolveMeta(configuration);
     await resolve({
-      serviceDir,
+      serviceDir: path.resolve(serviceDir, 'foo'),
       configuration,
       variablesMeta,
       sources: { file: fileSource },
       options: {},
       fulfilledSources: new Set(['file']),
     });
-    expect(variablesMeta.get('jsFunction').error.code).to.equal('VARIABLE_RESOLUTION_ERROR');
-    expect(variablesMeta.get('jsPropertyFunction').error.code).to.equal(
-      'VARIABLE_RESOLUTION_ERROR'
-    );
+    expect(configuration.yml).to.deep.equal({ result: 'yml' });
   });
 });
diff --git a/test/unit/lib/configuration/variables/sources/fixture/file-function-many-variables.js b/test/unit/lib/configuration/variables/sources/fixture/file-function-many-variables.js
new file mode 100644
index 00000000000..9bc3345e994
--- /dev/null
+++ b/test/unit/lib/configuration/variables/sources/fixture/file-function-many-variables.js
@@ -0,0 +1,5 @@
+'use strict';
+
+module.exports = async ({ resolveVariable }) => ({
+  varResult: await resolveVariable('file(file-function-many-variables.yaml)'),
+});
diff --git a/test/unit/lib/configuration/variables/sources/fixture/file-function-many-variables.yaml b/test/unit/lib/configuration/variables/sources/fixture/file-function-many-variables.yaml
new file mode 100644
index 00000000000..025a204d325
--- /dev/null
+++ b/test/unit/lib/configuration/variables/sources/fixture/file-function-many-variables.yaml
@@ -0,0 +1,12 @@
+# The resolve nest depth is 10, so we have to resolve at least 10 files to ensure it's not being hit.
+result:
+  - ${file(./file.yml):result}
+  - ${file(./file.yml):result}
+  - ${file(./file.yml):result}
+  - ${file(./file.yml):result}
+  - ${file(./file.yml):result}
+  - ${file(./file.yml):result}
+  - ${file(./file.yml):result}
+  - ${file(./file.yml):result}
+  - ${file(./file.yml):result}
+  - ${file(./file.yml):result}
diff --git a/test/unit/lib/configuration/variables/sources/fixture/file-function-variable-missing-source.js b/test/unit/lib/configuration/variables/sources/fixture/file-function-variable-missing-source.js
new file mode 100644
index 00000000000..9a1cfc185ac
--- /dev/null
+++ b/test/unit/lib/configuration/variables/sources/fixture/file-function-variable-missing-source.js
@@ -0,0 +1,5 @@
+'use strict';
+
+module.exports = async ({ resolveVariable }) => ({
+  varResult: await resolveVariable('file(missing.yaml)'),
+});
diff --git a/test/unit/lib/configuration/variables/sources/fixture/file-function-variable.js b/test/unit/lib/configuration/variables/sources/fixture/file-function-variable.js
new file mode 100644
index 00000000000..3e4621d5310
--- /dev/null
+++ b/test/unit/lib/configuration/variables/sources/fixture/file-function-variable.js
@@ -0,0 +1,5 @@
+'use strict';
+
+module.exports = async ({ resolveVariable }) => ({
+  varResult: await resolveVariable('file(file.yaml)'),
+});
diff --git a/test/unit/lib/configuration/variables/sources/fixture/file-property-function-variable-missing-source.js b/test/unit/lib/configuration/variables/sources/fixture/file-property-function-variable-missing-source.js
new file mode 100644
index 00000000000..fe8b53ee1e9
--- /dev/null
+++ b/test/unit/lib/configuration/variables/sources/fixture/file-property-function-variable-missing-source.js
@@ -0,0 +1,5 @@
+'use strict';
+
+module.exports.property = async ({ resolveVariable }) => ({
+  varResult: await resolveVariable('file(missing.json)'),
+});
diff --git a/test/unit/lib/configuration/variables/sources/fixture/file-property-function-variable.js b/test/unit/lib/configuration/variables/sources/fixture/file-property-function-variable.js
new file mode 100644
index 00000000000..13988c06e22
--- /dev/null
+++ b/test/unit/lib/configuration/variables/sources/fixture/file-property-function-variable.js
@@ -0,0 +1,5 @@
+'use strict';
+
+module.exports.property = async ({ resolveVariable }) => ({
+  varResult: await resolveVariable('file(file.json)'),
+});
diff --git a/test/unit/lib/configuration/variables/sources/fixture/file-variables-nest-1.yaml b/test/unit/lib/configuration/variables/sources/fixture/file-variables-nest-1.yaml
new file mode 100644
index 00000000000..07112689c41
--- /dev/null
+++ b/test/unit/lib/configuration/variables/sources/fixture/file-variables-nest-1.yaml
@@ -0,0 +1 @@
+n1: ${file(./file-variables-nest-2.yaml):root}
diff --git a/test/unit/lib/configuration/variables/sources/fixture/file-variables-nest-2.yaml b/test/unit/lib/configuration/variables/sources/fixture/file-variables-nest-2.yaml
new file mode 100644
index 00000000000..aebc2d442a1
--- /dev/null
+++ b/test/unit/lib/configuration/variables/sources/fixture/file-variables-nest-2.yaml
@@ -0,0 +1,2 @@
+root:
+  n2: ${file(./file-variables-nest-3.yaml):root}
diff --git a/test/unit/lib/configuration/variables/sources/fixture/file-variables-nest-3.yaml b/test/unit/lib/configuration/variables/sources/fixture/file-variables-nest-3.yaml
new file mode 100644
index 00000000000..b35e5c8d3df
--- /dev/null
+++ b/test/unit/lib/configuration/variables/sources/fixture/file-variables-nest-3.yaml
@@ -0,0 +1,2 @@
+root:
+  n3: result
diff --git a/test/unit/lib/configuration/variables/sources/instance-dependent/get-aws.test.js b/test/unit/lib/configuration/variables/sources/instance-dependent/get-aws.test.js
new file mode 100644
index 00000000000..c3f58c2ee2f
--- /dev/null
+++ b/test/unit/lib/configuration/variables/sources/instance-dependent/get-aws.test.js
@@ -0,0 +1,109 @@
+'use strict';
+
+const { expect } = require('chai');
+const _ = require('lodash');
+
+const resolveMeta = require('../../../../../../../lib/configuration/variables/resolve-meta');
+const resolve = require('../../../../../../../lib/configuration/variables/resolve');
+const selfSource = require('../../../../../../../lib/configuration/variables/sources/self');
+const getAwsSource = require('../../../../../../../lib/configuration/variables/sources/instance-dependent/get-aws');
+const Serverless = require('../../../../../../../lib/serverless');
+
+describe('test/unit/lib/configuration/variables/sources/instance-dependent/get-aws.test.js', () => {
+  let configuration;
+  let variablesMeta;
+  let serverlessInstance;
+
+  const initializeServerless = async (configExt, options) => {
+    configuration = {
+      service: 'foo',
+      provider: {
+        name: 'aws',
+      },
+      custom: {
+        region: '${aws:region}',
+        accountId: '${aws:accountId}',
+        missingAddress: '${aws:}',
+        invalidAddress: '${aws:invalid}',
+        nonStringAddress: '${aws:${self:custom.someObject}}',
+        someObject: {},
+      },
+    };
+    if (configExt) {
+      configuration = _.merge(configuration, configExt);
+    }
+    variablesMeta = resolveMeta(configuration);
+    serverlessInstance = new Serverless({
+      configuration,
+      serviceDir: process.cwd(),
+      configurationFilename: 'serverless.yml',
+      isConfigurationResolved: true,
+      commands: ['package'],
+      options: {},
+    });
+    serverlessInstance.init();
+    serverlessInstance.getProvider = () => ({
+      constructor: {
+        getProviderName: () => 'aws',
+      },
+      request: async () => {
+        return {
+          Account: '1234567890',
+        };
+      },
+    });
+    await resolve({
+      serviceDir: process.cwd(),
+      configuration,
+      variablesMeta,
+      sources: { self: selfSource, aws: getAwsSource(serverlessInstance) },
+      options: options || {},
+      fulfilledSources: new Set(['self', 'aws']),
+    });
+  };
+
+  it('should resolve `accountId`', async () => {
+    await initializeServerless();
+    expect(configuration.custom.accountId).to.equal('1234567890');
+  });
+
+  it('should report with an error missing address', () =>
+    expect(variablesMeta.get('custom\0missingAddress').error.code).to.equal(
+      'VARIABLE_RESOLUTION_ERROR'
+    ));
+
+  it('should report with an error invalid address', () =>
+    expect(variablesMeta.get('custom\0invalidAddress').error.code).to.equal(
+      'VARIABLE_RESOLUTION_ERROR'
+    ));
+
+  it('should report with an error a non-string address', () =>
+    expect(variablesMeta.get('custom\0nonStringAddress').error.code).to.equal(
+      'VARIABLE_RESOLUTION_ERROR'
+    ));
+
+  it('should resolve ${aws:region}', async () => {
+    // us-east-1 by default
+    await initializeServerless();
+    expect(configuration.custom.region).to.equal('us-east-1');
+    // Resolves to provider.region if it exists
+    await initializeServerless({
+      provider: {
+        region: 'eu-west-1',
+      },
+    });
+    expect(configuration.custom.region).to.equal('eu-west-1');
+    // Resolves to `--region=` if the option is set
+    await initializeServerless(
+      {
+        provider: {
+          region: 'eu-west-1',
+        },
+      },
+      {
+        region: 'eu-central-1',
+      }
+    );
+    expect(configuration.custom.region).to.equal('eu-central-1');
+  });
+});
diff --git a/test/unit/lib/configuration/variables/sources/instance-dependent/get-cf.test.js b/test/unit/lib/configuration/variables/sources/instance-dependent/get-cf.test.js
index 6baed7eea64..a4372c73a68 100644
--- a/test/unit/lib/configuration/variables/sources/instance-dependent/get-cf.test.js
+++ b/test/unit/lib/configuration/variables/sources/instance-dependent/get-cf.test.js
@@ -41,7 +41,7 @@ describe('test/unit/lib/configuration/variables/sources/instance-dependent/get-c
           }
           if (StackName === 'notExisting') {
             throw Object.assign(new Error('Stack with id not-existing does not exist'), {
-              code: 'ValidationError',
+              code: 'AWS_CLOUD_FORMATION_DESCRIBE_STACKS_VALIDATION_ERROR',
             });
           }
           throw new Error('Unexpected call');
diff --git a/test/unit/lib/configuration/variables/sources/instance-dependent/get-s3.test.js b/test/unit/lib/configuration/variables/sources/instance-dependent/get-s3.test.js
index b401650c6e1..f9140ecf010 100644
--- a/test/unit/lib/configuration/variables/sources/instance-dependent/get-s3.test.js
+++ b/test/unit/lib/configuration/variables/sources/instance-dependent/get-s3.test.js
@@ -34,7 +34,7 @@ describe('test/unit/lib/configuration/variables/sources/instance-dependent/get-s
           if (Bucket === 'existing') {
             if (Key === 'someKey') return { Body: 'foo' };
             throw Object.assign(new Error('The specified key does not exist.'), {
-              code: 'NoSuchKey',
+              code: 'AWS_S3_GET_OBJECT_NO_SUCH_KEY',
             });
           }
           throw Object.assign(new Error('The specified bucket does not exist.'), {
diff --git a/test/unit/lib/configuration/variables/sources/instance-dependent/get-sls.test.js b/test/unit/lib/configuration/variables/sources/instance-dependent/get-sls.test.js
index dc937b5234f..1bc6a271dab 100644
--- a/test/unit/lib/configuration/variables/sources/instance-dependent/get-sls.test.js
+++ b/test/unit/lib/configuration/variables/sources/instance-dependent/get-sls.test.js
@@ -7,14 +7,14 @@ const resolveMeta = require('../../../../../../../lib/configuration/variables/re
 const resolve = require('../../../../../../../lib/configuration/variables/resolve');
 const selfSource = require('../../../../../../../lib/configuration/variables/sources/self');
 const getSlsSource = require('../../../../../../../lib/configuration/variables/sources/instance-dependent/get-sls');
-const Serverless = require('../../../../../../../lib/Serverless');
+const Serverless = require('../../../../../../../lib/serverless');
 
 describe('test/unit/lib/configuration/variables/sources/instance-dependent/get-sls.test.js', () => {
   let configuration;
   let variablesMeta;
   let serverlessInstance;
 
-  const initializeServerless = async (configExt, options) => {
+  const initializeServerless = async ({ configExt, options, setupOptions = {} } = {}) => {
     configuration = {
       service: 'foo',
       provider: {
@@ -35,9 +35,9 @@ describe('test/unit/lib/configuration/variables/sources/instance-dependent/get-s
     variablesMeta = resolveMeta(configuration);
     serverlessInstance = new Serverless({
       configuration,
-      configurationPath: process.cwd(),
+      serviceDir: process.cwd(),
+      configurationFilename: 'serverless.yml',
       isConfigurationResolved: true,
-      hasResolvedCommandsExternally: true,
       commands: ['package'],
       options: {},
     });
@@ -46,7 +46,10 @@ describe('test/unit/lib/configuration/variables/sources/instance-dependent/get-s
       serviceDir: process.cwd(),
       configuration,
       variablesMeta,
-      sources: { self: selfSource, sls: getSlsSource(serverlessInstance) },
+      sources: {
+        self: selfSource,
+        sls: getSlsSource(setupOptions.withoutInstance ? null : serverlessInstance),
+      },
       options: options || {},
       fulfilledSources: new Set(['self', 'sls']),
     });
@@ -59,28 +62,66 @@ describe('test/unit/lib/configuration/variables/sources/instance-dependent/get-s
     expect(configuration.custom.sls).to.equal(serverlessInstance.instanceId);
   });
 
+  it('should keep  ${sls:instanceId} pending when no serverless instance available', async () => {
+    // Dev by default
+    await initializeServerless({ setupOptions: { withoutInstance: true } });
+    expect(variablesMeta.get('custom\0sls')).to.have.property('variables');
+    expect(variablesMeta.get('custom\0sls')).to.not.have.property('error');
+  });
+
   it('should resolve ${sls:stage}', async () => {
     // Dev by default
     await initializeServerless();
     expect(configuration.custom.stage).to.equal('dev');
     // Resolves to provider.stage if it exists
     await initializeServerless({
-      provider: {
-        stage: 'prod',
+      configExt: {
+        provider: {
+          stage: 'prod',
+        },
       },
     });
     expect(configuration.custom.stage).to.equal('prod');
     // Resolves to `--stage=` if the option is set
-    await initializeServerless(
-      {
+    await initializeServerless({
+      configExt: {
         provider: {
           stage: 'prod',
         },
       },
-      {
+      options: {
         stage: 'staging',
-      }
-    );
+      },
+    });
+    expect(configuration.custom.stage).to.equal('staging');
+  });
+
+  it('should resolve ${sls:stage} when no serverless instance available', async () => {
+    // Dev by default
+    await initializeServerless({ setupOptions: { withoutInstance: true } });
+    expect(configuration.custom.stage).to.equal('dev');
+    // Resolves to provider.stage if it exists
+    await initializeServerless({
+      setupOptions: { withoutInstance: true },
+      configExt: {
+        provider: {
+          stage: 'prod',
+        },
+      },
+    });
+    expect(configuration.custom.stage).to.equal('prod');
+    // Resolves to `--stage=` if the option is set
+    await initializeServerless({
+      setupOptions: { withoutInstance: true },
+      configExt: {
+        provider: {
+          stage: 'prod',
+        },
+      },
+      options: {
+        stage: 'staging',
+      },
+    });
     expect(configuration.custom.stage).to.equal('staging');
   });
 
diff --git a/test/unit/lib/configuration/variables/sources/instance-dependent/get-ssm.test.js b/test/unit/lib/configuration/variables/sources/instance-dependent/get-ssm.test.js
index bcbf3d8260f..19a9040e0e9 100644
--- a/test/unit/lib/configuration/variables/sources/instance-dependent/get-ssm.test.js
+++ b/test/unit/lib/configuration/variables/sources/instance-dependent/get-ssm.test.js
@@ -14,238 +14,153 @@ describe('test/unit/lib/configuration/variables/sources/instance-dependent/get-s
   let variablesMeta;
   let serverlessInstance;
 
-  describe('modern', () => {
-    before(async () => {
-      configuration = {
-        service: 'foo',
-        variablesResolutionMode: '20210326',
-        provider: { name: 'aws' },
-        custom: {
-          existing: '${ssm:existing}',
-          existingInRegion: '${ssm(eu-west-1):existing}',
-          existingList: '${ssm:existingList}',
-          existingListRaw: '${ssm(raw):existingList}',
-          secretManager: '${ssm:/aws/reference/secretsmanager/existing}',
-          existingEncrypted: '${ssm:/secret/existing}',
-          existingEncryptedRaw: '${ssm(raw):/aws/reference/secretsmanager/existing}',
-          notExisting: '${ssm:notExisting, null}',
-          missingAddress: '${ssm:}',
-          nonStringAddress: '${ssm:${self:custom.someObject}}',
-          someObject: {},
+  before(async () => {
+    configuration = {
+      service: 'foo',
+      provider: { name: 'aws' },
+      custom: {
+        existing: '${ssm:existing}',
+        existingInRegion: '${ssm(eu-west-1):existing}',
+        existingList: '${ssm:existingList}',
+        existingListRaw: '${ssm(raw):existingList}',
+        secretManager: '${ssm:/aws/reference/secretsmanager/existing}',
+        existingEncrypted: '${ssm:/secret/existing}',
+        encryptedWithSkipDecrypt: '${ssm(noDecrypt):/secret/existing}',
+        encryptedWithSkipDecryptAndRegion: '${ssm(noDecrypt, eu-west-1):/secret/existing}',
+        existingEncryptedDirect: '${ssm:/secret/direct}',
+        existingEncryptedRaw: '${ssm(raw):/aws/reference/secretsmanager/existing}',
+        notExisting: '${ssm:notExisting, null}',
+        missingAddress: '${ssm:}',
+        nonStringAddress: '${ssm:${self:custom.someObject}}',
+        someObject: {},
+      },
+    };
+    variablesMeta = resolveMeta(configuration);
+
+    serverlessInstance = {
+      getProvider: () => ({
+        request: async (name, method, { Name, WithDecryption }, { region }) => {
+          if (!allowedRegionTypes.has(typeof region)) throw new Error('Invalid region value');
+          if (Name === 'existing') {
+            return { Parameter: { Type: 'String', Value: region || 'value' } };
+          }
+          if (Name === 'existingList') {
+            return { Parameter: { Type: 'StringList', Value: 'one,two,three' } };
+          }
+          if (Name === '/secret/existing' || Name === '/aws/reference/secretsmanager/existing') {
+            return {
+              Parameter: {
+                Type: 'SecureString',
+                Value: WithDecryption ? '{"someSecret":"someValue"}' : 'ENCRYPTED',
+              },
+            };
+          }
+          if (Name === '/secret/direct') {
+            return {
+              Parameter: {
+                Type: 'SecureString',
+                Value: WithDecryption ? '12345678901234567890' : 'ENCRYPTED',
+              },
+            };
+          }
+          if (Name === 'notExisting') {
+            throw Object.assign(
+              new Error(
+                'ParameterNotFound: An error occurred ' +
+                  '(ParameterNotFound) when referencing Secrets Manager'
+              ),
+              {
+                code: 'AWS_S_S_M_GET_PARAMETER_PARAMETER_NOT_FOUND',
+              }
+            );
+          }
+          throw new Error('Unexpected call');
         },
-      };
-      variablesMeta = resolveMeta(configuration);
-
-      serverlessInstance = {
-        getProvider: () => ({
-          request: async (name, method, { Name }, { region }) => {
-            if (!allowedRegionTypes.has(typeof region)) throw new Error('Invalid region value');
-            if (Name === 'existing') {
-              return { Parameter: { Type: 'String', Value: region || 'value' } };
-            }
-            if (Name === 'existingList') {
-              return { Parameter: { Type: 'StringList', Value: 'one,two,three' } };
-            }
-            if (Name === '/secret/existing' || Name === '/aws/reference/secretsmanager/existing') {
-              return { Parameter: { Type: 'SecureString', Value: '{"someSecret":"someValue"}' } };
-            }
-            if (Name === 'notExisting') {
-              throw Object.assign(
-                new Error(
-                  'ParameterNotFound: An error occurred ' +
-                    '(ParameterNotFound) when referencing Secrets Manager'
-                ),
-                {
-                  code: 'ParameterNotFound',
-                }
-              );
-            }
-            throw new Error('Unexpected call');
-          },
-        }),
-      };
-
-      await resolve({
-        serviceDir: process.cwd(),
-        configuration,
-        variablesMeta,
-        sources: { self: selfSource, ssm: getSsmSource(serverlessInstance) },
-        options: {},
-        fulfilledSources: new Set(['cf', 'self']),
-      });
-    });
-
-    it('should resolve existing string param', () => {
-      if (variablesMeta.get('custom\0existing')) throw variablesMeta.get('custom\0existing').error;
-      expect(configuration.custom.existing).to.equal('value');
-    });
-
-    it('should resolve existing string list param', () => {
-      if (variablesMeta.get('custom\0existingList')) {
-        throw variablesMeta.get('custom\0existingList').error;
-      }
-      expect(configuration.custom.existingList).to.deep.equal(['one', 'two', 'three']);
-    });
-    it('should support "raw" output for list param', () => {
-      if (variablesMeta.get('custom\0existingListRaw')) {
-        throw variablesMeta.get('custom\0existingListRaw').error;
-      }
-      expect(configuration.custom.existingListRaw).to.equal('one,two,three');
-    });
-
-    it('should resolve existing encrypted AWS secret manager data', () => {
-      if (variablesMeta.get('custom\0secretManager')) {
-        throw variablesMeta.get('custom\0secretManager').error;
-      }
-      expect(configuration.custom.secretManager).to.deep.equal({ someSecret: 'someValue' });
-    });
-
-    it('should resolve existing encrypted data', () => {
-      if (variablesMeta.get('custom\0existingEncrypted')) {
-        throw variablesMeta.get('custom\0existingEncrypted').error;
-      }
-      expect(configuration.custom.existingEncrypted).to.deep.equal({ someSecret: 'someValue' });
-    });
-
-    it('should support "raw" output for decrypted data', () => {
-      if (variablesMeta.get('custom\0existingEncryptedRaw')) {
-        throw variablesMeta.get('custom\0existingEncryptedRaw').error;
-      }
-      expect(configuration.custom.existingEncryptedRaw).to.equal('{"someSecret":"someValue"}');
-    });
-
-    it('should resolve existing output in specific region', () => {
-      if (variablesMeta.get('custom\0existingInRegion')) {
-        throw variablesMeta.get('custom\0existingInRegion').error;
-      }
-      expect(configuration.custom.existingInRegion).to.equal('eu-west-1');
-    });
+      }),
+    };
 
-    it('should resolve null on missing param', () => {
-      if (variablesMeta.get('custom\0notExisting')) {
-        throw variablesMeta.get('custom\0notExisting').error;
-      }
-      expect(configuration.custom.notExisting).to.equal(null);
+    await resolve({
+      serviceDir: process.cwd(),
+      configuration,
+      variablesMeta,
+      sources: { self: selfSource, ssm: getSsmSource(serverlessInstance) },
+      options: {},
+      fulfilledSources: new Set(['cf', 'self']),
     });
-
-    it('should report with an error missing address', () =>
-      expect(variablesMeta.get('custom\0missingAddress').error.code).to.equal(
-        'VARIABLE_RESOLUTION_ERROR'
-      ));
-
-    it('should report with an error a non-string address', () =>
-      expect(variablesMeta.get('custom\0nonStringAddress').error.code).to.equal(
-        'VARIABLE_RESOLUTION_ERROR'
-      ));
   });
 
-  describe('legacy', () => {
-    before(async () => {
-      configuration = {
-        service: 'foo',
-        provider: { name: 'aws' },
-        custom: {
-          existing: '${ssm:existing}',
-          existingWithSplit: '${ssm:existing~split}',
-          existingList: '${ssm:existingList}',
-          existingListWithSplit: '${ssm:existingList~split}',
-          secretManager: '${ssm:/aws/reference/secretsmanager/existing}',
-          secretManagerWithDecrypt: '${ssm:/aws/reference/secretsmanager/existing~true}',
-          encyptedWithDecrypt: '${ssm:/secret/existing~true}',
-          encyptedRawWithDecrypt: '${ssm(raw):/secret/existing~true}',
-        },
-      };
-      variablesMeta = resolveMeta(configuration);
-
-      serverlessInstance = {
-        getProvider: () => ({
-          request: async (name, method, { Name }, { region }) => {
-            if (!allowedRegionTypes.has(typeof region)) throw new Error('Invalid region value');
-            if (Name === 'existing') {
-              return { Parameter: { Type: 'String', Value: region || 'value' } };
-            }
-            if (Name === 'existingList') {
-              return { Parameter: { Type: 'StringList', Value: 'one,two,three' } };
-            }
-            if (Name === '/secret/existing' || Name === '/aws/reference/secretsmanager/existing') {
-              return { Parameter: { Type: 'SecureString', Value: '{"someSecret":"someValue"}' } };
-            }
-            if (Name === 'notExisting') {
-              throw Object.assign(
-                new Error(
-                  'ParameterNotFound: An error occurred ' +
-                    '(ParameterNotFound) when referencing Secrets Manager'
-                ),
-                {
-                  code: 'ParameterNotFound',
-                }
-              );
-            }
-            throw new Error('Unexpected call');
-          },
-        }),
-      };
-
-      await resolve({
-        serviceDir: process.cwd(),
-        configuration,
-        variablesMeta,
-        sources: { self: selfSource, ssm: getSsmSource(serverlessInstance) },
-        options: {},
-        fulfilledSources: new Set(['cf', 'self']),
-      });
-    });
+  it('should resolve existing string param', () => {
+    if (variablesMeta.get('custom\0existing')) throw variablesMeta.get('custom\0existing').error;
+    expect(configuration.custom.existing).to.equal('value');
+  });
 
-    it('should resolve existing string param', () => {
-      if (variablesMeta.get('custom\0existing')) throw variablesMeta.get('custom\0existing').error;
-      expect(configuration.custom.existing).to.equal('value');
-    });
+  it('should resolve existing string list param', () => {
+    if (variablesMeta.get('custom\0existingList')) {
+      throw variablesMeta.get('custom\0existingList').error;
+    }
+    expect(configuration.custom.existingList).to.deep.equal(['one', 'two', 'three']);
+  });
+  it('should support "raw" output for list param', () => {
+    if (variablesMeta.get('custom\0existingListRaw')) {
+      throw variablesMeta.get('custom\0existingListRaw').error;
+    }
+    expect(configuration.custom.existingListRaw).to.equal('one,two,three');
+  });
 
-    it('should abort if string param has "split" instruction', () => {
-      expect(variablesMeta.get('custom\0existingWithSplit').error.code).to.equal(
-        'VARIABLE_RESOLUTION_ERROR'
-      );
-    });
+  it('should resolve existing encrypted AWS secret manager data', () => {
+    if (variablesMeta.get('custom\0secretManager')) {
+      throw variablesMeta.get('custom\0secretManager').error;
+    }
+    expect(configuration.custom.secretManager).to.deep.equal({ someSecret: 'someValue' });
+  });
 
-    it('should abort if string list param misses "split" instruction', () => {
-      expect(variablesMeta.get('custom\0existingList').error.code).to.equal(
-        'VARIABLE_RESOLUTION_ERROR'
-      );
-    });
+  it('should resolve existing encrypted data', () => {
+    if (variablesMeta.get('custom\0existingEncrypted')) {
+      throw variablesMeta.get('custom\0existingEncrypted').error;
+    }
+    if (variablesMeta.get('custom\0existingDirect')) {
+      throw variablesMeta.get('custom\0existingDirect').error;
+    }
+    if (variablesMeta.get('custom\0encryptedWithSkipDecrypt')) {
+      throw variablesMeta.get('custom\0encryptedWithSkipDecrypt').error;
+    }
+    if (variablesMeta.get('custom\0encryptedWithSkipDecryptAndRegion')) {
+      throw variablesMeta.get('custom\0encryptedWithSkipDecrypt').error;
+    }
+    expect(configuration.custom.existingEncrypted).to.deep.equal({ someSecret: 'someValue' });
+    expect(configuration.custom.existingEncryptedDirect).to.equal('12345678901234567890');
+    expect(configuration.custom.encryptedWithSkipDecrypt).to.equal('ENCRYPTED');
+    expect(configuration.custom.encryptedWithSkipDecryptAndRegion).to.equal('ENCRYPTED');
+  });
 
-    it('should resolve existing string list param', () => {
-      if (variablesMeta.get('custom\0existingListWithSplit')) {
-        throw variablesMeta.get('custom\0existingListWithSplit').error;
-      }
-      expect(configuration.custom.existingListWithSplit).to.deep.equal(['one', 'two', 'three']);
-    });
+  it('should support "raw" output for decrypted data', () => {
+    if (variablesMeta.get('custom\0existingEncryptedRaw')) {
+      throw variablesMeta.get('custom\0existingEncryptedRaw').error;
+    }
+    expect(configuration.custom.existingEncryptedRaw).to.equal('{"someSecret":"someValue"}');
+  });
 
-    it('should abort if encrypted param misses "true" instruction', () => {
-      expect(variablesMeta.get('custom\0secretManager').error.code).to.equal(
-        'VARIABLE_RESOLUTION_ERROR'
-      );
-    });
+  it('should resolve existing output in specific region', () => {
+    if (variablesMeta.get('custom\0existingInRegion')) {
+      throw variablesMeta.get('custom\0existingInRegion').error;
+    }
+    expect(configuration.custom.existingInRegion).to.equal('eu-west-1');
+  });
 
-    it('should resolve existing encrypted data', () => {
-      if (variablesMeta.get('custom\0secretManagerWithDecrypt')) {
-        throw variablesMeta.get('custom\0secretManagerWithDecrypt').error;
-      }
-      expect(configuration.custom.secretManagerWithDecrypt).to.deep.equal({
-        someSecret: 'someValue',
-      });
-    });
+  it('should resolve null on missing param', () => {
+    if (variablesMeta.get('custom\0notExisting')) {
+      throw variablesMeta.get('custom\0notExisting').error;
+    }
+    expect(configuration.custom.notExisting).to.equal(null);
+  });
 
-    it('should abort if encrypted param is not AWS Secretn manager param', () => {
-      expect(variablesMeta.get('custom\0encyptedWithDecrypt').error.code).to.equal(
-        'VARIABLE_RESOLUTION_ERROR'
-      );
-    });
+  it('should report with an error missing address', () =>
+    expect(variablesMeta.get('custom\0missingAddress').error.code).to.equal(
+      'VARIABLE_RESOLUTION_ERROR'
+    ));
 
-    it('should resolve encrypted param that\'s not AWS Secret manager param with "raw" instruction', () => {
-      if (variablesMeta.get('custom\0encyptedRawWithDecrypt')) {
-        throw variablesMeta.get('custom\0encyptedRawWithDecrypt').error;
-      }
-      expect(configuration.custom.encyptedRawWithDecrypt).to.equal('{"someSecret":"someValue"}');
-    });
-  });
+  it('should report with an error a non-string address', () =>
+    expect(variablesMeta.get('custom\0nonStringAddress').error.code).to.equal(
+      'VARIABLE_RESOLUTION_ERROR'
+    ));
 });
diff --git a/test/unit/lib/configuration/variables/sources/resolve-external-plugin-resources.test.js b/test/unit/lib/configuration/variables/sources/resolve-external-plugin-resources.test.js
new file mode 100644
index 00000000000..52978b18342
--- /dev/null
+++ b/test/unit/lib/configuration/variables/sources/resolve-external-plugin-resources.test.js
@@ -0,0 +1,90 @@
+'use strict';
+
+const { expect } = require('chai');
+
+const ServerlessError = require('../../../../../../lib/serverless-error');
+const resolveExternalPluginSources = require('../../../../../../lib/configuration/variables/sources/resolve-external-plugin-sources');
+
+describe('test/unit/lib/configuration/variables/sources/resolve-external-plugin-resources.test.js', () => {
+  it('should resolve external plugin sources', () => {
+    const sources = {};
+    const fulfilledSources = new Set();
+    const externalPlugins = [
+      {
+        configurationVariablesSources: {
+          ext1: { resolve: () => {} },
+          ext2: { resolve: () => {} },
+        },
+      },
+      {
+        configurationVariablesSources: {
+          ext3: { resolve: () => {} },
+        },
+      },
+    ];
+    resolveExternalPluginSources({}, { sources, fulfilledSources }, new Set(externalPlugins));
+    expect(sources).to.deep.equal({
+      ...externalPlugins[0].configurationVariablesSources,
+      ...externalPlugins[1].configurationVariablesSources,
+    });
+    expect(fulfilledSources).to.deep.equal(new Set(Object.keys(sources)));
+  });
+
+  it('should reject meaningfully invalid sources configuration', () => {
+    expect(() =>
+      resolveExternalPluginSources(
+        {},
+        { sources: {}, fulfilledSources: new Set() },
+        new Set([
+          {
+            configurationVariablesSources: 'foo',
+          },
+        ])
+      )
+    )
+      .to.throw(ServerlessError)
+      .with.property('code', 'INVALID_VARIABLE_SOURCES_CONFIGURATION');
+
+    expect(() =>
+      resolveExternalPluginSources(
+        {},
+        { sources: { existing: { resolve: () => {} } }, fulfilledSources: new Set(['existing']) },
+        new Set([
+          {
+            configurationVariablesSources: { existing: { resolve: () => {} } },
+          },
+        ])
+      )
+    )
+      .to.throw(ServerlessError)
+      .with.property('code', 'DUPLICATE_VARIABLE_SOURCE_CONFIGURATION');
+
+    expect(() =>
+      resolveExternalPluginSources(
+        {},
+        { sources: {}, fulfilledSources: new Set() },
+        new Set([
+          {
+            configurationVariablesSources: { source: 'foo' },
+          },
+        ])
+      )
+    )
+      .to.throw(ServerlessError)
+      .with.property('code', 'INVALID_VARIABLE_SOURCE_CONFIGURATION');
+
+    expect(() =>
+      resolveExternalPluginSources(
+        {},
+        { sources: {}, fulfilledSources: new Set() },
+        new Set([
+          {
+            configurationVariablesSources: { source: { resolve: 'foo ' } },
+          },
+        ])
+      )
+    )
+      .to.throw(ServerlessError)
+      .with.property('code', 'INVALID_VARIABLE_SOURCE_RESOLVER_CONFIGURATION');
+  });
+});
diff --git a/test/unit/lib/configuration/variables/sources/str-to-bool.test.js b/test/unit/lib/configuration/variables/sources/str-to-bool.test.js
index 1417ff444bc..4a5925ca8a9 100644
--- a/test/unit/lib/configuration/variables/sources/str-to-bool.test.js
+++ b/test/unit/lib/configuration/variables/sources/str-to-bool.test.js
@@ -13,6 +13,8 @@ describe('test/unit/lib/configuration/variables/sources/str-to-bool.test.js', ()
     configuration = {
       truthy: "${strToBool('true')}",
       falsy: "${strToBool('false')}",
+      truthyUppercase: "${strToBool('TRUE')}",
+      falsyMixedCase: "${strToBool('False')}",
       noParam: '${strToBool:}',
       invalid: '${strToBool(foo)}',
     };
@@ -29,6 +31,10 @@ describe('test/unit/lib/configuration/variables/sources/str-to-bool.test.js', ()
 
   it('should resolve truthy input', () => expect(configuration.truthy).to.equal(true));
   it('should resolve falsy input', () => expect(configuration.falsy).to.equal(false));
+  it('should resolve uppercase truthy input', () =>
+    expect(configuration.truthyUppercase).to.equal(true));
+  it('should resolve mixed case falsy input', () =>
+    expect(configuration.falsyMixedCase).to.equal(false));
 
   it('should report with an error missing input', () =>
     expect(variablesMeta.get('noParam').error.code).to.equal('VARIABLE_RESOLUTION_ERROR'));
diff --git a/test/unit/lib/plugins/aws/common/index.test.js b/test/unit/lib/plugins/aws/common/index.test.js
index 87ebce8e09a..f87bdcf747a 100644
--- a/test/unit/lib/plugins/aws/common/index.test.js
+++ b/test/unit/lib/plugins/aws/common/index.test.js
@@ -2,14 +2,14 @@
 
 const AwsProvider = require('../../../../../../lib/plugins/aws/provider');
 const AwsCommon = require('../../../../../../lib/plugins/aws/common/index');
-const Serverless = require('../../../../../../lib/Serverless');
+const Serverless = require('../../../../../../lib/serverless');
 const expect = require('chai').expect;
 const sinon = require('sinon');
 
 describe('AwsCommon', () => {
   let awsCommon;
   beforeEach(() => {
-    const serverless = new Serverless();
+    const serverless = new Serverless({ commands: [], options: {} });
     const options = {
       stage: 'dev',
       region: 'us-east-1',
diff --git a/test/unit/lib/plugins/aws/common/lib/artifacts.test.js b/test/unit/lib/plugins/aws/common/lib/artifacts.test.js
index 4876595e92d..c94e78ba615 100644
--- a/test/unit/lib/plugins/aws/common/lib/artifacts.test.js
+++ b/test/unit/lib/plugins/aws/common/lib/artifacts.test.js
@@ -4,7 +4,7 @@ const expect = require('chai').expect;
 const path = require('path');
 const fse = require('fs-extra');
 const AWSCommon = require('../../../../../../../lib/plugins/aws/common/index');
-const Serverless = require('../../../../../../../lib/Serverless');
+const Serverless = require('../../../../../../../lib/serverless');
 const { getTmpDirPath } = require('../../../../../../utils/fs');
 
 describe('#moveArtifactsToPackage()', () => {
@@ -14,7 +14,7 @@ describe('#moveArtifactsToPackage()', () => {
   const moveServerlessPath = path.join(moveBasePath, '.serverless');
 
   beforeEach(() => {
-    serverless = new Serverless();
+    serverless = new Serverless({ commands: [], options: {} });
     awsCommon = new AWSCommon(serverless, {});
 
     serverless.serviceDir = moveBasePath;
@@ -104,7 +104,7 @@ describe('#moveArtifactsToTemp()', () => {
   const moveTargetPath = path.join(moveBasePath, 'target');
 
   beforeEach(() => {
-    serverless = new Serverless();
+    serverless = new Serverless({ commands: [], options: {} });
     awsCommon = new AWSCommon(serverless, {});
 
     serverless.serviceDir = moveBasePath;
diff --git a/test/unit/lib/plugins/aws/common/lib/cleanupTempDir.test.js b/test/unit/lib/plugins/aws/common/lib/cleanup-temp-dir.test.js
similarity index 90%
rename from test/unit/lib/plugins/aws/common/lib/cleanupTempDir.test.js
rename to test/unit/lib/plugins/aws/common/lib/cleanup-temp-dir.test.js
index 2ef090f086a..3165ec1d696 100644
--- a/test/unit/lib/plugins/aws/common/lib/cleanupTempDir.test.js
+++ b/test/unit/lib/plugins/aws/common/lib/cleanup-temp-dir.test.js
@@ -3,7 +3,7 @@
 const expect = require('chai').expect;
 const path = require('path');
 const Package = require('../../../../../../../lib/plugins/aws/common/index');
-const Serverless = require('../../../../../../../lib/Serverless');
+const Serverless = require('../../../../../../../lib/serverless');
 const { getTmpDirPath } = require('../../../../../../utils/fs');
 
 describe('#cleanupTempDir()', () => {
@@ -11,7 +11,7 @@ describe('#cleanupTempDir()', () => {
   let packageService;
 
   beforeEach(() => {
-    serverless = new Serverless();
+    serverless = new Serverless({ commands: [], options: {} });
     packageService = new Package(serverless);
 
     serverless.serviceDir = getTmpDirPath();
diff --git a/test/unit/lib/plugins/aws/configCredentials.test.js b/test/unit/lib/plugins/aws/config-credentials.test.js
similarity index 88%
rename from test/unit/lib/plugins/aws/configCredentials.test.js
rename to test/unit/lib/plugins/aws/config-credentials.test.js
index eac88a4f6b6..b04d8986885 100644
--- a/test/unit/lib/plugins/aws/configCredentials.test.js
+++ b/test/unit/lib/plugins/aws/config-credentials.test.js
@@ -1,14 +1,19 @@
 'use strict';
 
-const expect = require('chai').expect;
+const chai = require('chai');
 const sandbox = require('sinon');
 const { constants } = require('fs');
 const fs = require('fs');
+const fsp = require('fs').promises;
 const fse = require('fs-extra');
 const os = require('os');
 const path = require('path');
-const AwsConfigCredentials = require('../../../../../lib/plugins/aws/configCredentials');
-const Serverless = require('../../../../../lib/Serverless');
+const AwsConfigCredentials = require('../../../../../lib/plugins/aws/config-credentials');
+const Serverless = require('../../../../../lib/serverless');
+const runServerless = require('../../../../utils/run-serverless');
+
+const { expect } = chai;
+chai.use(require('chai-as-promised'));
 
 describe('AwsConfigCredentials', () => {
   let awsConfigCredentials;
@@ -25,7 +30,7 @@ describe('AwsConfigCredentials', () => {
   before(() => {
     // Abort if credentials are found in home directory
     // (it should not be the case, as home directory is mocked to point temp dir)
-    return fse.lstat(awsDirectoryPath).then(
+    return fsp.lstat(awsDirectoryPath).then(
       () => {
         throw new Error('Unexpected ~/.aws directory, related tests aborted');
       },
@@ -37,7 +42,7 @@ describe('AwsConfigCredentials', () => {
   });
 
   beforeEach(() => {
-    serverless = new Serverless();
+    serverless = new Serverless({ commands: ['print'], options: {}, serviceDir: null });
     return serverless.init().then(() => {
       const options = {
         provider: 'aws',
@@ -136,16 +141,6 @@ describe('AwsConfigCredentials', () => {
       );
     });
 
-    it('should not update the profile if the overwrite flag is not set', () => {
-      awsConfigCredentials.options.profile = 'my-profile';
-      awsConfigCredentials.options.key = 'my-new-profile-key';
-      awsConfigCredentials.options.secret = 'my-new-profile-secret';
-
-      fse.outputFileSync(credentialsFilePath, credentialsFileContent);
-
-      return awsConfigCredentials.configureCredentials();
-    });
-
     it('should update the profile', () => {
       awsConfigCredentials.options.profile = 'my-profile';
       awsConfigCredentials.options.key = 'my-new-profile-key';
@@ -244,3 +239,24 @@ describe('AwsConfigCredentials', () => {
     }
   });
 });
+
+describe('test/unit/lib/plugins/aws/configCredentials.test.js', () => {
+  it('should fail if profile is already set and overwrite is not set', async () => {
+    const credentialsFilePath = path.join(os.homedir(), '.aws', 'credentials');
+    const credentialsFileContent = [
+      '[default]',
+      'aws_access_key_id = my-old-profile-key',
+      'aws_secret_access_key = my-old-profile-secret',
+    ].join('\n');
+
+    await fse.outputFile(credentialsFilePath, credentialsFileContent);
+
+    await expect(
+      runServerless({
+        noService: true,
+        command: 'config credentials',
+        options: { provider: 'aws', key: 'key', secret: 'secret' },
+      })
+    ).to.be.eventually.rejected.and.have.property('code', 'CREDENTIALS_PROFILE_ALREADY_CONFIGURED');
+  });
+});
diff --git a/test/unit/lib/plugins/aws/custom-resources/generate-zip.test.js b/test/unit/lib/plugins/aws/custom-resources/generate-zip.test.js
new file mode 100644
index 00000000000..274c295f7ed
--- /dev/null
+++ b/test/unit/lib/plugins/aws/custom-resources/generate-zip.test.js
@@ -0,0 +1,29 @@
+'use strict';
+
+const path = require('path');
+const globby = require('globby');
+const requireUncached = require('ncjsm/require-uncached');
+const { listZipFiles } = require('../../../../../utils/fs');
+const { expect } = require('chai');
+
+// The directory that holds the files that generateZip zips up
+const resourcesDir = path.resolve(
+  __dirname,
+  '../../../../../../lib/plugins/aws/custom-resources/resources/'
+);
+
+describe('test/unit/lib/plugins/aws/customResources/generateZip.test.js', () => {
+  describe('when generating a zip file', () => {
+    it('should generate a zip file with the contents of the resources directory', async () => {
+      const zipFilePath = await requireUncached(async () =>
+        require('../../../../../../lib/plugins/aws/custom-resources/generate-zip')()
+      );
+
+      // List the files in the zip to make sure it is valid
+      const filesInZip = await listZipFiles(zipFilePath);
+
+      const filesInResourceDir = await globby('**', { cwd: resourcesDir });
+      expect(filesInZip).to.have.all.members(filesInResourceDir);
+    });
+  });
+});
diff --git a/test/unit/lib/plugins/aws/customResources/index.test.js b/test/unit/lib/plugins/aws/custom-resources/index.test.js
similarity index 93%
rename from test/unit/lib/plugins/aws/customResources/index.test.js
rename to test/unit/lib/plugins/aws/custom-resources/index.test.js
index 8fa7b0b2c74..343e2e67220 100644
--- a/test/unit/lib/plugins/aws/customResources/index.test.js
+++ b/test/unit/lib/plugins/aws/custom-resources/index.test.js
@@ -5,12 +5,12 @@
 const chai = require('chai');
 const BbPromise = require('bluebird');
 const AwsProvider = require('../../../../../../lib/plugins/aws/provider');
-const Serverless = require('../../../../../../lib/Serverless');
-const CLI = require('../../../../../../lib/classes/CLI');
+const Serverless = require('../../../../../../lib/serverless');
+const CLI = require('../../../../../../lib/classes/cli');
 const { createTmpDir } = require('../../../../../utils/fs');
 const {
   addCustomResourceToService,
-} = require('../../../../../../lib/plugins/aws/customResources/index.js');
+} = require('../../../../../../lib/plugins/aws/custom-resources/index.js');
 const runServerless = require('../../../../../utils/run-serverless');
 
 const expect = chai.expect;
@@ -36,7 +36,7 @@ describe('#addCustomResourceToService()', () => {
       region: 'us-east-1',
     };
     tmpDirPath = createTmpDir();
-    serverless = new Serverless();
+    serverless = new Serverless({ commands: [], options: {} });
     serverless.cli = new CLI();
     serverless.pluginManager.cliOptions = options;
     provider = new AwsProvider(serverless, options);
@@ -109,7 +109,7 @@ describe('#addCustomResourceToService()', () => {
           Role: {
             'Fn::GetAtt': ['IamRoleCustomResourcesLambdaExecution', 'Arn'],
           },
-          Runtime: 'nodejs12.x',
+          Runtime: 'nodejs14.x',
           Timeout: 180,
         },
         DependsOn: ['IamRoleCustomResourcesLambdaExecution'],
@@ -123,12 +123,12 @@ describe('#addCustomResourceToService()', () => {
             S3Key: 'artifact-dir-name/custom-resources.zip',
           },
           FunctionName: `${serviceName}-dev-custom-resource-existing-cup`,
-          Handler: 'cognitoUserPool/handler.handler',
+          Handler: 'cognito-user-pool/handler.handler',
           MemorySize: 1024,
           Role: {
             'Fn::GetAtt': ['IamRoleCustomResourcesLambdaExecution', 'Arn'],
           },
-          Runtime: 'nodejs12.x',
+          Runtime: 'nodejs14.x',
           Timeout: 180,
         },
         DependsOn: ['IamRoleCustomResourcesLambdaExecution'],
@@ -142,12 +142,12 @@ describe('#addCustomResourceToService()', () => {
             S3Key: 'artifact-dir-name/custom-resources.zip',
           },
           FunctionName: `${serviceName}-dev-custom-resource-event-bridge`,
-          Handler: 'eventBridge/handler.handler',
+          Handler: 'event-bridge/handler.handler',
           MemorySize: 1024,
           Role: {
             'Fn::GetAtt': ['IamRoleCustomResourcesLambdaExecution', 'Arn'],
           },
-          Runtime: 'nodejs12.x',
+          Runtime: 'nodejs14.x',
           Timeout: 180,
         },
         DependsOn: ['IamRoleCustomResourcesLambdaExecution'],
@@ -204,14 +204,16 @@ describe('#addCustomResourceToService()', () => {
       ]);
     }));
 
-  it('should use custom role when cfnRole is provided', async () => {
+  it('should use custom role when deployment role is provided', async () => {
     const role = 'arn:aws:iam::999999999999:role/my-role';
     const { cfTemplate } = await runServerless({
       fixture: 'function',
       command: 'package',
       configExt: {
         provider: {
-          cfnRole: role,
+          iam: {
+            deploymentRole: role,
+          },
         },
         functions: {
           foo: {
@@ -219,12 +221,6 @@ describe('#addCustomResourceToService()', () => {
             events: [
               { s3: { bucket: 'my-bucket', existing: true } },
               { cognitoUserPool: { pool: 'my-user-pool', trigger: 'PreSignUp', existing: true } },
-              {
-                eventBridge: {
-                  eventBus: 'arn:aws:events:us-east-1:12345:event-bus/default',
-                  schedule: 'rate(10 minutes)',
-                },
-              },
             ],
           },
         },
@@ -235,8 +231,7 @@ describe('#addCustomResourceToService()', () => {
     expect([
       Resources.CustomDashresourceDashexistingDashs3LambdaFunction.Properties.Role, // S3
       Resources.CustomDashresourceDashexistingDashcupLambdaFunction.Properties.Role, // Cognito User Pool
-      Resources.CustomDashresourceDasheventDashbridgeLambdaFunction.Properties.Role, // Event Bridge
-    ]).to.eql([role, role, role]);
+    ]).to.eql([role, role]);
   });
 
   it('should setup CloudWatch Logs when logs.frameworkLambda is true', () => {
@@ -359,7 +354,7 @@ describe('#addCustomResourceToService()', () => {
 describe('test/unit/lib/plugins/aws/customResources/index.test.js', () => {
   it('correctly takes stage from cli into account when constructing apiGatewayCloudWatchRole resource', async () => {
     const { cfTemplate } = await runServerless({
-      fixture: 'apiGateway',
+      fixture: 'api-gateway',
       command: 'package',
       options: { stage: 'testing' },
       configExt: {
@@ -378,7 +373,7 @@ describe('test/unit/lib/plugins/aws/customResources/index.test.js', () => {
 
   it('correctly takes stage from config into account when constructing apiGatewayCloudWatchRole resource', async () => {
     const { cfTemplate } = await runServerless({
-      fixture: 'apiGateway',
+      fixture: 'api-gateway',
       command: 'package',
       configExt: {
         provider: {
diff --git a/test/unit/lib/plugins/aws/customResources/test/eventBridge.test.js b/test/unit/lib/plugins/aws/custom-resources/test/eventBridge.test.js
similarity index 85%
rename from test/unit/lib/plugins/aws/customResources/test/eventBridge.test.js
rename to test/unit/lib/plugins/aws/custom-resources/test/eventBridge.test.js
index d537e75bb4f..a514e3a7f77 100644
--- a/test/unit/lib/plugins/aws/customResources/test/eventBridge.test.js
+++ b/test/unit/lib/plugins/aws/custom-resources/test/eventBridge.test.js
@@ -3,7 +3,7 @@
 const { expect } = require('chai');
 const {
   getEventBusTargetId,
-} = require('../../../../../../../lib/plugins/aws/customResources/resources/eventBridge/lib/utils');
+} = require('../../../../../../../lib/plugins/aws/custom-resources/resources/event-bridge/lib/utils');
 
 describe('#getEventBusTargetId()', () => {
   const assertions = [
diff --git a/test/unit/lib/plugins/aws/customResources/test/utils.test.js b/test/unit/lib/plugins/aws/custom-resources/test/utils.test.js
similarity index 97%
rename from test/unit/lib/plugins/aws/customResources/test/utils.test.js
rename to test/unit/lib/plugins/aws/custom-resources/test/utils.test.js
index 82c40e72bd9..17b2f95b9de 100644
--- a/test/unit/lib/plugins/aws/customResources/test/utils.test.js
+++ b/test/unit/lib/plugins/aws/custom-resources/test/utils.test.js
@@ -4,7 +4,7 @@ const { expect } = require('chai');
 const {
   getLambdaArn,
   getEnvironment,
-} = require('../../../../../../../lib/plugins/aws/customResources/resources/utils');
+} = require('../../../../../../../lib/plugins/aws/custom-resources/resources/utils');
 
 describe('#getLambdaArn()', () => {
   it('should return the Lambda arn', () => {
diff --git a/test/unit/lib/plugins/aws/deployFunction.test.js b/test/unit/lib/plugins/aws/deploy-function.test.js
similarity index 84%
rename from test/unit/lib/plugins/aws/deployFunction.test.js
rename to test/unit/lib/plugins/aws/deploy-function.test.js
index 04a47af4d98..bbc678f9d98 100644
--- a/test/unit/lib/plugins/aws/deployFunction.test.js
+++ b/test/unit/lib/plugins/aws/deploy-function.test.js
@@ -6,7 +6,7 @@ const path = require('path');
 const fs = require('fs');
 const proxyquire = require('proxyquire');
 const AwsProvider = require('../../../../../lib/plugins/aws/provider');
-const Serverless = require('../../../../../lib/Serverless');
+const Serverless = require('../../../../../lib/serverless');
 const runServerless = require('../../../../utils/run-serverless');
 const { getTmpDirPath } = require('../../../../utils/fs');
 
@@ -22,7 +22,7 @@ describe('AwsDeployFunction', () => {
   let cryptoStub;
 
   beforeEach(async () => {
-    serverless = new Serverless();
+    serverless = new Serverless({ commands: ['print'], options: {}, serviceDir: null });
     serverless.servicePath = true;
     serverless.service.environment = {
       vars: {},
@@ -62,7 +62,7 @@ describe('AwsDeployFunction', () => {
       },
       digest: sinon.stub(),
     };
-    AwsDeployFunction = proxyquire('../../../../../lib/plugins/aws/deployFunction', {
+    AwsDeployFunction = proxyquire('../../../../../lib/plugins/aws/deploy-function', {
       crypto: cryptoStub,
     });
     awsDeployFunction = new AwsDeployFunction(serverless, options);
@@ -128,6 +128,8 @@ describe('AwsDeployFunction', () => {
     let getRoleStub;
 
     beforeEach(() => {
+      // Ensure that memoized function will be properly stubbed
+      awsDeployFunction.provider.getAccountInfo;
       getAccountInfoStub = sinon
         .stub(awsDeployFunction.provider, 'getAccountInfo')
         .resolves({ accountId: '123456789012', partition: 'aws' });
@@ -197,7 +199,6 @@ describe('AwsDeployFunction', () => {
       serverless.utils.writeFileSync(artifactFilePath, 'first.zip file content');
       updateFunctionCodeStub = sinon.stub(awsDeployFunction.provider, 'request').resolves();
       statSyncStub = sinon.stub(fs, 'statSync').returns({ size: 1024 });
-      sinon.spy(awsDeployFunction.serverless.cli, 'log');
       readFileSyncStub = sinon.stub(fs, 'readFileSync').returns();
       awsDeployFunction.serverless.service.provider.remoteFunctionData = {
         Configuration: {
@@ -252,11 +253,8 @@ describe('AwsDeployFunction', () => {
 
       await awsDeployFunction.deployFunction();
 
-      const expected = 'Code not changed. Skipping function deployment.';
-
       expect(updateFunctionCodeStub.calledOnce).to.be.equal(false);
       expect(readFileSyncStub.calledOnce).to.equal(true);
-      expect(awsDeployFunction.serverless.cli.log.calledWithExactly(expected)).to.equal(true);
       expect(readFileSyncStub.calledWithExactly(artifactFilePath)).to.equal(true);
     });
 
@@ -266,10 +264,8 @@ describe('AwsDeployFunction', () => {
 
       await awsDeployFunction.deployFunction();
 
-      const expected = 'Uploading function: first (1 KB)...';
       expect(readFileSyncStub.calledOnce).to.equal(true);
       expect(statSyncStub.calledOnce).to.equal(true);
-      expect(awsDeployFunction.serverless.cli.log.calledWithExactly(expected)).to.be.equal(true);
       expect(readFileSyncStub.calledWithExactly(artifactFilePath)).to.equal(true);
     });
 
@@ -330,6 +326,8 @@ describe('test/unit/lib/plugins/aws/deployFunction.test.js', () => {
       getFunction: {
         Configuration: {
           LastModified: '2020-05-20T15:34:16.494+0000',
+          State: 'Active',
+          LastUpdateStatus: 'Successful',
         },
       },
       updateFunctionCode: updateFunctionCodeStub,
@@ -400,10 +398,10 @@ describe('test/unit/lib/plugins/aws/deployFunction.test.js', () => {
   });
 
   it('should skip updating function configuration if image config did not change', async () => {
-    const { stdoutData } = await runServerless({
+    await runServerless({
       fixture: 'function',
       command: 'deploy function',
-      options: { function: 'foo' },
+      options: { function: 'basic' },
       awsRequestStubMap: {
         ...awsRequestStubMap,
         Lambda: {
@@ -412,6 +410,9 @@ describe('test/unit/lib/plugins/aws/deployFunction.test.js', () => {
             Configuration: {
               LastModified: '2020-05-20T15:34:16.494+0000',
               CodeSha256: imageSha,
+              State: 'Active',
+              LastUpdateStatus: 'Successful',
+
               ImageConfigResponse: {
                 ImageConfig: {
                   Command: ['anotherexecutable'],
@@ -425,7 +426,7 @@ describe('test/unit/lib/plugins/aws/deployFunction.test.js', () => {
       },
       configExt: {
         functions: {
-          foo: {
+          basic: {
             handler: null,
             image: {
               uri: imageWithSha,
@@ -438,16 +439,13 @@ describe('test/unit/lib/plugins/aws/deployFunction.test.js', () => {
       },
     });
     expect(updateFunctionConfigurationStub).not.to.be.called;
-    expect(stdoutData).to.include(
-      'Configuration did not change. Skipping function configuration update.'
-    );
   });
 
   it('should skip deployment if image sha did not change', async () => {
-    const { stdoutData } = await runServerless({
+    await runServerless({
       fixture: 'function',
       command: 'deploy function',
-      options: { function: 'foo' },
+      options: { function: 'basic' },
       awsRequestStubMap: {
         ...awsRequestStubMap,
         Lambda: {
@@ -456,20 +454,21 @@ describe('test/unit/lib/plugins/aws/deployFunction.test.js', () => {
             Configuration: {
               LastModified: '2020-05-20T15:34:16.494+0000',
               CodeSha256: imageSha,
+              State: 'Active',
+              LastUpdateStatus: 'Successful',
             },
           },
         },
       },
       configExt: {
         functions: {
-          foo: {
+          basic: {
             image: imageWithSha,
           },
         },
       },
     });
     expect(updateFunctionCodeStub).not.to.be.called;
-    expect(stdoutData).to.include('Image did not change. Skipping function deployment.');
   });
 
   it('should fail if function with image was previously defined with handler', async () => {
@@ -477,7 +476,7 @@ describe('test/unit/lib/plugins/aws/deployFunction.test.js', () => {
       runServerless({
         fixture: 'function',
         command: 'deploy function',
-        options: { function: 'foo' },
+        options: { function: 'basic' },
         awsRequestStubMap: {
           ...awsRequestStubMap,
           Lambda: {
@@ -486,13 +485,15 @@ describe('test/unit/lib/plugins/aws/deployFunction.test.js', () => {
               Configuration: {
                 LastModified: '2020-05-20T15:34:16.494+0000',
                 PackageType: 'Zip',
+                State: 'Active',
+                LastUpdateStatus: 'Successful',
               },
             },
           },
         },
         configExt: {
           functions: {
-            foo: {
+            basic: {
               image: imageWithSha,
             },
           },
@@ -509,7 +510,7 @@ describe('test/unit/lib/plugins/aws/deployFunction.test.js', () => {
       runServerless({
         fixture: 'function',
         command: 'deploy function',
-        options: { function: 'foo' },
+        options: { function: 'basic' },
         awsRequestStubMap: {
           ...awsRequestStubMap,
           Lambda: {
@@ -518,6 +519,8 @@ describe('test/unit/lib/plugins/aws/deployFunction.test.js', () => {
               Configuration: {
                 LastModified: '2020-05-20T15:34:16.494+0000',
                 PackageType: 'Image',
+                State: 'Active',
+                LastUpdateStatus: 'Successful',
               },
             },
           },
@@ -536,10 +539,10 @@ describe('test/unit/lib/plugins/aws/deployFunction.test.js', () => {
       .throws({ providerError: { code: 'ResourceConflictException' } })
       .onSecondCall()
       .resolves({});
-    const { stdoutData } = await runServerless({
+    await runServerless({
       fixture: 'function',
       command: 'deploy function',
-      options: { function: 'foo' },
+      options: { function: 'basic' },
       awsRequestStubMap: {
         ...awsRequestStubMap,
         Lambda: {
@@ -552,22 +555,21 @@ describe('test/unit/lib/plugins/aws/deployFunction.test.js', () => {
       },
       configExt: {
         functions: {
-          foo: {
+          basic: {
             timeout: 50,
           },
         },
       },
     });
 
-    expect(stdoutData).to.include('Retrying configuration update for function');
     expect(innerUpdateFunctionConfigurationStub.callCount).to.equal(2);
   });
 
   it('should update function configuration if configuration changed', async () => {
-    const { stdoutData } = await runServerless({
+    await runServerless({
       fixture: 'function',
       command: 'deploy function',
-      options: { function: 'foo' },
+      options: { function: 'basic' },
       awsRequestStubMap: {
         ...awsRequestStubMap,
         Lambda: {
@@ -576,6 +578,8 @@ describe('test/unit/lib/plugins/aws/deployFunction.test.js', () => {
             Configuration: {
               LastModified: '2020-05-20T15:34:16.494+0000',
               PackageType: 'Zip',
+              State: 'Active',
+              LastUpdateStatus: 'Successful',
             },
           },
         },
@@ -587,8 +591,8 @@ describe('test/unit/lib/plugins/aws/deployFunction.test.js', () => {
           },
         },
         functions: {
-          foo: {
-            awsKmsKeyArn: kmsKeyArn,
+          basic: {
+            kmsKeyArn,
             description,
             handler,
             environment: {
@@ -632,14 +636,13 @@ describe('test/unit/lib/plugins/aws/deployFunction.test.js', () => {
       },
       Layers: [layerArn, secondLayerArn],
     });
-    expect(stdoutData).to.include('Successfully updated function');
   });
 
   it('should skip updating properties that contain references', async () => {
-    const { stdoutData } = await runServerless({
+    await runServerless({
       fixture: 'function',
       command: 'deploy function',
-      options: { function: 'foo' },
+      options: { function: 'basic' },
       awsRequestStubMap: {
         ...awsRequestStubMap,
         Lambda: {
@@ -648,13 +651,15 @@ describe('test/unit/lib/plugins/aws/deployFunction.test.js', () => {
             Configuration: {
               LastModified: '2020-05-20T15:34:16.494+0000',
               PackageType: 'Zip',
+              State: 'Active',
+              LastUpdateStatus: 'Successful',
             },
           },
         },
       },
       configExt: {
         functions: {
-          foo: {
+          basic: {
             name: functionName,
             role,
             timeout,
@@ -674,21 +679,20 @@ describe('test/unit/lib/plugins/aws/deployFunction.test.js', () => {
 
     expect(updateFunctionConfigurationStub).to.be.calledWithExactly({
       FunctionName: functionName,
-      Handler: 'index.handler',
+      Handler: 'basic.handler',
       Timeout: timeout,
       VpcConfig: {
         SubnetIds: ['subnet-111', 'subnet-222'],
       },
       Role: role,
     });
-    expect(stdoutData).to.include('Successfully updated function');
   });
 
   it('should update function configuration with provider-level properties', async () => {
-    const { stdoutData } = await runServerless({
+    await runServerless({
       fixture: 'function',
       command: 'deploy function',
-      options: { function: 'foo' },
+      options: { function: 'basic' },
       awsRequestStubMap: {
         ...awsRequestStubMap,
         Lambda: {
@@ -697,6 +701,8 @@ describe('test/unit/lib/plugins/aws/deployFunction.test.js', () => {
             Configuration: {
               LastModified: '2020-05-20T15:34:16.494+0000',
               PackageType: 'Zip',
+              State: 'Active',
+              LastUpdateStatus: 'Successful',
             },
           },
         },
@@ -708,7 +714,7 @@ describe('test/unit/lib/plugins/aws/deployFunction.test.js', () => {
             VARIABLE: 'value',
           },
           memorySize,
-          role,
+          iam: { role },
           timeout,
           vpc: {
             securityGroupIds: ['sg-111', 'sg-222'],
@@ -716,7 +722,7 @@ describe('test/unit/lib/plugins/aws/deployFunction.test.js', () => {
           },
         },
         functions: {
-          foo: {
+          basic: {
             name: functionName,
           },
         },
@@ -725,7 +731,7 @@ describe('test/unit/lib/plugins/aws/deployFunction.test.js', () => {
 
     expect(updateFunctionConfigurationStub).to.be.calledWithExactly({
       FunctionName: functionName,
-      Handler: 'index.handler',
+      Handler: 'basic.handler',
       Environment: {
         Variables: {
           ANOTHERVAR: 'anothervalue',
@@ -740,14 +746,13 @@ describe('test/unit/lib/plugins/aws/deployFunction.test.js', () => {
         SubnetIds: ['subnet-111', 'subnet-222'],
       },
     });
-    expect(stdoutData).to.include('Successfully updated function');
   });
 
   it('should not update function configuration if configuration did not change', async () => {
-    const { stdoutData } = await runServerless({
+    await runServerless({
       fixture: 'function',
       command: 'deploy function',
-      options: { function: 'foo' },
+      options: { function: 'basic' },
       awsRequestStubMap: {
         ...awsRequestStubMap,
         Lambda: {
@@ -759,6 +764,9 @@ describe('test/unit/lib/plugins/aws/deployFunction.test.js', () => {
               KMSKeyArn: kmsKeyArn,
               Description: description,
               Handler: handler,
+              State: 'Active',
+              LastUpdateStatus: 'Successful',
+
               Environment: {
                 Variables: {
                   ANOTHERVAR: 'anothervalue',
@@ -776,7 +784,7 @@ describe('test/unit/lib/plugins/aws/deployFunction.test.js', () => {
               VpcConfig: {
                 VpcId: 'vpc-xxxx',
                 SecurityGroupIds: ['sg-111', 'sg-222'],
-                SubnetIds: ['subnet-111', 'subnet-222'],
+                SubnetIds: ['subnet-222', 'subnet-111'],
               },
             },
           },
@@ -789,8 +797,8 @@ describe('test/unit/lib/plugins/aws/deployFunction.test.js', () => {
           },
         },
         functions: {
-          foo: {
-            awsKmsKeyArn: kmsKeyArn,
+          basic: {
+            kmsKeyArn,
             description,
             handler,
             environment: {
@@ -812,109 +820,23 @@ describe('test/unit/lib/plugins/aws/deployFunction.test.js', () => {
     });
 
     expect(updateFunctionConfigurationStub).not.to.be.called;
-    expect(stdoutData).to.include(
-      'Configuration did not change. Skipping function configuration update.'
-    );
   });
 
-  it('configuration uses the "kmsKeyArn" instead of functionObj.awsKmsKeyArn', async () => {
+  it('configuration uses `provider.kmsKeyArn` if no `kmsKeyArn` provided on function level', async () => {
     await runServerless({
       fixture: 'function',
       command: 'deploy function',
-      options: { function: 'foo' },
+      options: { function: 'basic' },
       lastLifecycleHookName: 'deploy:function:deploy',
       awsRequestStubMap,
       configExt: {
-        functions: {
-          foo: {
-            handler: 'index.handler',
-            name: 'foobar',
-            awsKmsKeyArn: 'arn:aws:kms:us-east-1:oldKey',
-          },
-        },
         provider: {
-          kmsKeyArn: 'arn:aws:kms:us-east-1:newKey',
+          kmsKeyArn: 'arn:aws:kms:us-east-1:oldKey',
         },
-      },
-    });
-
-    sinon.assert.calledWith(updateFunctionConfigurationStub, {
-      Handler: 'index.handler',
-      FunctionName: 'foobar',
-      KMSKeyArn: 'arn:aws:kms:us-east-1:newKey',
-    });
-  });
-
-  it('configuration uses the "kmsKeyArn" instead of serviceObj.awsKmsKeyArn', async () => {
-    await runServerless({
-      fixture: 'function',
-      command: 'deploy function',
-      options: { function: 'foo' },
-      lastLifecycleHookName: 'deploy:function:deploy',
-      awsRequestStubMap,
-      configExt: {
         functions: {
-          foo: {
+          basic: {
             handler: 'index.handler',
             name: 'foobar',
-            kmsKeyArn: 'arn:aws:kms:us-east-1:newKey',
-          },
-        },
-        service: {
-          name: 'service',
-          awsKmsKeyArn: 'arn:aws:kms:us-east-1:oldKey',
-        },
-      },
-    });
-
-    sinon.assert.calledWith(updateFunctionConfigurationStub, {
-      Handler: 'index.handler',
-      FunctionName: 'foobar',
-      KMSKeyArn: 'arn:aws:kms:us-east-1:newKey',
-    });
-  });
-
-  it('configuration uses serviceObj.awsKmsKeyArn if no kmsKeyArn provided', async () => {
-    await runServerless({
-      fixture: 'function',
-      command: 'deploy function',
-      options: { function: 'foo' },
-      lastLifecycleHookName: 'deploy:function:deploy',
-      awsRequestStubMap,
-      configExt: {
-        functions: {
-          foo: {
-            handler: 'index.handler',
-            name: 'foobar',
-          },
-        },
-        service: {
-          name: 'service',
-          awsKmsKeyArn: 'arn:aws:kms:us-east-1:oldKey',
-        },
-      },
-    });
-
-    sinon.assert.calledWith(updateFunctionConfigurationStub, {
-      Handler: 'index.handler',
-      FunctionName: 'foobar',
-      KMSKeyArn: 'arn:aws:kms:us-east-1:oldKey',
-    });
-  });
-
-  it('configuration uses functionObj.awsKmsKeyArn and if kmsKeyArn not provided', async () => {
-    await runServerless({
-      fixture: 'function',
-      command: 'deploy function',
-      options: { function: 'foo' },
-      lastLifecycleHookName: 'deploy:function:deploy',
-      awsRequestStubMap,
-      configExt: {
-        functions: {
-          foo: {
-            handler: 'index.handler',
-            name: 'foobar',
-            awsKmsKeyArn: 'arn:aws:kms:us-east-1:oldKey',
           },
         },
       },
@@ -932,7 +854,7 @@ describe('test/unit/lib/plugins/aws/deployFunction.test.js', () => {
       runServerless({
         fixture: 'function',
         command: 'deploy function',
-        options: { function: 'foo' },
+        options: { function: 'basic' },
         lastLifecycleHookName: 'deploy:function:deploy',
         awsRequestStubMap: {
           ...awsRequestStubMap,
@@ -952,7 +874,7 @@ describe('test/unit/lib/plugins/aws/deployFunction.test.js', () => {
       runServerless({
         fixture: 'function',
         command: 'deploy function',
-        options: { function: 'foo' },
+        options: { function: 'basic' },
         lastLifecycleHookName: 'deploy:function:deploy',
         awsRequestStubMap: {
           ...awsRequestStubMap,
@@ -968,6 +890,45 @@ describe('test/unit/lib/plugins/aws/deployFunction.test.js', () => {
           },
         },
       })
-    ).to.be.eventually.rejectedWith('Please run "serverless deploy" to deploy your service');
+    ).to.be.eventually.rejected.and.have.property('code', 'FUNCTION_NOT_YET_DEPLOYED');
+  });
+
+  it('should handle situation where function is not immediately in desired state', async () => {
+    const successResponse = {
+      Configuration: {
+        LastModified: '2020-05-20T15:34:16.494+0000',
+        State: 'Active',
+        LastUpdateStatus: 'Successful',
+      },
+    };
+
+    const getFunctionStub = sinon
+      .stub()
+      .resolves(successResponse)
+      .onCall(1)
+      .resolves({
+        Configuration: {
+          LastModified: '2020-05-20T15:34:16.494+0000',
+          State: 'Active',
+          LastUpdateStatus: 'InProgress',
+        },
+      })
+      .onCall(2)
+      .resolves(successResponse);
+
+    await runServerless({
+      fixture: 'function',
+      command: 'deploy function',
+      options: { function: 'basic' },
+      lastLifecycleHookName: 'deploy:function:deploy',
+      awsRequestStubMap: {
+        ...awsRequestStubMap,
+        Lambda: {
+          ...awsRequestStubMap.Lambda,
+          getFunction: getFunctionStub,
+        },
+      },
+    });
+    expect(getFunctionStub).to.have.been.calledThrice;
   });
 });
diff --git a/test/unit/lib/plugins/aws/deployList.test.js b/test/unit/lib/plugins/aws/deploy-list.test.js
similarity index 72%
rename from test/unit/lib/plugins/aws/deployList.test.js
rename to test/unit/lib/plugins/aws/deploy-list.test.js
index 22b522c1e42..b56ad0f0903 100644
--- a/test/unit/lib/plugins/aws/deployList.test.js
+++ b/test/unit/lib/plugins/aws/deploy-list.test.js
@@ -2,9 +2,9 @@
 
 const sinon = require('sinon');
 const expect = require('chai').expect;
-const AwsDeployList = require('../../../../../lib/plugins/aws/deployList');
+const AwsDeployList = require('../../../../../lib/plugins/aws/deploy-list');
 const AwsProvider = require('../../../../../lib/plugins/aws/provider');
-const Serverless = require('../../../../../lib/Serverless');
+const Serverless = require('../../../../../lib/serverless');
 
 describe('AwsDeployList', () => {
   let serverless;
@@ -17,7 +17,7 @@ describe('AwsDeployList', () => {
       stage: 'dev',
       region: 'us-east-1',
     };
-    serverless = new Serverless();
+    serverless = new Serverless({ commands: [], options: {} });
     provider = new AwsProvider(serverless, options);
     serverless.setProvider('aws', provider);
     serverless.service.service = 'listDeployments';
@@ -25,9 +25,6 @@ describe('AwsDeployList', () => {
     s3Key = `${prefix}/${serverless.service.service}/${provider.getStage()}`;
     awsDeployList = new AwsDeployList(serverless, options);
     awsDeployList.bucketName = 'deployment-bucket';
-    awsDeployList.serverless.cli = {
-      log: sinon.spy(),
-    };
   });
 
   describe('#listDeployments()', () => {
@@ -45,10 +42,6 @@ describe('AwsDeployList', () => {
           Prefix: `${s3Key}`,
         })
       ).to.be.equal(true);
-      const infoText = "Couldn't find any existing deployments.";
-      expect(awsDeployList.serverless.cli.log.calledWithExactly(infoText)).to.be.equal(true);
-      const verifyText = 'Please verify that stage and region are correct.';
-      expect(awsDeployList.serverless.cli.log.calledWithExactly(verifyText)).to.be.equal(true);
       awsDeployList.provider.request.restore();
     });
 
@@ -72,16 +65,6 @@ describe('AwsDeployList', () => {
           Prefix: `${s3Key}`,
         })
       ).to.be.equal(true);
-      const infoText = 'Listing deployments:';
-      expect(awsDeployList.serverless.cli.log.calledWithExactly(infoText)).to.be.equal(true);
-      const timestampOne = 'Timestamp: 113304333331';
-      const datetimeOne = 'Datetime: 2016-08-18T13:40:06';
-      expect(awsDeployList.serverless.cli.log.calledWithExactly(timestampOne)).to.be.equal(true);
-      expect(awsDeployList.serverless.cli.log.calledWithExactly(datetimeOne)).to.be.equal(true);
-      const timestampTow = 'Timestamp: 903940390431';
-      const datetimeTwo = 'Datetime: 2016-08-18T23:42:08';
-      expect(awsDeployList.serverless.cli.log.calledWithExactly(timestampTow)).to.be.equal(true);
-      expect(awsDeployList.serverless.cli.log.calledWithExactly(datetimeTwo)).to.be.equal(true);
       awsDeployList.provider.request.restore();
     });
   });
@@ -223,35 +206,4 @@ describe('AwsDeployList', () => {
       expect(result).to.deep.equal(expectedResult);
     });
   });
-
-  describe('#displayFunctions()', () => {
-    const funcs = [
-      {
-        Versions: [{ FunctionName: 'listDeployments-dev-func-1', Version: '1337' }],
-      },
-      {
-        Versions: [
-          { FunctionName: 'listDeployments-dev-func-2', Version: '2' },
-          { FunctionName: 'listDeployments-dev-func-2', Version: '3' },
-          { FunctionName: 'listDeployments-dev-func-2', Version: '4' },
-          { FunctionName: 'listDeployments-dev-func-2', Version: '5' },
-          { FunctionName: 'listDeployments-dev-func-2', Version: '6' },
-          { FunctionName: 'listDeployments-dev-func-2', Version: '7' },
-        ],
-      },
-    ];
-
-    it('should display all the functions in the service together with their versions', () => {
-      const log = awsDeployList.serverless.cli.log;
-
-      awsDeployList.displayFunctions(funcs);
-      expect(log.calledWithExactly('Listing functions and their last 5 versions:')).to.be.equal(
-        true
-      );
-      expect(log.calledWithExactly('-------------')).to.be.equal(true);
-
-      expect(log.calledWithExactly('func-1: 1337')).to.be.equal(true);
-      expect(log.calledWithExactly('func-2: 3, 4, 5, 6, 7')).to.be.equal(true);
-    });
-  });
 });
diff --git a/test/unit/lib/plugins/aws/deploy/index.test.js b/test/unit/lib/plugins/aws/deploy/index.test.js
index 301ce7ffa64..2dfd4c3f02a 100644
--- a/test/unit/lib/plugins/aws/deploy/index.test.js
+++ b/test/unit/lib/plugins/aws/deploy/index.test.js
@@ -1,226 +1,14 @@
 'use strict';
 
-/* eslint-disable no-unused-expressions */
-
-const AwsProvider = require('../../../../../../lib/plugins/aws/provider');
-const AwsDeploy = require('../../../../../../lib/plugins/aws/deploy/index');
 const chai = require('chai');
-const Serverless = require('../../../../../../lib/Serverless');
 const sinon = require('sinon');
-const path = require('path');
 
 const runServerless = require('../../../../../utils/run-serverless');
 
-// Configure chai
 chai.use(require('chai-as-promised'));
 chai.use(require('sinon-chai'));
 const expect = require('chai').expect;
 
-describe('AwsDeploy', () => {
-  let awsDeploy;
-  let serverless;
-  let options;
-
-  beforeEach(() => {
-    serverless = new Serverless();
-    options = {
-      stage: 'dev',
-      region: 'us-east-1',
-    };
-    serverless.setProvider('aws', new AwsProvider(serverless, options));
-    serverless.serviceDir = 'foo';
-    awsDeploy = new AwsDeploy(serverless, options);
-  });
-
-  describe('#constructor()', () => {
-    it('should set the serverless instance', () => {
-      expect(awsDeploy.serverless).to.equal(serverless);
-    });
-
-    it('should set options', () => {
-      expect(awsDeploy.options).to.equal(options);
-    });
-
-    it('should set the service path if provided', () => {
-      expect(awsDeploy.servicePath).to.equal('foo');
-    });
-
-    it('should default to an empty service path if not provided', () => {
-      serverless.serviceDir = false;
-      awsDeploy = new AwsDeploy(serverless, options);
-
-      expect(awsDeploy.servicePath).to.equal('');
-    });
-
-    it('should use the options package path if provided', () => {
-      options.package = 'package-options';
-      awsDeploy = new AwsDeploy(serverless, options);
-
-      expect(awsDeploy.packagePath).to.equal('package-options');
-    });
-
-    it('should use the services package path if provided', () => {
-      serverless.service = {
-        package: {
-          path: 'package-service',
-        },
-      };
-      awsDeploy = new AwsDeploy(serverless, options);
-
-      expect(awsDeploy.packagePath).to.equal('package-service');
-    });
-
-    it('should default to the .serverless directory as the package path', () => {
-      expect(awsDeploy.packagePath).to.equal(path.join('foo', '.serverless'));
-    });
-
-    it('should set the provider variable to an instance of AwsProvider', () =>
-      expect(awsDeploy.provider).to.be.instanceof(AwsProvider));
-
-    it('should have commands', () => expect(awsDeploy.commands).to.be.not.empty);
-
-    it('should have hooks', () => expect(awsDeploy.hooks).to.be.not.empty);
-  });
-
-  describe('hooks', () => {
-    let spawnStub;
-
-    beforeEach(() => {
-      spawnStub = sinon.stub(serverless.pluginManager, 'spawn');
-    });
-
-    afterEach(() => {
-      serverless.pluginManager.spawn.restore();
-    });
-
-    describe('"before:deploy:deploy" hook', () => {
-      let extendedValidateStub;
-      let spawnPackageStub;
-      let spawnAwsCommonValidateStub;
-      let spawnAwsCommonMoveArtifactsToTemp;
-
-      beforeEach(() => {
-        extendedValidateStub = sinon.stub(awsDeploy, 'extendedValidate').resolves();
-        spawnPackageStub = spawnStub.withArgs('package').resolves();
-        spawnAwsCommonValidateStub = spawnStub.withArgs('aws:common:validate').resolves();
-        spawnAwsCommonMoveArtifactsToTemp = spawnStub
-          .withArgs('aws:common:moveArtifactsToTemp')
-          .resolves();
-      });
-
-      afterEach(() => {
-        awsDeploy.extendedValidate.restore();
-      });
-
-      it('should use the default packaging mechanism if no packaging config is provided', () => {
-        awsDeploy.options.package = false;
-        awsDeploy.serverless.service.package.path = false;
-
-        return awsDeploy.hooks['before:deploy:deploy']().then(() => {
-          expect(spawnAwsCommonValidateStub.calledOnce).to.equal(true);
-          expect(extendedValidateStub.calledAfter(spawnAwsCommonValidateStub)).to.equal(true);
-          expect(spawnAwsCommonMoveArtifactsToTemp.calledOnce).to.equal(false);
-        });
-      });
-
-      it('should move the artifacts to the tmp dir if options based config is provided', () => {
-        awsDeploy.options.package = true;
-        awsDeploy.serverless.service.package.path = false;
-
-        return awsDeploy.hooks['before:deploy:deploy']().then(() => {
-          expect(spawnAwsCommonValidateStub.calledOnce).to.equal(true);
-          expect(
-            spawnAwsCommonMoveArtifactsToTemp.calledAfter(spawnAwsCommonValidateStub)
-          ).to.equal(true);
-          expect(extendedValidateStub.calledAfter(spawnAwsCommonMoveArtifactsToTemp)).to.equal(
-            true
-          );
-          expect(spawnPackageStub.calledOnce).to.equal(false);
-        });
-      });
-
-      it('should move the artifacts to the tmp dir if service based config is provided', () => {
-        awsDeploy.options.package = false;
-        awsDeploy.serverless.service.package.path = true;
-
-        return awsDeploy.hooks['before:deploy:deploy']().then(() => {
-          expect(spawnAwsCommonValidateStub.calledOnce).to.equal(true);
-          expect(
-            spawnAwsCommonMoveArtifactsToTemp.calledAfter(spawnAwsCommonValidateStub)
-          ).to.equal(true);
-          expect(extendedValidateStub.calledAfter(spawnAwsCommonMoveArtifactsToTemp)).to.equal(
-            true
-          );
-          expect(spawnPackageStub.calledOnce).to.equal(false);
-        });
-      });
-    });
-
-    it('should run "deploy:finalize" hook', () => {
-      const spawnAwsDeployFinalizeStub = spawnStub.withArgs('aws:deploy:finalize').resolves();
-
-      return awsDeploy.hooks['deploy:finalize']().then(() => {
-        expect(spawnAwsDeployFinalizeStub.calledOnce).to.equal(true);
-      });
-    });
-
-    describe('"aws:deploy:finalize:cleanup" hook', () => {
-      let cleanupS3BucketStub;
-      let spawnAwsCommonCleanupTempDirStub;
-
-      beforeEach(() => {
-        cleanupS3BucketStub = sinon.stub(awsDeploy, 'cleanupS3Bucket').resolves();
-        spawnAwsCommonCleanupTempDirStub = spawnStub
-          .withArgs('aws:common:cleanupTempDir')
-          .resolves();
-      });
-
-      afterEach(() => {
-        awsDeploy.cleanupS3Bucket.restore();
-      });
-
-      it('should do the default cleanup if no packaging config is used', () => {
-        awsDeploy.options.package = false;
-        awsDeploy.serverless.service.package.path = false;
-
-        return awsDeploy.hooks['aws:deploy:finalize:cleanup']().then(() => {
-          expect(cleanupS3BucketStub.calledOnce).to.equal(true);
-          expect(spawnAwsCommonCleanupTempDirStub.calledOnce).to.equal(false);
-        });
-      });
-
-      it('should cleanup the tmp dir if options based packaging config is used', () => {
-        awsDeploy.options.package = true;
-        awsDeploy.serverless.service.package.path = false;
-
-        return awsDeploy.hooks['aws:deploy:finalize:cleanup']().then(() => {
-          expect(cleanupS3BucketStub.calledOnce).to.equal(true);
-          expect(spawnAwsCommonCleanupTempDirStub.calledAfter(cleanupS3BucketStub)).to.equal(true);
-        });
-      });
-
-      it('should cleanup the tmp dir if service based packaging config is used', () => {
-        awsDeploy.options.package = false;
-        awsDeploy.serverless.service.package.path = true;
-
-        return awsDeploy.hooks['aws:deploy:finalize:cleanup']().then(() => {
-          expect(cleanupS3BucketStub.calledOnce).to.equal(true);
-          expect(spawnAwsCommonCleanupTempDirStub.calledAfter(cleanupS3BucketStub)).to.equal(true);
-        });
-      });
-
-      it('should not cleanup if a deployment was not necessary', () => {
-        awsDeploy.serverless.service.provider.shouldNotDeploy = true;
-
-        return awsDeploy.hooks['aws:deploy:finalize:cleanup']().then(() => {
-          expect(cleanupS3BucketStub.called).to.equal(false);
-          expect(spawnAwsCommonCleanupTempDirStub.called).to.equal(false);
-        });
-      });
-    });
-  });
-});
-
 describe('test/unit/lib/plugins/aws/deploy/index.test.js', () => {
   const baseAwsRequestStubMap = {
     STS: {
@@ -233,6 +21,84 @@ describe('test/unit/lib/plugins/aws/deploy/index.test.js', () => {
     },
   };
 
+  it('with nonexistent stack - first deploy with custom deployment bucket', async () => {
+    const describeStacksStub = sinon
+      .stub()
+      .onFirstCall()
+      .throws('error', 'stack does not exist')
+      .onSecondCall()
+      .resolves({ Stacks: [{}] });
+    const createChangeSetStub = sinon.stub().resolves({});
+    const executeChangeSetStub = sinon.stub().resolves({});
+    const s3UploadStub = sinon.stub().resolves();
+    const deleteObjectsStub = sinon.stub().resolves({});
+    const awsRequestStubMap = {
+      ...baseAwsRequestStubMap,
+      ECR: {
+        describeRepositories: sinon.stub().throws({
+          providerError: { code: 'RepositoryNotFoundException' },
+        }),
+      },
+      S3: {
+        deleteObjects: deleteObjectsStub,
+        listObjectsV2: { Contents: [] },
+        upload: s3UploadStub,
+        headBucket: {},
+        getBucketLocation: () => {
+          return {
+            LocationConstraint: 'us-east-1',
+          };
+        },
+      },
+      CloudFormation: {
+        describeStacks: describeStacksStub,
+        createChangeSet: createChangeSetStub,
+        executeChangeSet: executeChangeSetStub,
+        deleteChangeSet: {},
+        describeChangeSet: {
+          ChangeSetName: 'new-service-dev-change-set',
+          ChangeSetId: 'some-change-set-id',
+          StackName: 'new-service-dev',
+          Status: 'CREATE_COMPLETE',
+        },
+        describeStackEvents: {
+          StackEvents: [
+            {
+              EventId: '1e2f3g4h',
+              StackName: 'new-service-dev',
+              LogicalResourceId: 'new-service-dev',
+              ResourceType: 'AWS::CloudFormation::Stack',
+              Timestamp: new Date(),
+              ResourceStatus: 'CREATE_COMPLETE',
+            },
+          ],
+        },
+        validateTemplate: {},
+        listStackResources: {},
+      },
+    };
+
+    await runServerless({
+      fixture: 'function',
+      command: 'deploy',
+      awsRequestStubMap,
+      configExt: {
+        provider: {
+          deploymentBucket: 'existing-s3-bucket',
+        },
+      },
+    });
+
+    expect(createChangeSetStub).to.be.calledOnce;
+    expect(createChangeSetStub.getCall(0).args[0].ChangeSetType).to.equal('CREATE');
+    expect(executeChangeSetStub).to.be.calledOnce;
+    const wasCloudFormationTemplateUploadInitiated = s3UploadStub.args.some((call) =>
+      call[0].Key.endsWith('compiled-cloudformation-template.json')
+    );
+    expect(wasCloudFormationTemplateUploadInitiated).to.be.true;
+    expect(deleteObjectsStub).not.to.be.called;
+  });
+
   it('with nonexistent stack - first deploy', async () => {
     const describeStacksStub = sinon
       .stub()
@@ -240,9 +106,9 @@ describe('test/unit/lib/plugins/aws/deploy/index.test.js', () => {
       .throws('error', 'stack does not exist')
       .onSecondCall()
       .resolves({ Stacks: [{}] });
-    const createStackStub = sinon.stub().resolves({});
+    const createChangeSetStub = sinon.stub().resolves({});
+    const executeChangeSetStub = sinon.stub().resolves({});
     const s3UploadStub = sinon.stub().resolves();
-    const updateStackStub = sinon.stub().resolves({});
     const deleteObjectsStub = sinon.stub().resolves({});
     const awsRequestStubMap = {
       ...baseAwsRequestStubMap,
@@ -255,10 +121,19 @@ describe('test/unit/lib/plugins/aws/deploy/index.test.js', () => {
         deleteObjects: deleteObjectsStub,
         listObjectsV2: { Contents: [] },
         upload: s3UploadStub,
+        headBucket: {},
       },
       CloudFormation: {
         describeStacks: describeStacksStub,
-        createStack: createStackStub,
+        createChangeSet: createChangeSetStub,
+        executeChangeSet: executeChangeSetStub,
+        deleteChangeSet: {},
+        describeChangeSet: {
+          ChangeSetName: 'new-service-dev-change-set',
+          ChangeSetId: 'some-change-set-id',
+          StackName: 'new-service-dev',
+          Status: 'CREATE_COMPLETE',
+        },
         describeStackEvents: {
           StackEvents: [
             {
@@ -275,7 +150,6 @@ describe('test/unit/lib/plugins/aws/deploy/index.test.js', () => {
           StackResourceDetail: { PhysicalResourceId: 's3-bucket-resource' },
         },
         validateTemplate: {},
-        updateStack: updateStackStub,
         listStackResources: {},
       },
     };
@@ -286,20 +160,22 @@ describe('test/unit/lib/plugins/aws/deploy/index.test.js', () => {
       awsRequestStubMap,
     });
 
-    expect(createStackStub).to.be.calledOnce;
+    expect(createChangeSetStub).to.be.calledTwice;
+    expect(createChangeSetStub.getCall(0).args[0].ChangeSetType).to.equal('CREATE');
+    expect(createChangeSetStub.getCall(1).args[0].ChangeSetType).to.equal('UPDATE');
+    expect(executeChangeSetStub).to.be.calledTwice;
     const wasCloudFormationTemplateUploadInitiated = s3UploadStub.args.some((call) =>
       call[0].Key.endsWith('compiled-cloudformation-template.json')
     );
     expect(wasCloudFormationTemplateUploadInitiated).to.be.true;
-    expect(updateStackStub).to.be.calledOnce;
     expect(deleteObjectsStub).not.to.be.called;
   });
 
   it('with existing stack - subsequent deploy', async () => {
     const s3BucketPrefix = 'serverless/test-aws-deploy-with-existing-stack/dev';
-    const createStackStub = sinon.stub().resolves({});
     const s3UploadStub = sinon.stub().resolves();
-    const updateStackStub = sinon.stub().resolves({});
+    const createChangeSetStub = sinon.stub().resolves({});
+    const executeChangeSetStub = sinon.stub().resolves({});
     const listObjectsV2Stub = sinon
       .stub()
       .onFirstCall()
@@ -333,10 +209,19 @@ describe('test/unit/lib/plugins/aws/deploy/index.test.js', () => {
         deleteObjects: deleteObjectsStub,
         listObjectsV2: listObjectsV2Stub,
         upload: s3UploadStub,
+        headBucket: {},
       },
       CloudFormation: {
         describeStacks: { Stacks: [{}] },
-        createStack: createStackStub,
+        deleteChangeSet: {},
+        createChangeSet: createChangeSetStub,
+        executeChangeSet: executeChangeSetStub,
+        describeChangeSet: {
+          ChangeSetName: 'new-service-dev-change-set',
+          ChangeSetId: 'some-change-set-id',
+          StackName: 'new-service-dev',
+          Status: 'CREATE_COMPLETE',
+        },
         describeStackEvents: {
           StackEvents: [
             {
@@ -353,7 +238,6 @@ describe('test/unit/lib/plugins/aws/deploy/index.test.js', () => {
           StackResourceDetail: { PhysicalResourceId: 's3-bucket-resource' },
         },
         validateTemplate: {},
-        updateStack: updateStackStub,
         listStackResources: {},
       },
     };
@@ -373,12 +257,13 @@ describe('test/unit/lib/plugins/aws/deploy/index.test.js', () => {
       },
     });
 
-    expect(createStackStub).to.not.be.called;
+    expect(createChangeSetStub).to.be.calledOnce;
+    expect(createChangeSetStub.getCall(0).args[0].ChangeSetType).to.equal('UPDATE');
+    expect(executeChangeSetStub).to.be.calledOnce;
     const wasCloudFormationTemplateUploadInitiated = s3UploadStub.args.some((call) =>
       call[0].Key.endsWith('compiled-cloudformation-template.json')
     );
     expect(wasCloudFormationTemplateUploadInitiated).to.be.true;
-    expect(updateStackStub).to.be.calledOnce;
     expect(deleteObjectsStub).to.be.calledWithExactly({
       Bucket: 's3-bucket-resource',
       Delete: {
@@ -392,24 +277,139 @@ describe('test/unit/lib/plugins/aws/deploy/index.test.js', () => {
     });
   });
 
+  it('with existing stack - subsequent deploy with empty changeset', async () => {
+    const createChangeSetStub = sinon.stub().resolves({});
+    const executeChangeSetStub = sinon.stub().resolves({});
+    const deleteChangeSetStub = sinon.stub().resolves();
+    const deleteObjectsStub = sinon.stub().resolves();
+    let objectsToRemove;
+    const listObjectsV2Stub = sinon
+      .stub()
+      .onFirstCall()
+      .resolves({ Contents: [] })
+      .onSecondCall()
+      .callsFake((params) => {
+        objectsToRemove = [
+          {
+            Key: `${params.Prefix}/compiled-cloudformation-template.json`,
+          },
+          {
+            Key: `${params.Prefix}/artifact.zip`,
+          },
+        ];
+        return {
+          Contents: objectsToRemove,
+        };
+      });
+    const awsRequestStubMap = {
+      ...baseAwsRequestStubMap,
+      ECR: {
+        describeRepositories: sinon.stub().throws({
+          providerError: { code: 'RepositoryNotFoundException' },
+        }),
+      },
+      S3: {
+        deleteObjects: deleteObjectsStub,
+        listObjectsV2: listObjectsV2Stub,
+        upload: {},
+        headBucket: {},
+      },
+      CloudFormation: {
+        describeStacks: { Stacks: [{}] },
+        deleteChangeSet: deleteChangeSetStub,
+        createChangeSet: createChangeSetStub,
+        executeChangeSet: executeChangeSetStub,
+        describeChangeSet: {
+          ChangeSetName: 'new-service-dev-change-set',
+          ChangeSetId: 'some-change-set-id',
+          StackName: 'new-service-dev',
+          Status: 'FAILED',
+          StatusReason: 'No updates are to be performed.',
+        },
+        describeStackResource: {
+          StackResourceDetail: { PhysicalResourceId: 's3-bucket-resource' },
+        },
+        validateTemplate: {},
+        listStackResources: {},
+      },
+    };
+
+    await runServerless({
+      fixture: 'function',
+      command: 'deploy',
+      awsRequestStubMap,
+    });
+
+    expect(createChangeSetStub).to.be.calledOnce;
+    expect(createChangeSetStub.getCall(0).args[0].ChangeSetType).to.equal('UPDATE');
+    expect(executeChangeSetStub).not.to.be.called;
+    expect(deleteChangeSetStub).to.be.calledTwice;
+    expect(deleteObjectsStub).to.be.calledWithExactly({
+      Bucket: 's3-bucket-resource',
+      Delete: { Objects: objectsToRemove },
+    });
+  });
+
+  it('should fail if cannot create a change set', async () => {
+    const awsRequestStubMap = {
+      ...baseAwsRequestStubMap,
+      ECR: {
+        describeRepositories: sinon.stub().throws({
+          providerError: { code: 'RepositoryNotFoundException' },
+        }),
+      },
+      S3: {
+        deleteObjects: {},
+        listObjectsV2: {},
+        upload: {},
+        headBucket: {},
+      },
+      CloudFormation: {
+        describeStacks: { Stacks: [{}] },
+        deleteChangeSet: {},
+        createChangeSet: {},
+        executeChangeSet: {},
+        describeChangeSet: {
+          ChangeSetName: 'new-service-dev-change-set',
+          ChangeSetId: 'some-change-set-id',
+          StackName: 'new-service-dev',
+          Status: 'FAILED',
+          StatusReason: 'Some internal reason',
+        },
+        describeStackResource: {
+          StackResourceDetail: { PhysicalResourceId: 's3-bucket-resource' },
+        },
+        validateTemplate: {},
+        listStackResources: {},
+      },
+    };
+
+    await expect(
+      runServerless({
+        fixture: 'function',
+        command: 'deploy',
+        awsRequestStubMap,
+      })
+    ).to.have.been.eventually.rejected.with.property(
+      'code',
+      'AWS_CLOUD_FORMATION_CHANGE_SET_CREATION_FAILED'
+    );
+  });
+
   it('with existing stack - should skip deploy if nothing changed', async () => {
-    const createStackStub = sinon.stub().resolves({});
     const s3UploadStub = sinon.stub().resolves();
-    const updateStackStub = sinon.stub().resolves({});
 
     const listObjectsV2Stub = sinon.stub().resolves({
       Contents: [
         {
-          Key:
-            'serverless/test-package-artifact/dev/1589988704359-2020-05-20T15:31:44.359Z/compiled-cloudformation-template.json',
+          Key: 'serverless/test-package-artifact/dev/1589988704359-2020-05-20T15:31:44.359Z/compiled-cloudformation-template.json',
           LastModified: new Date(),
           ETag: '"5102a4cf710cae6497dba9e61b85d0a4"',
           Size: 356,
           StorageClass: 'STANDARD',
         },
         {
-          Key:
-            'serverless/test-package-artifact/dev/1589988704359-2020-05-20T15:31:44.359Z/my-own.zip',
+          Key: 'serverless/test-package-artifact/dev/1589988704359-2020-05-20T15:31:44.359Z/my-own.zip',
           LastModified: new Date(),
           ETag: '"5102a4cf710cae6497dba9e61b85d0a4"',
           Size: 356,
@@ -421,8 +421,7 @@ describe('test/unit/lib/plugins/aws/deploy/index.test.js', () => {
     s3HeadObjectStub
       .withArgs({
         Bucket: 's3-bucket-resource',
-        Key:
-          'serverless/test-package-artifact/dev/1589988704359-2020-05-20T15:31:44.359Z/compiled-cloudformation-template.json',
+        Key: 'serverless/test-package-artifact/dev/1589988704359-2020-05-20T15:31:44.359Z/compiled-cloudformation-template.json',
       })
       .returns({
         Metadata: { filesha256: 'qxp+iwSTMhcRUfHzka4AE4XAWawS8GnEyBh1WpGb7Vw=' },
@@ -430,8 +429,7 @@ describe('test/unit/lib/plugins/aws/deploy/index.test.js', () => {
     s3HeadObjectStub
       .withArgs({
         Bucket: 's3-bucket-resource',
-        Key:
-          'serverless/test-package-artifact/dev/1589988704359-2020-05-20T15:31:44.359Z/my-own.zip',
+        Key: 'serverless/test-package-artifact/dev/1589988704359-2020-05-20T15:31:44.359Z/my-own.zip',
       })
       .returns({
         Metadata: { filesha256: 'T0qEYHOE4Xv2E8Ar03xGogAlElcdf/dQh/lh9ao7Glo=' },
@@ -443,10 +441,10 @@ describe('test/unit/lib/plugins/aws/deploy/index.test.js', () => {
         headObject: s3HeadObjectStub,
         listObjectsV2: listObjectsV2Stub,
         upload: s3UploadStub,
+        headBucket: {},
       },
       CloudFormation: {
         describeStacks: { Stacks: [{}] },
-        createStack: createStackStub,
         describeStackEvents: {
           StackEvents: [
             {
@@ -463,13 +461,12 @@ describe('test/unit/lib/plugins/aws/deploy/index.test.js', () => {
           StackResourceDetail: { PhysicalResourceId: 's3-bucket-resource' },
         },
         validateTemplate: {},
-        updateStack: updateStackStub,
         listStackResources: {},
       },
     };
 
     const { serverless } = await runServerless({
-      fixture: 'packageArtifactInServerlessDir',
+      fixture: 'package-artifact-in-serverless-dir',
       command: 'deploy',
       awsRequestStubMap,
       configExt: {
@@ -479,8 +476,364 @@ describe('test/unit/lib/plugins/aws/deploy/index.test.js', () => {
     });
 
     expect(serverless.service.provider.shouldNotDeploy).to.be.true;
-    expect(createStackStub).to.not.be.called;
-    expect(updateStackStub).to.not.be.called;
     expect(s3UploadStub).to.not.be.called;
   });
+
+  it('with existing stack - missing custom deployment bucket', async () => {
+    const awsRequestStubMap = {
+      ...baseAwsRequestStubMap,
+      ECR: {
+        describeRepositories: sinon.stub().throws({
+          providerError: { code: 'RepositoryNotFoundException' },
+        }),
+      },
+      S3: {
+        getBucketLocation: () => {
+          throw new Error();
+        },
+      },
+      CloudFormation: {
+        describeStacks: { Stacks: [{}] },
+        validateTemplate: {},
+      },
+    };
+
+    await expect(
+      runServerless({
+        fixture: 'function',
+        command: 'deploy',
+        awsRequestStubMap,
+        lastLifecycleHookName: 'aws:deploy:deploy:checkForChanges',
+        configExt: {
+          provider: {
+            deploymentBucket: 'bucket-name',
+          },
+        },
+      })
+    ).to.eventually.have.been.rejected.and.have.property('code', 'DEPLOYMENT_BUCKET_NOT_FOUND');
+  });
+
+  it('with existing stack - with custom deployment bucket in different region', async () => {
+    const awsRequestStubMap = {
+      ...baseAwsRequestStubMap,
+      ECR: {
+        describeRepositories: sinon.stub().throws({
+          providerError: { code: 'RepositoryNotFoundException' },
+        }),
+      },
+      S3: {
+        getBucketLocation: () => {
+          return {
+            LocationConstraint: 'us-west-1',
+          };
+        },
+      },
+      CloudFormation: {
+        describeStacks: { Stacks: [{}] },
+        validateTemplate: {},
+      },
+    };
+
+    await expect(
+      runServerless({
+        fixture: 'function',
+        command: 'deploy',
+        awsRequestStubMap,
+        lastLifecycleHookName: 'aws:deploy:deploy:checkForChanges',
+        configExt: {
+          provider: {
+            deploymentBucket: 'bucket-name',
+          },
+        },
+      })
+    ).to.eventually.have.been.rejected.and.have.property(
+      'code',
+      'DEPLOYMENT_BUCKET_INVALID_REGION'
+    );
+  });
+
+  it('with existing stack - with deployment bucket from CloudFormation deleted manually', async () => {
+    const awsRequestStubMap = {
+      ...baseAwsRequestStubMap,
+      ECR: {
+        describeRepositories: sinon.stub().throws({
+          providerError: { code: 'RepositoryNotFoundException' },
+        }),
+      },
+      S3: {
+        headBucket: () => {
+          const err = new Error();
+          err.code = 'AWS_S3_HEAD_BUCKET_NOT_FOUND';
+          throw err;
+        },
+      },
+      CloudFormation: {
+        describeStacks: { Stacks: [{}] },
+        validateTemplate: {},
+        describeStackResource: {
+          StackResourceDetail: { PhysicalResourceId: 's3-bucket-resource' },
+        },
+      },
+    };
+
+    await expect(
+      runServerless({
+        fixture: 'function',
+        command: 'deploy',
+        awsRequestStubMap,
+        lastLifecycleHookName: 'aws:deploy:deploy:checkForChanges',
+      })
+    ).to.eventually.have.been.rejected.and.have.property(
+      'code',
+      'DEPLOYMENT_BUCKET_REMOVED_MANUALLY'
+    );
+  });
+
+  it('with existing stack - with deployment bucket resource missing from CloudFormation template', async () => {
+    const createChangeSetStub = sinon.stub().resolves({});
+    const executeChangeSetStub = sinon.stub().resolves({});
+    const describeStackResourceStub = sinon
+      .stub()
+      .onFirstCall()
+      .throws(() => {
+        const err = new Error('does not exist for stack');
+        err.providerError = {
+          code: 'ValidationError',
+        };
+        return err;
+      })
+      .onSecondCall()
+      .resolves({
+        StackResourceDetail: { PhysicalResourceId: 's3-bucket-resource' },
+      });
+
+    const awsRequestStubMap = {
+      ...baseAwsRequestStubMap,
+      ECR: {
+        describeRepositories: sinon.stub().throws({
+          providerError: { code: 'RepositoryNotFoundException' },
+        }),
+      },
+      S3: {
+        listObjectsV2: { Contents: [] },
+        headBucket: () => {
+          const err = new Error();
+          err.code = 'AWS_S3_HEAD_BUCKET_NOT_FOUND';
+          throw err;
+        },
+      },
+      CloudFormation: {
+        describeStacks: { Stacks: [{}] },
+        validateTemplate: {},
+        deleteChangeSet: {},
+        createChangeSet: createChangeSetStub,
+        executeChangeSet: executeChangeSetStub,
+        describeChangeSet: {
+          ChangeSetName: 'new-service-dev-change-set',
+          ChangeSetId: 'some-change-set-id',
+          StackName: 'new-service-dev',
+          Status: 'CREATE_COMPLETE',
+        },
+        getTemplate: () => {
+          return {
+            TemplateBody: JSON.stringify({}),
+          };
+        },
+        describeStackEvents: {
+          StackEvents: [
+            {
+              EventId: '1e2f3g4h',
+              StackName: 'new-service-dev',
+              LogicalResourceId: 'new-service-dev',
+              ResourceType: 'AWS::CloudFormation::Stack',
+              Timestamp: new Date(),
+              ResourceStatus: 'UPDATE_COMPLETE',
+            },
+          ],
+        },
+        describeStackResource: describeStackResourceStub,
+      },
+    };
+
+    const { serverless, awsNaming } = await runServerless({
+      fixture: 'function',
+      command: 'deploy',
+      awsRequestStubMap,
+      lastLifecycleHookName: 'aws:deploy:deploy:checkForChanges',
+    });
+
+    expect(createChangeSetStub).to.be.calledWithExactly({
+      StackName: awsNaming.getStackName(),
+      ChangeSetName: awsNaming.getStackChangeSetName(),
+      ChangeSetType: 'UPDATE',
+      Capabilities: ['CAPABILITY_IAM', 'CAPABILITY_NAMED_IAM'],
+      Parameters: [],
+      Tags: [{ Key: 'STAGE', Value: 'dev' }],
+      TemplateBody: JSON.stringify({
+        Resources: serverless.service.provider.coreCloudFormationTemplate.Resources,
+        Outputs: serverless.service.provider.coreCloudFormationTemplate.Outputs,
+      }),
+    });
+    expect(executeChangeSetStub).to.be.calledWithExactly({
+      StackName: awsNaming.getStackName(),
+      ChangeSetName: awsNaming.getStackChangeSetName(),
+    });
+  });
+
+  describe('custom deployment-related properties', () => {
+    let createChangeSetStub;
+    let executeChangeSetStub;
+    const deploymentRole = 'arn:xxx';
+    const notificationArns = ['arn:xxx', 'arn:yyy'];
+    const stackParameters = [
+      {
+        ParameterKey: 'key',
+        ParameterValue: 'val',
+      },
+      {
+        ParameterKey: 'key2',
+        ParameterValue: 'val2',
+      },
+    ];
+
+    const stackPolicy = [
+      {
+        Effect: 'Allow',
+        Principal: '*',
+        Action: ['Update:*'],
+        Resource: '*',
+      },
+    ];
+
+    const rollbackConfiguration = {
+      MonitoringTimeInMinutes: 20,
+    };
+
+    const disableRollback = true;
+    const stackTags = {
+      TAG: 'value',
+      ANOTHERTAG: 'anotherval',
+    };
+
+    before(async () => {
+      const describeStacksStub = sinon
+        .stub()
+        .onFirstCall()
+        .throws('error', 'stack does not exist')
+        .onSecondCall()
+        .resolves({ Stacks: [{}] });
+      createChangeSetStub = sinon.stub().resolves({});
+      executeChangeSetStub = sinon.stub().resolves({});
+      const awsRequestStubMap = {
+        ...baseAwsRequestStubMap,
+        ECR: {
+          describeRepositories: sinon.stub().throws({
+            providerError: { code: 'RepositoryNotFoundException' },
+          }),
+        },
+        S3: {
+          deleteObjects: {},
+          listObjectsV2: { Contents: [] },
+          upload: {},
+          headBucket: {},
+        },
+        CloudFormation: {
+          describeStacks: describeStacksStub,
+          createChangeSet: createChangeSetStub,
+          executeChangeSet: executeChangeSetStub,
+          deleteChangeSet: {},
+          describeChangeSet: {
+            ChangeSetName: 'new-service-dev-change-set',
+            ChangeSetId: 'some-change-set-id',
+            StackName: 'new-service-dev',
+            Status: 'CREATE_COMPLETE',
+          },
+          describeStackEvents: {
+            StackEvents: [
+              {
+                EventId: '1e2f3g4h',
+                StackName: 'new-service-dev',
+                LogicalResourceId: 'new-service-dev',
+                ResourceType: 'AWS::CloudFormation::Stack',
+                Timestamp: new Date(),
+                ResourceStatus: 'CREATE_COMPLETE',
+              },
+            ],
+          },
+          describeStackResource: {
+            StackResourceDetail: { PhysicalResourceId: 's3-bucket-resource' },
+          },
+          validateTemplate: {},
+          listStackResources: {},
+        },
+      };
+
+      await runServerless({
+        fixture: 'function',
+        command: 'deploy',
+        awsRequestStubMap,
+        configExt: {
+          provider: {
+            notificationArns,
+            rollbackConfiguration,
+            stackParameters,
+            stackPolicy,
+            stackTags,
+            disableRollback,
+            iam: {
+              deploymentRole,
+            },
+          },
+        },
+      });
+    });
+
+    it('should support custom deployment role', () => {
+      expect(createChangeSetStub.getCall(0).args[0].RoleARN).to.equal(deploymentRole);
+      expect(createChangeSetStub.getCall(1).args[0].RoleARN).to.equal(deploymentRole);
+    });
+
+    it('should support `notificationsArns`', () => {
+      expect(createChangeSetStub.getCall(0).args[0].NotificationARNs).to.deep.equal(
+        notificationArns
+      );
+      expect(createChangeSetStub.getCall(1).args[0].NotificationARNs).to.deep.equal(
+        notificationArns
+      );
+    });
+
+    it('should support `stackParameters`', () => {
+      expect(createChangeSetStub.getCall(1).args[0].Parameters).to.deep.equal(stackParameters);
+    });
+
+    it('should support `stackPolicy`', () => {
+      expect(createChangeSetStub.getCall(1).args[0].StackPolicyBody).to.deep.equal(
+        JSON.stringify({ Statement: stackPolicy })
+      );
+    });
+
+    it('should support `rollbackConfiguration`', () => {
+      expect(createChangeSetStub.getCall(1).args[0].RollbackConfiguration).to.deep.equal(
+        rollbackConfiguration
+      );
+    });
+
+    it('should support `disableRollback`', () => {
+      expect(executeChangeSetStub.getCall(0).args[0].DisableRollback).to.be.true;
+      expect(executeChangeSetStub.getCall(1).args[0].DisableRollback).to.be.true;
+    });
+
+    it('should support `stackTags`', () => {
+      expect(createChangeSetStub.getCall(0).args[0].Tags).to.deep.equal([
+        { Key: 'STAGE', Value: 'dev' },
+        { Key: 'TAG', Value: 'value' },
+        { Key: 'ANOTHERTAG', Value: 'anotherval' },
+      ]);
+      expect(createChangeSetStub.getCall(1).args[0].Tags).to.deep.equal([
+        { Key: 'STAGE', Value: 'dev' },
+        { Key: 'TAG', Value: 'value' },
+        { Key: 'ANOTHERTAG', Value: 'anotherval' },
+      ]);
+    });
+  });
 });
diff --git a/test/unit/lib/plugins/aws/deploy/lib/checkForChanges.test.js b/test/unit/lib/plugins/aws/deploy/lib/check-for-changes.test.js
similarity index 79%
rename from test/unit/lib/plugins/aws/deploy/lib/checkForChanges.test.js
rename to test/unit/lib/plugins/aws/deploy/lib/check-for-changes.test.js
index 3fcd3ecf5cd..34ace24e1b7 100644
--- a/test/unit/lib/plugins/aws/deploy/lib/checkForChanges.test.js
+++ b/test/unit/lib/plugins/aws/deploy/lib/check-for-changes.test.js
@@ -9,10 +9,10 @@ const globby = require('globby');
 const sandbox = require('sinon');
 const chai = require('chai');
 const proxyquire = require('proxyquire');
-const normalizeFiles = require('../../../../../../../lib/plugins/aws/lib/normalizeFiles');
+const normalizeFiles = require('../../../../../../../lib/plugins/aws/lib/normalize-files');
 const AwsProvider = require('../../../../../../../lib/plugins/aws/provider');
 const AwsDeploy = require('../../../../../../../lib/plugins/aws/deploy/index');
-const Serverless = require('../../../../../../../lib/Serverless');
+const Serverless = require('../../../../../../../lib/serverless');
 const ServerlessError = require('../../../../../../../lib/serverless-error');
 const runServerless = require('../../../../../../utils/run-serverless');
 
@@ -33,7 +33,7 @@ describe('checkForChanges', () => {
       stage: 'dev',
       region: 'us-east-1',
     };
-    serverless = new Serverless();
+    serverless = new Serverless({ commands: [], options: {} });
     serverless.serviceDir = 'my-service';
     provider = new AwsProvider(serverless, options);
     serverless.setProvider('aws', provider);
@@ -44,7 +44,6 @@ describe('checkForChanges', () => {
       foo: 'bar',
     };
     s3Key = `serverless/${serverless.service.service}/${provider.getStage()}`;
-    awsDeploy.serverless.cli = { log: sandbox.spy() };
     cryptoStub = {
       createHash() {
         return this;
@@ -55,7 +54,7 @@ describe('checkForChanges', () => {
       digest: sandbox.stub(),
     };
     const checkForChanges = proxyquire(
-      '../../../../../../../lib/plugins/aws/deploy/lib/checkForChanges.js',
+      '../../../../../../../lib/plugins/aws/deploy/lib/check-for-changes.js',
       {
         crypto: cryptoStub,
       }
@@ -262,7 +261,6 @@ describe('checkForChanges', () => {
         expect(normalizeCloudFormationTemplateStub).to.not.have.been.called;
         expect(globbySyncStub).to.not.have.been.called;
         expect(readFileStub).to.not.have.been.called;
-        expect(awsDeploy.serverless.cli.log).to.not.have.been.called;
       }));
 
     it('should resolve if no objects are provided as input', () => {
@@ -272,7 +270,6 @@ describe('checkForChanges', () => {
         expect(normalizeCloudFormationTemplateStub).to.not.have.been.called;
         expect(globbySyncStub).to.not.have.been.called;
         expect(readFileStub).to.not.have.been.called;
-        expect(awsDeploy.serverless.cli.log).to.not.have.been.called;
       });
     });
 
@@ -286,7 +283,6 @@ describe('checkForChanges', () => {
         expect(normalizeCloudFormationTemplateStub).to.have.been.calledOnce;
         expect(globbySyncStub).to.have.been.calledOnce;
         expect(readFileStub).to.have.been.calledOnce;
-        expect(awsDeploy.serverless.cli.log).to.not.have.been.called;
         expect(normalizeCloudFormationTemplateStub).to.have.been.calledWithExactly(
           awsDeploy.serverless.service.provider.compiledCloudFormationTemplate
         );
@@ -321,7 +317,6 @@ describe('checkForChanges', () => {
         expect(normalizeCloudFormationTemplateStub).to.have.been.calledOnce;
         expect(globbySyncStub).to.have.been.calledOnce;
         expect(readFileStub).to.have.been.calledOnce;
-        expect(awsDeploy.serverless.cli.log).to.not.have.been.called;
         expect(normalizeCloudFormationTemplateStub).to.have.been.calledWithExactly(
           awsDeploy.serverless.service.provider.compiledCloudFormationTemplate
         );
@@ -351,7 +346,6 @@ describe('checkForChanges', () => {
         expect(normalizeCloudFormationTemplateStub).to.have.been.calledOnce;
         expect(globbySyncStub).to.have.been.calledOnce;
         expect(readFileStub).to.have.been.calledOnce;
-        expect(awsDeploy.serverless.cli.log).to.not.have.been.called;
         expect(normalizeCloudFormationTemplateStub).to.have.been.calledWithExactly(
           awsDeploy.serverless.service.provider.compiledCloudFormationTemplate
         );
@@ -383,7 +377,6 @@ describe('checkForChanges', () => {
         expect(normalizeCloudFormationTemplateStub).to.have.been.calledOnce;
         expect(globbySyncStub).to.have.been.calledOnce;
         expect(readFileStub).to.have.been.calledTwice;
-        expect(awsDeploy.serverless.cli.log).to.not.have.been.called;
         expect(normalizeCloudFormationTemplateStub).to.have.been.calledWithExactly(
           awsDeploy.serverless.service.provider.compiledCloudFormationTemplate
         );
@@ -420,7 +413,6 @@ describe('checkForChanges', () => {
         expect(normalizeCloudFormationTemplateStub).to.have.been.calledOnce;
         expect(globbySyncStub).to.have.been.calledOnce;
         expect(readFileStub).to.have.been.calledOnce;
-        expect(awsDeploy.serverless.cli.log).to.not.have.been.called;
         expect(normalizeCloudFormationTemplateStub).to.have.been.calledWithExactly(
           awsDeploy.serverless.service.provider.compiledCloudFormationTemplate
         );
@@ -450,7 +442,6 @@ describe('checkForChanges', () => {
         expect(normalizeCloudFormationTemplateStub).to.have.been.calledOnce;
         expect(globbySyncStub).to.have.been.calledOnce;
         expect(readFileStub).to.have.been.calledOnce;
-        expect(awsDeploy.serverless.cli.log).to.have.been.calledOnce;
         expect(normalizeCloudFormationTemplateStub).to.have.been.calledWithExactly(
           awsDeploy.serverless.service.provider.compiledCloudFormationTemplate
         );
@@ -484,7 +475,6 @@ describe('checkForChanges', () => {
           expect(normalizeCloudFormationTemplateStub).to.have.been.calledOnce;
           expect(globbySyncStub).to.have.been.calledOnce;
           expect(readFileStub).to.have.been.calledOnce;
-          expect(awsDeploy.serverless.cli.log).to.have.been.calledOnce;
           expect(normalizeCloudFormationTemplateStub).to.have.been.calledWithExactly(
             awsDeploy.serverless.service.provider.compiledCloudFormationTemplate
           );
@@ -518,7 +508,6 @@ describe('checkForChanges', () => {
         expect(normalizeCloudFormationTemplateStub).to.have.been.calledOnce;
         expect(globbySyncStub).to.have.been.calledOnce;
         expect(readFileStub).to.have.been.calledTwice;
-        expect(awsDeploy.serverless.cli.log).to.have.been.calledOnce;
         expect(normalizeCloudFormationTemplateStub).to.have.been.calledWithExactly(
           awsDeploy.serverless.service.provider.compiledCloudFormationTemplate
         );
@@ -555,7 +544,6 @@ describe('checkForChanges', () => {
         expect(normalizeCloudFormationTemplateStub).to.have.been.calledOnce;
         expect(globbySyncStub).to.have.been.calledOnce;
         expect(readFileStub).to.have.been.calledOnce;
-        expect(awsDeploy.serverless.cli.log).not.to.be.called;
         expect(normalizeCloudFormationTemplateStub).to.have.been.calledWithExactly(
           awsDeploy.serverless.service.provider.compiledCloudFormationTemplate
         );
@@ -576,7 +564,7 @@ describe('checkForChanges', () => {
 describe('checkForChanges #2', () => {
   it('Should recognize package.artifact', () =>
     runServerless({
-      fixture: 'packageArtifact',
+      fixture: 'package-artifact',
       command: 'deploy',
       env: { AWS_CONTAINER_CREDENTIALS_FULL_URI: 'ignore' },
       lastLifecycleHookName: 'aws:deploy:deploy:checkForChanges',
@@ -601,8 +589,7 @@ describe('checkForChanges #2', () => {
           listObjectsV2: {
             Contents: [
               {
-                Key:
-                  'serverless/test-package-artifact/dev/1589988704359-2020-05-20T15:31:44.359Z/artifact.zip',
+                Key: 'serverless/test-package-artifact/dev/1589988704359-2020-05-20T15:31:44.359Z/artifact.zip',
                 LastModified: new Date(),
                 ETag: '"5102a4cf710cae6497dba9e61b85d0a4"',
                 Size: 356,
@@ -610,6 +597,7 @@ describe('checkForChanges #2', () => {
               },
             ],
           },
+          headBucket: {},
         },
         STS: {
           getCallerIdentity: {
@@ -694,7 +682,7 @@ describe('test/unit/lib/plugins/aws/deploy/lib/checkForChanges.test.js', () => {
 
     let serverless;
     await runServerless({
-      fixture: 'checkForChanges',
+      fixture: 'check-for-changes',
       command: 'deploy',
       lastLifecycleHookName: 'aws:deploy:deploy:checkForChanges',
       env: { AWS_CONTAINER_CREDENTIALS_FULL_URI: 'ignore' },
@@ -730,7 +718,7 @@ describe('test/unit/lib/plugins/aws/deploy/lib/checkForChanges.test.js', () => {
 
     let serverless;
     await runServerless({
-      fixture: 'checkForChanges',
+      fixture: 'check-for-changes',
       command: 'deploy',
       options: { force: true },
       lastLifecycleHookName: 'aws:deploy:deploy:checkForChanges',
@@ -787,7 +775,7 @@ describe('test/unit/lib/plugins/aws/deploy/lib/checkForChanges.test.js', () => {
 
     let serverless;
     await runServerless({
-      fixture: 'checkForChanges',
+      fixture: 'check-for-changes',
       command: 'deploy',
       lastLifecycleHookName: 'aws:deploy:deploy:checkForChanges',
       env: { AWS_CONTAINER_CREDENTIALS_FULL_URI: 'ignore' },
@@ -818,7 +806,7 @@ describe('test/unit/lib/plugins/aws/deploy/lib/checkForChanges.test.js', () => {
 
     let serverless;
     await runServerless({
-      fixture: 'checkForChanges',
+      fixture: 'check-for-changes',
       command: 'deploy',
       lastLifecycleHookName: 'aws:deploy:deploy:checkForChanges',
       env: { AWS_CONTAINER_CREDENTIALS_FULL_URI: 'ignore' },
@@ -848,7 +836,7 @@ describe('test/unit/lib/plugins/aws/deploy/lib/checkForChanges.test.js', () => {
     const {
       fixtureData: { updateConfig, servicePath: serviceDir },
     } = await runServerless({
-      fixture: 'checkForChanges',
+      fixture: 'check-for-changes',
       command: 'package',
     });
 
@@ -886,7 +874,7 @@ describe('test/unit/lib/plugins/aws/deploy/lib/checkForChanges.test.js', () => {
 
     let serverless;
     await runServerless({
-      fixture: 'checkForChanges',
+      fixture: 'check-for-changes',
       command: 'deploy',
       lastLifecycleHookName: 'aws:deploy:deploy:checkForChanges',
       env: { AWS_CONTAINER_CREDENTIALS_FULL_URI: 'ignore' },
@@ -915,7 +903,7 @@ describe('test/unit/lib/plugins/aws/deploy/lib/checkForChanges.test.js', () => {
 
     let serverless;
     await runServerless({
-      fixture: 'checkForChanges',
+      fixture: 'check-for-changes',
       command: 'deploy',
       configExt: {
         package: { individually: true },
@@ -948,7 +936,7 @@ describe('test/unit/lib/plugins/aws/deploy/lib/checkForChanges.test.js', () => {
 
     let serverless;
     await runServerless({
-      fixture: 'checkForChanges',
+      fixture: 'check-for-changes',
       command: 'deploy',
       configExt: {
         package: { individually: true },
@@ -982,7 +970,7 @@ describe('test/unit/lib/plugins/aws/deploy/lib/checkForChanges.test.js', () => {
 
     let serverless;
     await runServerless({
-      fixture: 'checkForChanges',
+      fixture: 'check-for-changes',
       command: 'deploy',
       configExt: {
         package: { artifact: 'artifact.zip' },
@@ -1013,7 +1001,7 @@ describe('test/unit/lib/plugins/aws/deploy/lib/checkForChanges.test.js', () => {
     // TODO: Reconfigure to rely on generateMatchingListObjectsResponse and generateMatchingHeadObjectResponse utils
 
     const { serverless } = await runServerless({
-      fixture: 'packageArtifactInServerlessDir',
+      fixture: 'package-artifact-in-serverless-dir',
       command: 'deploy',
       configExt: {
         // runServerless by default makes this: `test-${fixtureName}-${TIME_BASED_HASH}`
@@ -1035,14 +1023,14 @@ describe('test/unit/lib/plugins/aws/deploy/lib/checkForChanges.test.js', () => {
           },
         },
         S3: {
+          headBucket: {},
           headObject: (() => {
             const headObjectStub = sandbox.stub();
 
             headObjectStub
               .withArgs({
                 Bucket: 'deployment-bucket',
-                Key:
-                  'serverless/test-package-artifact/dev/1589988704359-2020-05-20T15:31:44.359Z/compiled-cloudformation-template.json',
+                Key: 'serverless/test-package-artifact/dev/1589988704359-2020-05-20T15:31:44.359Z/compiled-cloudformation-template.json',
               })
               .returns({
                 Metadata: { filesha256: 'pZOdrt6qijT7ITsLQjPP9QwgMAfKA2RuUUSTW+l8wWs=' },
@@ -1051,8 +1039,7 @@ describe('test/unit/lib/plugins/aws/deploy/lib/checkForChanges.test.js', () => {
             headObjectStub
               .withArgs({
                 Bucket: 'deployment-bucket',
-                Key:
-                  'serverless/test-package-artifact/dev/1589988704359-2020-05-20T15:31:44.359Z/my-own.zip',
+                Key: 'serverless/test-package-artifact/dev/1589988704359-2020-05-20T15:31:44.359Z/my-own.zip',
               })
               .returns({
                 Metadata: { filesha256: 'T0qEYHOE4Xv2E8Ar03xGogAlElcdf/dQh/lh9ao7Glo=' },
@@ -1063,16 +1050,14 @@ describe('test/unit/lib/plugins/aws/deploy/lib/checkForChanges.test.js', () => {
           listObjectsV2: {
             Contents: [
               {
-                Key:
-                  'serverless/test-package-artifact/dev/1589988704359-2020-05-20T15:31:44.359Z/compiled-cloudformation-template.json',
+                Key: 'serverless/test-package-artifact/dev/1589988704359-2020-05-20T15:31:44.359Z/compiled-cloudformation-template.json',
                 LastModified: new Date(),
                 ETag: '"5102a4cf710cae6497dba9e61b85d0a4"',
                 Size: 356,
                 StorageClass: 'STANDARD',
               },
               {
-                Key:
-                  'serverless/test-package-artifact/dev/1589988704359-2020-05-20T15:31:44.359Z/my-own.zip',
+                Key: 'serverless/test-package-artifact/dev/1589988704359-2020-05-20T15:31:44.359Z/my-own.zip',
                 LastModified: new Date(),
                 ETag: '"5102a4cf710cae6497dba9e61b85d0a4"',
                 Size: 356,
@@ -1086,36 +1071,13 @@ describe('test/unit/lib/plugins/aws/deploy/lib/checkForChanges.test.js', () => {
     expect(serverless.service.provider.shouldNotDeploy).to.equal(true);
   });
 
-  it('should print a warning if missing lambda:GetFunction permission', async () => {
-    const { stdoutData } = await runServerless({
-      fixture: 'checkForChanges',
-      command: 'deploy',
-      lastLifecycleHookName: 'aws:deploy:deploy:checkForChanges',
-      awsRequestStubMap: {
-        ...commonAwsSdkMock,
-        Lambda: {
-          getFunction: sandbox.stub().throws({ providerError: { statusCode: 403 } }),
-        },
-        S3: {
-          listObjectsV2: {},
-        },
-      },
-    });
-    expect(stdoutData).to.include(
-      [
-        'WARNING: Not authorized to perform: lambda:GetFunction for at least one of the lambda functions.',
-        ' Deployment will not be skipped even if service files did not change. ',
-      ].join('')
-    );
-  });
-
   it.skip('TODO: should crash meaningfully if bucket does not exist', () => {
     // Replaces:
     // https://github.com/serverless/serverless/blob/11fb14115ea47d53a61fa666a94e60d585fb3a4d/test/unit/lib/plugins/aws/deploy/lib/checkForChanges.test.js#L137-L149
 
     return expect(
       runServerless({
-        fixture: 'checkForChanges',
+        fixture: 'check-for-changes',
         command: 'deploy',
         lastLifecycleHookName: 'aws:deploy:deploy:checkForChanges',
         env: { AWS_CONTAINER_CREDENTIALS_FULL_URI: 'ignore' },
@@ -1139,7 +1101,7 @@ describe('test/unit/lib/plugins/aws/deploy/lib/checkForChanges.test.js', () => {
 
     return expect(
       runServerless({
-        fixture: 'checkForChanges',
+        fixture: 'check-for-changes',
         command: 'deploy',
         lastLifecycleHookName: 'aws:deploy:deploy:checkForChanges',
         env: { AWS_CONTAINER_CREDENTIALS_FULL_URI: 'ignore' },
@@ -1162,7 +1124,7 @@ describe('test/unit/lib/plugins/aws/deploy/lib/checkForChanges.test.js', () => {
       const deleteStub = sandbox.stub();
       let serverless;
       await runServerless({
-        fixture: 'checkForChanges',
+        fixture: 'check-for-changes',
         command: 'deploy',
         configExt: {
           functions: { fn1: { events: [{ cloudwatchLog: 'someLogGroupName' }] } },
@@ -1180,6 +1142,28 @@ describe('test/unit/lib/plugins/aws/deploy/lib/checkForChanges.test.js', () => {
           S3: {
             listObjectsV2: async () => generateMatchingListObjectsResponse(serverless),
             headObject: async (params) => generateMatchingHeadObjectResponse(serverless, params),
+            headBucket: {},
+          },
+          CloudFormation: {
+            ...commonAwsSdkMock.CloudFormation,
+            describeStackResource: sandbox
+              .stub()
+              .onFirstCall()
+              .resolves({
+                StackResourceDetail: { PhysicalResourceId: 'deployment-bucket' },
+              })
+              .callsFake(async (params) => {
+                const naming = serverless.getProvider('aws').naming;
+                return {
+                  StackResourceDetail: {
+                    StackName: naming.getStackName(),
+                    LogicalResourceId: params.LogicalResourceId,
+                    PhysicalResourceId: `${naming.getStackName()}-${
+                      params.LogicalResourceId
+                    }-xxxxx`,
+                  },
+                };
+              }),
           },
           CloudWatchLogs: {
             deleteSubscriptionFilter: deleteStub,
@@ -1206,11 +1190,11 @@ describe('test/unit/lib/plugins/aws/deploy/lib/checkForChanges.test.js', () => {
       expect(deleteStub).to.not.have.been.called;
     });
 
-    it('should attempt to delete filter for old destination', async () => {
+    it('should not attempt to delete filter for 2 subscription filter per log group include externals', async () => {
       const deleteStub = sandbox.stub();
       let serverless;
       await runServerless({
-        fixture: 'checkForChanges',
+        fixture: 'check-for-changes',
         command: 'deploy',
         configExt: {
           functions: { fn1: { events: [{ cloudwatchLog: 'someLogGroupName' }] } },
@@ -1228,6 +1212,24 @@ describe('test/unit/lib/plugins/aws/deploy/lib/checkForChanges.test.js', () => {
           S3: {
             listObjectsV2: async () => generateMatchingListObjectsResponse(serverless),
             headObject: async (params) => generateMatchingHeadObjectResponse(serverless, params),
+            headBucket: {},
+          },
+          CloudFormation: {
+            ...commonAwsSdkMock.CloudFormation,
+            describeStackResource: sandbox
+              .stub()
+              .onFirstCall()
+              .resolves({
+                StackResourceDetail: { PhysicalResourceId: 'deployment-bucket' },
+              })
+              .callsFake(async (params) => {
+                const naming = serverless.getProvider('aws').naming;
+                throw new Error(
+                  `Resource ${
+                    params.LogicalResourceId
+                  } does not exist for stack ${naming.getStackName()}`
+                );
+              }),
           },
           CloudWatchLogs: {
             deleteSubscriptionFilter: deleteStub,
@@ -1238,7 +1240,7 @@ describe('test/unit/lib/plugins/aws/deploy/lib/checkForChanges.test.js', () => {
                   {
                     // destinationArn `arn:{partition}:lambda:{region}:{accountId}:function:{functionName}`
                     // filterName {stack name}-{logical id}-{random alphanumeric characters}
-                    filterName: `${naming.getStackName()}-${naming.getCloudWatchLogLogicalId(
+                    filterName: `external-stack-dev-${naming.getCloudWatchLogLogicalId(
                       'Fn1',
                       1
                     )}-xxxxx`,
@@ -1251,14 +1253,167 @@ describe('test/unit/lib/plugins/aws/deploy/lib/checkForChanges.test.js', () => {
           },
         },
       });
-      expect(deleteStub).to.have.been.calledOnce;
+      expect(deleteStub).to.not.have.been.called;
+    });
+
+    it('should throw an error if external defined subscription filter cause over 2 subscription filter per log group.', async () => {
+      const deleteStub = sandbox.stub();
+      let serverless;
+      const promise = runServerless({
+        fixture: 'check-for-changes',
+        command: 'deploy',
+        configExt: {
+          functions: {
+            fn1: {
+              events: [
+                { cloudwatchLog: 'someLogGroupName' },
+                { cloudwatchLog: 'someLogGroupName' },
+              ],
+            },
+          },
+        },
+        lastLifecycleHookName: 'aws:deploy:deploy:checkForChanges',
+        env: { AWS_CONTAINER_CREDENTIALS_FULL_URI: 'ignore' },
+        hooks: {
+          beforeInstanceInit: (serverlessInstance) => (serverless = serverlessInstance),
+        },
+        awsRequestStubMap: {
+          ...commonAwsSdkMock,
+          Lambda: {
+            getFunction: { Configuration: { LastModified: '2021-05-20T15:34:16.494+0000' } },
+          },
+          S3: {
+            listObjectsV2: async () => generateMatchingListObjectsResponse(serverless),
+            headObject: async (params) => generateMatchingHeadObjectResponse(serverless, params),
+            headBucket: {},
+          },
+          CloudFormation: {
+            ...commonAwsSdkMock.CloudFormation,
+            describeStackResource: sandbox
+              .stub()
+              .onFirstCall()
+              .resolves({
+                StackResourceDetail: { PhysicalResourceId: 'deployment-bucket' },
+              })
+              .callsFake(async (params) => {
+                const naming = serverless.getProvider('aws').naming;
+                throw new Error(
+                  `Resource ${
+                    params.LogicalResourceId
+                  } does not exist for stack ${naming.getStackName()}`
+                );
+              }),
+          },
+          CloudWatchLogs: {
+            deleteSubscriptionFilter: deleteStub,
+            describeSubscriptionFilters: async () => {
+              const naming = serverless.getProvider('aws').naming;
+              return {
+                subscriptionFilters: [
+                  {
+                    // destinationArn `arn:{partition}:lambda:{region}:{accountId}:function:{functionName}`
+                    // filterName {stack name}-{logical id}-{random alphanumeric characters}
+                    filterName: `external-stack-dev-${naming.getCloudWatchLogLogicalId(
+                      'Fn1',
+                      1
+                    )}-xxxxx`,
+                    destinationArn:
+                      'arn:aws:lambda:us-east-1:999999999999:function:test-checkForChanges-cdr3ogg-dev-fn1',
+                  },
+                ],
+              };
+            },
+          },
+        },
+      });
+
+      await expect(promise).to.eventually.be.rejected.and.have.property(
+        'code',
+        'CLOUDWATCHLOG_LOG_GROUP_EVENT_PER_FUNCTION_LIMIT_EXCEEDED'
+      );
+    });
+
+    it('should attempt to delete subscription filter not match as any of new subscription filter', async () => {
+      const deleteStub = sandbox.stub();
+      let serverless;
+      const { awsNaming } = await runServerless({
+        fixture: 'check-for-changes',
+        command: 'deploy',
+        configExt: {
+          functions: { fn1: { events: [{ cloudwatchLog: 'someLogGroupName' }] } },
+        },
+        lastLifecycleHookName: 'aws:deploy:deploy:checkForChanges',
+        env: { AWS_CONTAINER_CREDENTIALS_FULL_URI: 'ignore' },
+        hooks: {
+          beforeInstanceInit: (serverlessInstance) => (serverless = serverlessInstance),
+        },
+        awsRequestStubMap: {
+          ...commonAwsSdkMock,
+          Lambda: {
+            getFunction: { Configuration: { LastModified: '2021-05-20T15:34:16.494+0000' } },
+          },
+          S3: {
+            listObjectsV2: async () => generateMatchingListObjectsResponse(serverless),
+            headObject: async (params) => generateMatchingHeadObjectResponse(serverless, params),
+            headBucket: {},
+          },
+          CloudFormation: {
+            ...commonAwsSdkMock.CloudFormation,
+            describeStackResource: sandbox
+              .stub()
+              .onFirstCall()
+              .resolves({
+                StackResourceDetail: { PhysicalResourceId: 'deployment-bucket' },
+              })
+              .callsFake(async (params) => {
+                const naming = serverless.getProvider('aws').naming;
+                return {
+                  StackResourceDetail: {
+                    StackName: naming.getStackName(),
+                    LogicalResourceId: params.LogicalResourceId,
+                    PhysicalResourceId: `${naming.getStackName()}-${
+                      params.LogicalResourceId
+                    }-xxxxx`,
+                  },
+                };
+              }),
+          },
+          CloudWatchLogs: {
+            deleteSubscriptionFilter: deleteStub,
+            describeSubscriptionFilters: async () => {
+              const naming = serverless.getProvider('aws').naming;
+              return {
+                subscriptionFilters: [
+                  {
+                    // destinationArn `arn:{partition}:lambda:{region}:{accountId}:function:{functionName}`
+                    // filterName {stack name}-{logical id}-{random alphanumeric characters}
+                    filterName: `${naming.getStackName()}-${naming.getCloudWatchLogLogicalId(
+                      'Fn2',
+                      1
+                    )}-xxxxx`,
+                    destinationArn:
+                      'arn:aws:lambda:us-east-1:999999999999:function:test-checkForChanges-cdr3ogg-dev-fn1',
+                  },
+                ],
+              };
+            },
+          },
+        },
+      });
+      expect(deleteStub).to.have.been.calledOnceWith({
+        logGroupName: 'someLogGroupName',
+        filterName: `${awsNaming.getStackName()}-${awsNaming.getCloudWatchLogLogicalId(
+          'Fn2',
+          1
+        )}-xxxxx`,
+      });
     });
 
     it('should attempt to delete filter if order of cloudwatch events changed', async () => {
       const deleteStub = sandbox.stub();
       let serverless;
       const { awsNaming } = await runServerless({
-        fixture: 'checkForChanges',
+        fixture: 'check-for-changes',
         command: 'deploy',
         configExt: {
           functions: {
@@ -1283,6 +1438,28 @@ describe('test/unit/lib/plugins/aws/deploy/lib/checkForChanges.test.js', () => {
           S3: {
             listObjectsV2: async () => generateMatchingListObjectsResponse(serverless),
             headObject: async (params) => generateMatchingHeadObjectResponse(serverless, params),
+            headBucket: {},
+          },
+          CloudFormation: {
+            ...commonAwsSdkMock.CloudFormation,
+            describeStackResource: sandbox
+              .stub()
+              .onFirstCall()
+              .resolves({
+                StackResourceDetail: { PhysicalResourceId: 'deployment-bucket' },
+              })
+              .callsFake(async (params) => {
+                const naming = serverless.getProvider('aws').naming;
+                return {
+                  StackResourceDetail: {
+                    StackName: naming.getStackName(),
+                    LogicalResourceId: params.LogicalResourceId,
+                    PhysicalResourceId: `${naming.getStackName()}-${
+                      params.LogicalResourceId
+                    }-xxxxx`,
+                  },
+                };
+              }),
           },
           CloudWatchLogs: {
             deleteSubscriptionFilter: deleteStub,
@@ -1290,6 +1467,7 @@ describe('test/unit/lib/plugins/aws/deploy/lib/checkForChanges.test.js', () => {
               .stub()
               .onFirstCall()
               .callsFake(async () => {
+                const functionName = serverless.service.getFunction('fn1').name;
                 const naming = serverless.getProvider('aws').naming;
                 return {
                   subscriptionFilters: [
@@ -1298,27 +1476,24 @@ describe('test/unit/lib/plugins/aws/deploy/lib/checkForChanges.test.js', () => {
                         'Fn1',
                         1
                       )}-xxxxx`,
-                      destinationArn: `arn:aws:lambda:us-east-1:999999999999:function:${
-                        serverless.service.getFunction('fn1').name
-                      }`,
+                      destinationArn: `arn:aws:lambda:us-east-1:999999999999:function:${functionName}`,
                     },
                   ],
                 };
               })
               .onSecondCall()
               .callsFake(async () => {
+                const functionName = serverless.service.getFunction('fn1').name;
                 const naming = serverless.getProvider('aws').naming;
                 return {
                   subscriptionFilters: [
                     {
-                      // someLogGroupeName2 was previously the third event
+                      // someLogGroupeName2 was previously the first event
                       filterName: `${naming.getStackName()}-${naming.getCloudWatchLogLogicalId(
                         'Fn1',
                         1
                       )}-xxxxx`,
-                      destinationArn: `arn:aws:lambda:us-east-1:999999999999:function:${
-                        serverless.service.getFunction('fn1').name
-                      }`,
+                      destinationArn: `arn:aws:lambda:us-east-1:999999999999:function:${functionName}`,
                     },
                   ],
                 };
@@ -1335,11 +1510,112 @@ describe('test/unit/lib/plugins/aws/deploy/lib/checkForChanges.test.js', () => {
       });
     });
 
+    it('should attempt to delete multiple filters', async () => {
+      const deleteStub = sandbox.stub();
+      let serverless;
+      const { awsNaming } = await runServerless({
+        fixture: 'check-for-changes',
+        command: 'deploy',
+        configExt: {
+          functions: {
+            fn1: {
+              events: [
+                { cloudwatchLog: 'someLogGroupName' },
+                { cloudwatchLog: 'someLogGroupName' },
+              ],
+            },
+          },
+        },
+        lastLifecycleHookName: 'aws:deploy:deploy:checkForChanges',
+        env: { AWS_CONTAINER_CREDENTIALS_FULL_URI: 'ignore' },
+        hooks: {
+          beforeInstanceInit: (serverlessInstance) => (serverless = serverlessInstance),
+        },
+        awsRequestStubMap: {
+          ...commonAwsSdkMock,
+          Lambda: {
+            getFunction: { Configuration: { LastModified: '2021-05-20T15:34:16.494+0000' } },
+          },
+          S3: {
+            listObjectsV2: async () => generateMatchingListObjectsResponse(serverless),
+            headObject: async (params) => generateMatchingHeadObjectResponse(serverless, params),
+            headBucket: {},
+          },
+          CloudFormation: {
+            ...commonAwsSdkMock.CloudFormation,
+            describeStackResource: sandbox
+              .stub()
+              .onFirstCall()
+              .resolves({
+                StackResourceDetail: { PhysicalResourceId: 'deployment-bucket' },
+              })
+              .callsFake(async (params) => {
+                const naming = serverless.getProvider('aws').naming;
+                return {
+                  StackResourceDetail: {
+                    StackName: naming.getStackName(),
+                    LogicalResourceId: params.LogicalResourceId,
+                    PhysicalResourceId: `${naming.getStackName()}-${
+                      params.LogicalResourceId
+                    }-xxxxx`,
+                  },
+                };
+              }),
+          },
+          CloudWatchLogs: {
+            deleteSubscriptionFilter: deleteStub,
+            describeSubscriptionFilters: sandbox
+              .stub()
+              .onFirstCall()
+              .callsFake(async () => {
+                const naming = serverless.getProvider('aws').naming;
+                return {
+                  subscriptionFilters: [
+                    {
+                      filterName: `${naming.getStackName()}-${naming.getCloudWatchLogLogicalId(
+                        'Fn2',
+                        1
+                      )}-xxxxx`,
+                      destinationArn:
+                        'arn:aws:lambda:us-east-1:999999999999:function:test-checkForChanges-cdr3ogg-dev-fn2',
+                    },
+                    {
+                      filterName: `${naming.getStackName()}-${naming.getCloudWatchLogLogicalId(
+                        'Fn2',
+                        2
+                      )}-xxxxx`,
+                      destinationArn:
+                        'arn:aws:lambda:us-east-1:999999999999:function:test-checkForChanges-cdr3ogg-dev-fn2',
+                    },
+                  ],
+                };
+              }),
+          },
+        },
+      });
+
+      expect(deleteStub).to.have.been.calledTwice;
+      expect(deleteStub).to.have.been.calledWith({
+        logGroupName: 'someLogGroupName',
+        filterName: `${awsNaming.getStackName()}-${awsNaming.getCloudWatchLogLogicalId(
+          'Fn2',
+          1
+        )}-xxxxx`,
+      });
+      expect(deleteStub).to.have.been.calledWith({
+        logGroupName: 'someLogGroupName',
+        filterName: `${awsNaming.getStackName()}-${awsNaming.getCloudWatchLogLogicalId(
+          'Fn2',
+          2
+        )}-xxxxx`,
+      });
+    });
+
     it('should recognize custom partition', async () => {
       const deleteStub = sandbox.stub();
       let serverless;
       await runServerless({
-        fixture: 'checkForChanges',
+        fixture: 'check-for-changes',
         command: 'deploy',
         configExt: {
           functions: { fn1: { events: [{ cloudwatchLog: 'someLogGroupName' }] } },
@@ -1365,6 +1641,7 @@ describe('test/unit/lib/plugins/aws/deploy/lib/checkForChanges.test.js', () => {
           S3: {
             listObjectsV2: async () => generateMatchingListObjectsResponse(serverless),
             headObject: async (params) => generateMatchingHeadObjectResponse(serverless, params),
+            headBucket: {},
           },
           CloudWatchLogs: {
             describeSubscriptionFilters: sandbox.stub().callsFake(async () => {
diff --git a/test/unit/lib/plugins/aws/deploy/lib/cleanupS3Bucket.test.js b/test/unit/lib/plugins/aws/deploy/lib/cleanup-s3-bucket.test.js
similarity index 98%
rename from test/unit/lib/plugins/aws/deploy/lib/cleanupS3Bucket.test.js
rename to test/unit/lib/plugins/aws/deploy/lib/cleanup-s3-bucket.test.js
index c6039cf8518..decb6f9f8cd 100644
--- a/test/unit/lib/plugins/aws/deploy/lib/cleanupS3Bucket.test.js
+++ b/test/unit/lib/plugins/aws/deploy/lib/cleanup-s3-bucket.test.js
@@ -6,7 +6,7 @@ const sinon = require('sinon');
 const chai = require('chai');
 const AwsProvider = require('../../../../../../../lib/plugins/aws/provider');
 const AwsDeploy = require('../../../../../../../lib/plugins/aws/deploy/index');
-const Serverless = require('../../../../../../../lib/Serverless');
+const Serverless = require('../../../../../../../lib/serverless');
 
 chai.use(require('chai-as-promised'));
 chai.use(require('sinon-chai'));
@@ -24,7 +24,7 @@ describe('cleanupS3Bucket', () => {
       stage: 'dev',
       region: 'us-east-1',
     };
-    serverless = new Serverless();
+    serverless = new Serverless({ commands: [], options: {} });
     serverless.serviceDir = 'foo';
     provider = new AwsProvider(serverless, options);
     serverless.setProvider('aws', provider);
diff --git a/test/unit/lib/plugins/aws/deploy/lib/createStack.test.js b/test/unit/lib/plugins/aws/deploy/lib/createStack.test.js
deleted file mode 100644
index 804d35650ae..00000000000
--- a/test/unit/lib/plugins/aws/deploy/lib/createStack.test.js
+++ /dev/null
@@ -1,296 +0,0 @@
-'use strict';
-
-const chai = require('chai');
-const sandbox = require('sinon');
-const path = require('path');
-const AwsProvider = require('../../../../../../../lib/plugins/aws/provider');
-const AwsDeploy = require('../../../../../../../lib/plugins/aws/deploy/index');
-const Serverless = require('../../../../../../../lib/Serverless');
-const ServerlessError = require('../../../../../../../lib/serverless-error');
-const { getTmpDirPath } = require('../../../../../../utils/fs');
-const runServerless = require('../../../../../../utils/run-serverless');
-
-chai.use(require('chai-as-promised'));
-chai.use(require('sinon-chai'));
-const expect = require('chai').expect;
-
-describe('createStack', () => {
-  let awsDeploy;
-  const tmpDirPath = getTmpDirPath();
-
-  const serverlessYmlPath = path.join(tmpDirPath, 'serverless.yml');
-  const serverlessYml = {
-    service: 'first-service',
-    provider: 'aws',
-    functions: {
-      first: {
-        handler: 'sample.handler',
-      },
-    },
-  };
-
-  beforeEach(() => {
-    const serverless = new Serverless();
-    serverless.setProvider('aws', new AwsProvider(serverless, {}));
-    serverless.utils.writeFileSync(serverlessYmlPath, serverlessYml);
-    serverless.serviceDir = tmpDirPath;
-    const options = {
-      stage: 'dev',
-      region: 'us-east-1',
-    };
-    awsDeploy = new AwsDeploy(serverless, options);
-    awsDeploy.serverless.service.service = `service-${new Date().getTime().toString()}`;
-    awsDeploy.serverless.cli = new serverless.classes.CLI();
-  });
-
-  describe('#create()', () => {
-    it('should include custom stack tags', () => {
-      awsDeploy.serverless.service.provider.stackTags = { STAGE: 'overridden', tag1: 'value1' };
-
-      const createStackStub = sandbox.stub(awsDeploy.provider, 'request').resolves();
-      sandbox.stub(awsDeploy, 'monitorStack').resolves();
-
-      return awsDeploy.create().then(() => {
-        expect(createStackStub.args[0][2].Tags).to.deep.equal([
-          { Key: 'STAGE', Value: 'overridden' },
-          { Key: 'tag1', Value: 'value1' },
-        ]);
-      });
-    });
-
-    it('should override the default tags custom stack tags (case-insensitive)', () => {
-      awsDeploy.serverless.service.provider.stackTags = { stage: 'overridden', tag1: 'value1' };
-
-      const createStackStub = sandbox.stub(awsDeploy.provider, 'request').resolves();
-      sandbox.stub(awsDeploy, 'monitorStack').resolves();
-
-      return awsDeploy.create().then(() => {
-        expect(createStackStub.args[0][2].Tags).to.deep.equal([
-          { Key: 'stage', Value: 'overridden' },
-          { Key: 'tag1', Value: 'value1' },
-        ]);
-      });
-    });
-
-    it('should add CAPABILITY_AUTO_EXPAND if a Transform directive is specified', () => {
-      awsDeploy.serverless.service.provider.compiledCloudFormationTemplate = {
-        Transform: 'MyMacro',
-      };
-
-      const createStackStub = sandbox.stub(awsDeploy.provider, 'request').resolves();
-      sandbox.stub(awsDeploy, 'monitorStack').resolves();
-
-      return awsDeploy.create().then(() => {
-        expect(createStackStub.args[0][2].Capabilities).to.contain('CAPABILITY_AUTO_EXPAND');
-      });
-    });
-
-    it('should use use notificationArns if it is specified', () => {
-      const mytopicArn = 'arn:aws:sns::123456789012:mytopic';
-      awsDeploy.serverless.service.provider.notificationArns = [mytopicArn];
-
-      const createStackStub = sandbox.stub(awsDeploy.provider, 'request').resolves();
-      sandbox.stub(awsDeploy, 'monitorStack').resolves();
-
-      return awsDeploy.create().then(() => {
-        expect(createStackStub.args[0][2].NotificationARNs).to.deep.equal([mytopicArn]);
-        awsDeploy.provider.request.restore();
-        awsDeploy.monitorStack.restore();
-      });
-    });
-  });
-
-  describe('#createStack()', () => {
-    it('should resolve if stack already created', () => {
-      const createStub = sandbox.stub(awsDeploy, 'create').resolves();
-
-      sandbox.stub(awsDeploy.provider, 'request').resolves();
-
-      return awsDeploy.createStack().then(() => {
-        expect(createStub.called).to.be.equal(false);
-      });
-    });
-
-    it('should throw error if invalid stack name', async () => {
-      sandbox.stub(awsDeploy, 'create').resolves();
-      sandbox.stub(awsDeploy.provider, 'request').resolves();
-      awsDeploy.serverless.service.service = 'service-name'.repeat(100);
-
-      await expect(awsDeploy.createStack()).to.eventually.be.rejected.and.have.property(
-        'code',
-        'INVALID_STACK_NAME_ERROR'
-      );
-    });
-
-    it('should set the createLater flag and resolve if deployment bucket is provided', async () => {
-      awsDeploy.serverless.service.provider.deploymentBucket = 'serverless';
-      sandbox.stub(awsDeploy.provider, 'request').rejects(new Error('does not exist'));
-
-      await awsDeploy.createStack();
-      expect(awsDeploy.createLater).to.be.true;
-    });
-
-    it('should throw error if describeStackResources fails for other reason than not found', async () => {
-      const errorMock = new ServerlessError('Something went wrong');
-
-      sandbox.stub(awsDeploy.provider, 'request').rejects(errorMock);
-      sandbox.stub(awsDeploy, 'create').resolves();
-
-      await expect(awsDeploy.createStack()).to.eventually.be.rejectedWith(errorMock);
-    });
-
-    it('should run promise chain in order', () => {
-      const errorMock = {
-        message: 'does not exist',
-      };
-
-      sandbox.stub(awsDeploy.provider, 'request').rejects(errorMock);
-
-      const createStub = sandbox.stub(awsDeploy, 'create').resolves();
-
-      return awsDeploy.createStack().then(() => {
-        expect(createStub.calledOnce).to.be.true;
-      });
-    });
-
-    it('should disable S3 Transfer Acceleration if missing Output', () => {
-      const disableTransferAccelerationStub = sandbox
-        .stub(awsDeploy.provider, 'disableTransferAccelerationForCurrentDeploy')
-        .resolves();
-
-      const describeStacksOutput = {
-        Stacks: [
-          {
-            Outputs: [],
-          },
-        ],
-      };
-      sandbox.stub(awsDeploy.provider, 'request').resolves(describeStacksOutput);
-
-      awsDeploy.provider.options['aws-s3-accelerate'] = true;
-
-      return awsDeploy.createStack().then(() => {
-        expect(disableTransferAccelerationStub.calledOnce).to.be.true;
-      });
-    });
-
-    it('should not disable S3 Transfer Acceleration if custom bucket is used', () => {
-      const disableTransferAccelerationStub = sandbox
-        .stub(awsDeploy.provider, 'disableTransferAccelerationForCurrentDeploy')
-        .resolves();
-
-      const describeStacksOutput = {
-        Stacks: [
-          {
-            Outputs: [],
-          },
-        ],
-      };
-      sandbox.stub(awsDeploy.provider, 'request').resolves(describeStacksOutput);
-
-      awsDeploy.provider.options['aws-s3-accelerate'] = true;
-      awsDeploy.serverless.service.provider.deploymentBucket = 'my-custom-bucket';
-
-      return awsDeploy.createStack().then(() => {
-        expect(disableTransferAccelerationStub.called).to.be.false;
-      });
-    });
-  });
-});
-
-describe('createStack #2', () => {
-  const createStackStub = sandbox.stub().resolves({});
-  const describeStacksStub = sandbox
-    .stub()
-    .onFirstCall()
-    .throws('error', 'stack does not exist')
-    .onSecondCall()
-    .resolves({ Stacks: [{}] });
-
-  afterEach(() => {
-    createStackStub.resetHistory();
-    describeStacksStub.resetHistory();
-  });
-
-  const awsRequestStubMap = {
-    STS: {
-      getCallerIdentity: {
-        ResponseMetadata: { RequestId: 'ffffffff-ffff-ffff-ffff-ffffffffffff' },
-        UserId: 'XXXXXXXXXXXXXXXXXXXXX',
-        Account: '999999999999',
-        Arn: 'arn:aws:iam::999999999999:user/test',
-      },
-    },
-    ECR: {
-      describeRepositories: sandbox.stub().throws({
-        providerError: { code: 'RepositoryNotFoundException' },
-      }),
-    },
-    S3: {
-      deleteObjects: {},
-      listObjectsV2: { Contents: [] },
-      upload: {},
-    },
-    CloudFormation: {
-      describeStacks: describeStacksStub,
-      createStack: createStackStub,
-      describeStackEvents: {
-        StackEvents: [
-          {
-            EventId: '1e2f3g4h',
-            StackName: 'new-service-dev',
-            LogicalResourceId: 'new-service-dev',
-            ResourceType: 'AWS::CloudFormation::Stack',
-            Timestamp: new Date(),
-            ResourceStatus: 'CREATE_COMPLETE',
-          },
-        ],
-      },
-      describeStackResource: {
-        StackResourceDetail: { PhysicalResourceId: 's3-bucket-resource' },
-      },
-      validateTemplate: {},
-      updateStack: {},
-      listStackResources: {},
-    },
-  };
-
-  it('should use iam.deploymentRole service role if set', async () => {
-    await runServerless({
-      fixture: 'function',
-      command: 'deploy',
-      configExt: {
-        provider: {
-          iam: {
-            deploymentRole: 'arn:aws:iam::123456789012:role/role-a',
-          },
-          cfnRole: 'arn:aws:iam::123456789012:role/role-b',
-        },
-      },
-      awsRequestStubMap,
-      lastLifecycleHookName: 'deploy:function:deploy',
-    });
-    expect(createStackStub).to.be.calledOnce;
-    expect(createStackStub.getCall(0).firstArg.RoleARN).to.equal(
-      'arn:aws:iam::123456789012:role/role-a'
-    );
-  });
-
-  it('should use CloudFormation service role ARN if it is specified', async () => {
-    await runServerless({
-      fixture: 'function',
-      command: 'deploy',
-      configExt: {
-        provider: {
-          cfnRole: 'arn:aws:iam::123456789012:role/role-b',
-        },
-      },
-      awsRequestStubMap,
-      lastLifecycleHookName: 'deploy:function:deploy',
-    });
-    expect(createStackStub).to.be.calledOnce;
-    expect(createStackStub.getCall(0).firstArg.RoleARN).to.equal(
-      'arn:aws:iam::123456789012:role/role-b'
-    );
-  });
-});
diff --git a/test/unit/lib/plugins/aws/deploy/lib/existsDeploymentBucket.test.js b/test/unit/lib/plugins/aws/deploy/lib/existsDeploymentBucket.test.js
deleted file mode 100644
index 1a1a69be83c..00000000000
--- a/test/unit/lib/plugins/aws/deploy/lib/existsDeploymentBucket.test.js
+++ /dev/null
@@ -1,92 +0,0 @@
-'use strict';
-
-const sinon = require('sinon');
-const chai = require('chai');
-const AwsProvider = require('../../../../../../../lib/plugins/aws/provider');
-const Serverless = require('../../../../../../../lib/Serverless');
-const existsDeploymentBucket = require('../../../../../../../lib/plugins/aws/deploy/lib/existsDeploymentBucket');
-chai.use(require('chai-as-promised'));
-const expect = require('chai').expect;
-
-describe('#existsDeploymentBucket()', () => {
-  let serverless;
-  let awsPluginStub;
-  const awsPlugin = {};
-
-  beforeEach(() => {
-    const options = {
-      stage: 'dev',
-      region: 'us-east-1',
-    };
-    serverless = new Serverless();
-    awsPlugin.serverless = serverless;
-    awsPlugin.provider = new AwsProvider(serverless, options);
-
-    Object.assign(awsPlugin, existsDeploymentBucket);
-  });
-
-  it('should validate the region for the given S3 bucket', () => {
-    const bucketName = 'com.serverless.deploys';
-
-    awsPluginStub = sinon.stub(awsPlugin.provider, 'request').resolves({
-      LocationConstraint: awsPlugin.provider.options.region,
-    });
-
-    return expect(awsPlugin.existsDeploymentBucket(bucketName)).to.be.fulfilled.then(() => {
-      expect(awsPluginStub.args[0][0]).to.equal('S3');
-      expect(awsPluginStub.args[0][1]).to.equal('getBucketLocation');
-      expect(awsPluginStub.args[0][2].Bucket).to.equal(bucketName);
-    });
-  });
-
-  it('should reject an S3 bucket that does not exist', () => {
-    const bucketName = 'com.serverless.deploys';
-    const errorObj = { message: 'Access Denied' };
-
-    sinon.stub(awsPlugin.provider, 'request').throws(errorObj);
-    return expect(awsPlugin.existsDeploymentBucket(bucketName)).to.be.rejected.then((err) => {
-      expect(awsPluginStub.args[0][0]).to.equal('S3');
-      expect(awsPluginStub.args[0][1]).to.equal('getBucketLocation');
-      expect(awsPluginStub.args[0][2].Bucket).to.equal(bucketName);
-      expect(err.message).to.contain(errorObj.message);
-      expect(err.message).to.contain('Could not locate deployment bucket');
-    });
-  });
-
-  it('should reject an S3 bucket in the wrong region', () => {
-    const bucketName = 'com.serverless.deploys';
-
-    sinon.stub(awsPlugin.provider, 'request').resolves({
-      LocationConstraint: 'us-west-1',
-    });
-
-    return expect(awsPlugin.existsDeploymentBucket(bucketName)).to.be.rejected.then((err) => {
-      expect(awsPluginStub.args[0][0]).to.equal('S3');
-      expect(awsPluginStub.args[0][1]).to.equal('getBucketLocation');
-      expect(awsPluginStub.args[0][2].Bucket).to.equal(bucketName);
-      expect(err.message).to.contain('not in the same region');
-    });
-  });
-
-  [
-    { region: 'eu-west-1', response: 'EU' },
-    { region: 'us-east-1', response: '' },
-  ].forEach((value) => {
-    it(`should handle inconsistent getBucketLocation responses for ${value.region} region`, () => {
-      const bucketName = 'com.serverless.deploys';
-
-      awsPlugin.provider.options.region = value.region;
-
-      sinon.stub(awsPlugin.provider, 'request').resolves({
-        LocationConstraint: value.response,
-      });
-
-      awsPlugin.serverless.service.provider.deploymentBucket = bucketName;
-      return expect(awsPlugin.existsDeploymentBucket(bucketName)).to.be.fulfilled.then(() => {
-        expect(awsPluginStub.args[0][0]).to.equal('S3');
-        expect(awsPluginStub.args[0][1]).to.equal('getBucketLocation');
-        expect(awsPluginStub.args[0][2].Bucket).to.equal(bucketName);
-      });
-    });
-  });
-});
diff --git a/test/unit/lib/plugins/aws/deploy/lib/extendedValidate.test.js b/test/unit/lib/plugins/aws/deploy/lib/extended-validate.test.js
similarity index 74%
rename from test/unit/lib/plugins/aws/deploy/lib/extendedValidate.test.js
rename to test/unit/lib/plugins/aws/deploy/lib/extended-validate.test.js
index 9707ae28611..1e58be4638d 100644
--- a/test/unit/lib/plugins/aws/deploy/lib/extendedValidate.test.js
+++ b/test/unit/lib/plugins/aws/deploy/lib/extended-validate.test.js
@@ -5,9 +5,8 @@ const sinon = require('sinon');
 const path = require('path');
 const AwsProvider = require('../../../../../../../lib/plugins/aws/provider');
 const AwsDeploy = require('../../../../../../../lib/plugins/aws/deploy/index');
-const Serverless = require('../../../../../../../lib/Serverless');
+const Serverless = require('../../../../../../../lib/serverless');
 const { getTmpDirPath } = require('../../../../../../utils/fs');
-const runServerless = require('../../../../../../utils/run-serverless');
 
 chai.use(require('sinon-chai'));
 
@@ -41,7 +40,7 @@ describe('extendedValidate', () => {
       stage: 'dev',
       region: 'us-east-1',
     };
-    const serverless = new Serverless();
+    const serverless = new Serverless({ commands: [], options: {} });
     serverless.setProvider('aws', new AwsProvider(serverless, options));
     serverless.utils.writeFileSync(serverlessYmlPath, serverlessYml);
     serverless.serviceDir = tmpDirPath;
@@ -163,64 +162,5 @@ describe('extendedValidate', () => {
       awsDeploy.extendedValidate();
       delete awsDeploy.serverless.service.package.artifact;
     });
-
-    it("should warn if function's timeout is greater than 30 and it's attached to APIGW", () => {
-      stateFileMock.service.functions = {
-        first: {
-          timeout: 31,
-          package: {
-            artifact: 'artifact.zip',
-          },
-          events: [
-            {
-              http: {},
-            },
-          ],
-        },
-      };
-      awsDeploy.serverless.service.package.individually = true;
-      fileExistsSyncStub.returns(true);
-      readFileSyncStub.returns(stateFileMock);
-
-      awsDeploy.extendedValidate();
-      const msg = [
-        "WARNING: Function first has timeout of 31 seconds, however, it's ",
-        "attached to API Gateway so it's automatically limited to 30 seconds.",
-      ].join('');
-      expect(awsDeploy.serverless.cli.log.firstCall.calledWithExactly(msg)).to.be.equal(true);
-    });
-  });
-});
-
-describe('test/unit/lib/plugins/aws/deploy/lib/extendedValidate.test.js', () => {
-  it("should not warn if function's timeout is greater than 30 and it's attached to APIGW, but it has [async] mode", async () => {
-    const msg = [
-      "WARNING: Function foo has timeout of 31 seconds, however, it's",
-      "attached to API Gateway so it's automatically limited to 30 seconds.",
-    ].join(' ');
-
-    const { stdoutData } = await runServerless({
-      fixture: 'function',
-      configExt: {
-        functions: {
-          foo: {
-            timeout: 31,
-            events: [
-              {
-                http: {
-                  method: 'GET',
-                  path: '/foo',
-                  async: true,
-                },
-              },
-            ],
-          },
-        },
-      },
-      command: 'deploy',
-      lastLifecycleHookName: 'before:deploy:deploy',
-    });
-
-    expect(stdoutData.includes(msg)).to.be.equal(false);
   });
 });
diff --git a/test/unit/lib/plugins/aws/deploy/lib/uploadArtifacts.test.js b/test/unit/lib/plugins/aws/deploy/lib/upload-artifacts.test.js
similarity index 88%
rename from test/unit/lib/plugins/aws/deploy/lib/uploadArtifacts.test.js
rename to test/unit/lib/plugins/aws/deploy/lib/upload-artifacts.test.js
index 3a60a4a5b3f..549df306bab 100644
--- a/test/unit/lib/plugins/aws/deploy/lib/uploadArtifacts.test.js
+++ b/test/unit/lib/plugins/aws/deploy/lib/upload-artifacts.test.js
@@ -8,10 +8,10 @@ const fse = require('fs-extra');
 const path = require('path');
 const chai = require('chai');
 const proxyquire = require('proxyquire');
-const normalizeFiles = require('../../../../../../../lib/plugins/aws/lib/normalizeFiles');
+const normalizeFiles = require('../../../../../../../lib/plugins/aws/lib/normalize-files');
 const AwsProvider = require('../../../../../../../lib/plugins/aws/provider');
 const AwsDeploy = require('../../../../../../../lib/plugins/aws/deploy/index');
-const Serverless = require('../../../../../../../lib/Serverless');
+const Serverless = require('../../../../../../../lib/serverless');
 const { getTmpDirPath, createTmpDir } = require('../../../../../../utils/fs');
 
 chai.use(require('chai-as-promised'));
@@ -25,7 +25,7 @@ describe('uploadArtifacts', () => {
   let cryptoStub;
 
   beforeEach(() => {
-    serverless = new Serverless();
+    serverless = new Serverless({ commands: [], options: {} });
     serverless.serviceDir = 'foo';
     serverless.setProvider('aws', new AwsProvider(serverless, {}));
     const options = {
@@ -54,7 +54,7 @@ describe('uploadArtifacts', () => {
       digest: sinon.stub(),
     };
     const uploadArtifacts = proxyquire(
-      '../../../../../../../lib/plugins/aws/deploy/lib/uploadArtifacts.js',
+      '../../../../../../../lib/plugins/aws/deploy/lib/upload-artifacts.js',
       {
         crypto: cryptoStub,
       }
@@ -62,28 +62,6 @@ describe('uploadArtifacts', () => {
     Object.assign(awsDeploy, uploadArtifacts);
   });
 
-  describe('#uploadArtifacts()', () => {
-    it('should run promise chain in order', () => {
-      const uploadCloudFormationFileStub = sinon
-        .stub(awsDeploy, 'uploadCloudFormationFile')
-        .resolves();
-      const uploadFunctionsAndLayersStub = sinon
-        .stub(awsDeploy, 'uploadFunctionsAndLayers')
-        .resolves();
-
-      return awsDeploy.uploadArtifacts().then(() => {
-        expect(uploadCloudFormationFileStub.calledOnce).to.be.equal(true);
-
-        expect(uploadFunctionsAndLayersStub.calledAfter(uploadCloudFormationFileStub)).to.be.equal(
-          true
-        );
-
-        awsDeploy.uploadCloudFormationFile.restore();
-        awsDeploy.uploadFunctionsAndLayers.restore();
-      });
-    });
-  });
-
   describe('#uploadCloudFormationFile()', () => {
     let normalizeCloudFormationTemplateStub;
     let uploadStub;
@@ -215,12 +193,12 @@ describe('uploadArtifacts', () => {
     let uploadZipFileStub;
 
     beforeEach(() => {
-      sinon.stub(fs, 'statSync').returns({ size: 1024 });
+      sinon.stub(fs.promises, 'stat').resolves({ size: 1024 });
       uploadZipFileStub = sinon.stub(awsDeploy, 'uploadZipFile').resolves();
     });
 
     afterEach(() => {
-      fs.statSync.restore();
+      fs.promises.stat.restore();
       uploadZipFileStub.restore();
     });
 
@@ -306,18 +284,6 @@ describe('uploadArtifacts', () => {
         );
       });
     });
-
-    it('should log artifact size', () => {
-      awsDeploy.serverless.serviceDir = 'some/path';
-      awsDeploy.serverless.service.service = 'new-service';
-
-      sinon.spy(awsDeploy.serverless.cli, 'log');
-
-      return awsDeploy.uploadFunctionsAndLayers().then(() => {
-        const expected = 'Uploading service new-service.zip file to S3 (1 KB)...';
-        expect(awsDeploy.serverless.cli.log.calledWithExactly(expected)).to.be.equal(true);
-      });
-    });
   });
 
   describe('#uploadCustomResources()', () => {
diff --git a/test/unit/lib/plugins/aws/deploy/lib/validateTemplate.test.js b/test/unit/lib/plugins/aws/deploy/lib/validate-template.test.js
similarity index 89%
rename from test/unit/lib/plugins/aws/deploy/lib/validateTemplate.test.js
rename to test/unit/lib/plugins/aws/deploy/lib/validate-template.test.js
index fe12beaee28..0a165670f8d 100644
--- a/test/unit/lib/plugins/aws/deploy/lib/validateTemplate.test.js
+++ b/test/unit/lib/plugins/aws/deploy/lib/validate-template.test.js
@@ -6,7 +6,7 @@ const sinon = require('sinon');
 const chai = require('chai');
 const AwsProvider = require('../../../../../../../lib/plugins/aws/provider');
 const AwsDeploy = require('../../../../../../../lib/plugins/aws/deploy/index');
-const Serverless = require('../../../../../../../lib/Serverless');
+const Serverless = require('../../../../../../../lib/serverless');
 
 // Configure chai
 chai.use(require('chai-as-promised'));
@@ -23,7 +23,7 @@ describe('validateTemplate', () => {
       stage: 'dev',
       region: 'us-east-1',
     };
-    serverless = new Serverless();
+    serverless = new Serverless({ commands: [], options: {} });
     serverless.serviceDir = 'foo';
     serverless.setProvider('aws', new AwsProvider(serverless, options));
     awsDeploy = new AwsDeploy(serverless, options);
@@ -35,9 +35,6 @@ describe('validateTemplate', () => {
       },
     };
     validateTemplateStub = sinon.stub(awsDeploy.provider, 'request');
-    awsDeploy.serverless.cli = {
-      log: sinon.spy(),
-    };
   });
 
   afterEach(() => {
@@ -49,7 +46,6 @@ describe('validateTemplate', () => {
       validateTemplateStub.resolves();
 
       await awsDeploy.validateTemplate();
-      expect(awsDeploy.serverless.cli.log).to.have.been.called;
       expect(validateTemplateStub).to.have.been.calledOnce;
       expect(validateTemplateStub).to.have.been.calledWithExactly(
         'CloudFormation',
@@ -65,7 +61,6 @@ describe('validateTemplate', () => {
       validateTemplateStub.rejects({ message: 'Some error while validating' });
 
       return expect(awsDeploy.validateTemplate()).to.be.rejected.then((error) => {
-        expect(awsDeploy.serverless.cli.log).to.have.been.called;
         expect(validateTemplateStub).to.have.been.calledOnce;
         expect(validateTemplateStub).to.have.been.calledWithExactly(
           'CloudFormation',
diff --git a/test/unit/lib/plugins/aws/info/display.test.js b/test/unit/lib/plugins/aws/info/display.test.js
index 1a94739dab8..8e42db590ee 100644
--- a/test/unit/lib/plugins/aws/info/display.test.js
+++ b/test/unit/lib/plugins/aws/info/display.test.js
@@ -1,355 +1,107 @@
 'use strict';
 
 const expect = require('chai').expect;
-const sinon = require('sinon');
-const AwsInfo = require('../../../../../../lib/plugins/aws/info/index');
-const AwsProvider = require('../../../../../../lib/plugins/aws/provider');
-const Serverless = require('../../../../../../lib/Serverless');
-const CLI = require('../../../../../../lib/classes/CLI');
-const chalk = require('chalk');
+const runServerless = require('../../../../../utils/run-serverless');
 
-describe('#display()', () => {
+describe('test/unit/lib/plugins/aws/info/display.test.js', () => {
   let serverless;
-  let awsInfo;
-  let consoleLogStub;
+  let serviceName;
 
-  beforeEach(() => {
-    const options = {
-      stage: 'dev',
-      region: 'us-east-1',
-    };
-    serverless = new Serverless();
-    serverless.setProvider('aws', new AwsProvider(serverless, options));
-    serverless.cli = new CLI(serverless);
-    serverless.service.service = 'my-service';
-    awsInfo = new AwsInfo(serverless, options);
-    awsInfo.gatheredData = {
-      info: {
-        service: 'my-first',
-        stage: 'dev',
-        region: 'eu-west-1',
-        stack: 'my-first-dev',
-        endpoints: [],
-        functions: [],
-        apiKeys: [],
-        resourceCount: 10,
+  before(async () => {
+    ({
+      serverless,
+      fixtureData: {
+        serviceConfig: { service: serviceName },
       },
-    };
-    consoleLogStub = sinon.stub(serverless.cli, 'consoleLog').returns();
-  });
-
-  afterEach(() => {
-    serverless.cli.consoleLog.restore();
-  });
-
-  it('should display general service info', () => {
-    let expectedMessage = '';
-
-    expectedMessage += `${chalk.yellow.underline('Service Information')}\n`;
-    expectedMessage += `${chalk.yellow('service:')} my-first\n`;
-    expectedMessage += `${chalk.yellow('stage:')} dev\n`;
-    expectedMessage += `${chalk.yellow('region:')} eu-west-1\n`;
-    expectedMessage += `${chalk.yellow('stack:')} my-first-dev\n`;
-    expectedMessage += `${chalk.yellow('resources:')} 10`;
-
-    const message = awsInfo.displayServiceInfo();
-    expect(consoleLogStub.calledOnce).to.equal(true);
-    expect(message).to.equal(expectedMessage);
-  });
-
-  it('should display a warning if 450+ resources', () => {
-    let expectedMessage = '';
-
-    expectedMessage += `${chalk.yellow.underline('Service Information')}\n`;
-    expectedMessage += `${chalk.yellow('service:')} my-first\n`;
-    expectedMessage += `${chalk.yellow('stage:')} dev\n`;
-    expectedMessage += `${chalk.yellow('region:')} eu-west-1\n`;
-    expectedMessage += `${chalk.yellow('stack:')} my-first-dev\n`;
-    expectedMessage += `${chalk.yellow('resources:')} 450`;
-    expectedMessage += `\n${chalk.red('WARNING:')}\n`;
-    expectedMessage += '  You have 450 resources in your service.\n';
-    expectedMessage += '  CloudFormation has a hard limit of 500 resources in a service.\n';
-    expectedMessage +=
-      '  For advice on avoiding this limit, check out this link: http://bit.ly/2IiYB38.';
-
-    awsInfo.gatheredData.info.resourceCount = 450;
-
-    const message = awsInfo.displayServiceInfo();
-    expect(consoleLogStub.calledOnce).to.equal(true);
-    expect(message).to.equal(expectedMessage);
-  });
-
-  it('should display API keys if given', () => {
-    awsInfo.gatheredData.info.apiKeys = [
-      {
-        name: 'keyOne',
-        value: '1234',
-        description: 'keyOne description',
-      },
-    ];
-
-    let expectedMessage = '';
-
-    expectedMessage += `${chalk.yellow('api keys:')}`;
-    expectedMessage += '\n  keyOne: 1234 - keyOne description';
-
-    const message = awsInfo.displayApiKeys();
-    expect(consoleLogStub.calledOnce).to.equal(true);
-    expect(message).to.equal(expectedMessage);
-
-    delete awsInfo.gatheredData.info.apiKeys;
-    const missingMessage = awsInfo.displayApiKeys();
-    expectedMessage = `${chalk.yellow('api keys:')}`;
-    expectedMessage += '\n  None';
-    expect(missingMessage).to.equal(expectedMessage);
-  });
-
-  it('should hide API keys values when `--conceal` is given', () => {
-    awsInfo.options.conceal = true;
-    awsInfo.gatheredData.info.apiKeys = [
-      {
-        name: 'keyOne',
-        value: '1234',
-        description: 'keyOne description',
-      },
-    ];
-
-    let expectedMessage = '';
-
-    expectedMessage += `${chalk.yellow('api keys:')}`;
-    expectedMessage += '\n  keyOne - keyOne description';
-
-    const message = awsInfo.displayApiKeys();
-    expect(consoleLogStub.calledOnce).to.equal(true);
-    expect(message).to.equal(expectedMessage);
-  });
-
-  it('should display https endpoints if given', () => {
-    awsInfo.serverless.service.functions = {
-      function1: {
-        events: [
-          {
-            http: {
-              path: '/',
-              method: 'POST',
-            },
+    } = await runServerless({
+      fixture: 'api-gateway',
+      command: 'info',
+      awsRequestStubMap: {
+        APIGateway: {
+          getApiKey: {
+            value: 'test-key-value',
+            name: 'test-key-name',
           },
-          {
-            http: {
-              path: '/both/',
-              method: 'POST',
-            },
+        },
+        CloudFormation: {
+          describeStacks: {
+            Stacks: [
+              {
+                Outputs: [
+                  {
+                    OutputKey: 'ServiceEndpoint',
+                    OutputValue: 'https://xxxxx.execute-api.us-east-1.amazonaws.com/dev',
+                    Description: 'URL of the service endpoint',
+                    ExportName: 'sls-test-api-gw',
+                  },
+                  {
+                    OutputKey: 'ServerlessDeploymentBucketName',
+                    OutputValue: 'test-api-gw-dev-serverlessdeploymentbucket-xxxxx',
+                    ExportName: 'sls-test-api-gw-ServerlessDeploymentBucketName',
+                  },
+                  {
+                    OutputKey: 'LayerLambdaLayerQualifiedArn',
+                    OutputValue: 'arn:aws:lambda:us-east-1:00000000:layer:layer:1',
+                  },
+                ],
+              },
+            ],
           },
-          {
-            http: {
-              path: '/both/add/',
-              method: 'POST',
-            },
+          describeStackResources: {
+            StackResources: [
+              {
+                PhysicalResourceId: 'test',
+                ResourceType: 'AWS::ApiGateway::ApiKey',
+              },
+            ],
           },
-          {
-            http: {
-              path: 'e',
-              method: 'POST',
-            },
-          },
-        ],
+          listStackResources: {},
+        },
       },
-      function2: {
-        events: [
-          {
-            http: 'GET function1',
+      configExt: {
+        provider: {
+          apiGateway: {
+            apiKeys: [
+              { name: 'full-key', value: 'full-key-asdf-asdf-asdf-adfafdadfadfadfadfafafdafadf' },
+              'no-value-key',
+              { value: 'no-name-key-asdf-asdf-asdf-adfafdadfadfadfadfafafdafadf' },
+            ],
           },
-        ],
-      },
-      function3: {
-        events: [
-          {
-            s3: 'used-to-trigger-if',
+        },
+        layers: {
+          layer: {
+            path: 'layer',
           },
-        ],
+        },
       },
-    };
-
-    awsInfo.gatheredData.info.endpoints = [
-      'https://ab12cd34ef.execute-api.us-east-1.amazonaws.com/dev',
-    ];
-
-    let expectedMessage = '';
-
-    expectedMessage += `${chalk.yellow('endpoints:')}`;
-    expectedMessage += '\n  POST - https://ab12cd34ef.execute-api.us-east-1.amazonaws.com/dev';
-    expectedMessage += '\n  POST - https://ab12cd34ef.execute-api.us-east-1.amazonaws.com/dev/both';
-    expectedMessage +=
-      '\n  POST - https://ab12cd34ef.execute-api.us-east-1.amazonaws.com/dev/both/add';
-    expectedMessage += '\n  POST - https://ab12cd34ef.execute-api.us-east-1.amazonaws.com/dev/e';
-    expectedMessage +=
-      '\n  GET - https://ab12cd34ef.execute-api.us-east-1.amazonaws.com/dev/function1';
-
-    const message = awsInfo.displayEndpoints();
-    expect(consoleLogStub.calledOnce).to.equal(true);
-    expect(message).to.equal(expectedMessage);
+    }));
   });
 
-  it('should display wss endpoint if given', () => {
-    awsInfo.gatheredData.info.endpoints = [
-      'wss://ab12cd34ef.execute-api.us-east-1.amazonaws.com/dev',
-    ];
-
-    let expectedMessage = '';
-
-    expectedMessage += `${chalk.yellow('endpoints:')}`;
-    expectedMessage += '\n  wss://ab12cd34ef.execute-api.us-east-1.amazonaws.com/dev';
-
-    const message = awsInfo.displayEndpoints();
-    expect(consoleLogStub.calledOnce).to.equal(true);
-    expect(message).to.equal(expectedMessage);
+  it('should register api gateway api keys section', () => {
+    expect(serverless.serviceOutputs.get('api keys')).to.deep.equal([
+      'test-key-name: test-key-value',
+    ]);
   });
 
-  it('should support a mix of https and wss endpoints', () => {
-    awsInfo.serverless.service.functions = {
-      function1: {
-        events: [
-          {
-            http: {
-              path: '/',
-              method: 'POST',
-            },
-          },
-          {
-            http: {
-              path: '/both/',
-              method: 'POST',
-            },
-          },
-        ],
-      },
-      function2: {
-        events: [
-          {
-            websocket: '$connect',
-          },
-        ],
-      },
-    };
-
-    awsInfo.gatheredData.info.endpoints = [
-      'https://ab12cd34ef.execute-api.us-east-1.amazonaws.com/dev',
-      'wss://ab12cd34ef.execute-api.us-east-1.amazonaws.com/dev',
-    ];
-
-    let expectedMessage = '';
-
-    expectedMessage += `${chalk.yellow('endpoints:')}`;
-    expectedMessage += '\n  POST - https://ab12cd34ef.execute-api.us-east-1.amazonaws.com/dev';
-    expectedMessage += '\n  POST - https://ab12cd34ef.execute-api.us-east-1.amazonaws.com/dev/both';
-    expectedMessage += '\n  wss://ab12cd34ef.execute-api.us-east-1.amazonaws.com/dev';
-
-    const message = awsInfo.displayEndpoints();
-    expect(consoleLogStub.calledOnce).to.equal(true);
-    expect(message).to.equal(expectedMessage);
-  });
-
-  it('should not display any endpoint info if none is given', () => {
-    const missingMessage = awsInfo.displayEndpoints();
-
-    let expectedMessage = '';
-
-    expectedMessage = `${chalk.yellow('endpoints:')}`;
-    expectedMessage += '\n  None';
-    expect(missingMessage).to.equal(expectedMessage);
-  });
-
-  it('should display cloudfront endpoint if given', () => {
-    awsInfo.serverless.service.functions = {
-      function1: {
-        events: [
-          {
-            cloudfront: {},
-          },
-        ],
-      },
-    };
-
-    awsInfo.gatheredData.info.cloudFront = 'a12bcdef3g45hi.cloudfront.net';
-
-    let expectedMessage = '';
-
-    expectedMessage += `${chalk.yellow('endpoints:')}`;
-    expectedMessage += '\n  CloudFront - a12bcdef3g45hi.cloudfront.net';
-
-    const message = awsInfo.displayEndpoints();
-    expect(consoleLogStub.calledOnce).to.equal(true);
-    expect(message).to.equal(expectedMessage);
-
-    delete awsInfo.gatheredData.info.cloudFront;
-    const missingMessage = awsInfo.displayEndpoints();
-    expectedMessage = `${chalk.yellow('endpoints:')}`;
-    expectedMessage += '\n  None';
-    expect(missingMessage).to.equal(expectedMessage);
+  it('should register endpoints section', () => {
+    expect(serverless.serviceOutputs.get('endpoints')).to.deep.equal([
+      'GET - https://xxxxx.execute-api.us-east-1.amazonaws.com/dev',
+      'POST - https://xxxxx.execute-api.us-east-1.amazonaws.com/dev/minimal-1',
+      'GET - https://xxxxx.execute-api.us-east-1.amazonaws.com/dev/foo',
+      'POST - https://xxxxx.execute-api.us-east-1.amazonaws.com/dev/some-post',
+      'GET - https://xxxxx.execute-api.us-east-1.amazonaws.com/dev/bar/{marko}',
+    ]);
   });
-
-  it('should display functions if given', () => {
-    awsInfo.gatheredData.info.functions = [
-      {
-        name: 'function1',
-        deployedName: 'my-first-dev-function1',
-      },
-      {
-        name: 'function2',
-        deployedName: 'my-first-dev-function2',
-      },
-      {
-        name: 'function3',
-        deployedName: 'my-first-dev-function3',
-      },
-    ];
-
-    let expectedMessage = '';
-
-    expectedMessage += `${chalk.yellow('functions:')}`;
-    expectedMessage += '\n  function1: my-first-dev-function1';
-    expectedMessage += '\n  function2: my-first-dev-function2';
-    expectedMessage += '\n  function3: my-first-dev-function3';
-
-    const message = awsInfo.displayFunctions();
-    expect(consoleLogStub.calledOnce).to.equal(true);
-    expect(message).to.equal(expectedMessage);
-
-    delete awsInfo.gatheredData.info.functions;
-    const missingMessage = awsInfo.displayFunctions();
-    expectedMessage = `${chalk.yellow('functions:')}`;
-    expectedMessage += '\n  None';
-    expect(missingMessage).to.equal(expectedMessage);
+  it('should register functions section', () => {
+    expect(serverless.serviceOutputs.get('functions')).to.deep.equal([
+      `minimal: ${serviceName}-dev-minimal`,
+      `foo: ${serviceName}-dev-foo`,
+      `other: ${serviceName}-dev-other`,
+    ]);
   });
-
-  it('should display CloudFormation outputs when verbose output is requested', () => {
-    awsInfo.options.verbose = true;
-
-    awsInfo.gatheredData.outputs = [
-      {
-        Description: 'Lambda function info',
-        OutputKey: 'Function1FunctionArn',
-        OutputValue: 'arn:function1',
-      },
-      {
-        Description: 'Lambda function info',
-        OutputKey: 'Function2FunctionArn',
-        OutputValue: 'arn:function2',
-      },
-    ];
-
-    let expectedMessage = '';
-
-    expectedMessage += `${chalk.yellow.underline('\nStack Outputs\n')}`;
-    expectedMessage += `${chalk.yellow('Function1FunctionArn')}: ${'arn:function1'}\n`;
-    expectedMessage += `${chalk.yellow('Function2FunctionArn')}: ${'arn:function2'}\n`;
-
-    const message = awsInfo.displayStackOutputs();
-    expect(consoleLogStub.calledOnce).to.equal(true);
-    expect(message).to.equal(expectedMessage);
-
-    awsInfo.options.verbose = false;
-    const nonVerboseMessage = awsInfo.displayStackOutputs();
-    expect(nonVerboseMessage).to.equal('');
+  it('should register layers section', () => {
+    expect(serverless.serviceOutputs.get('layers')).to.deep.equal([
+      'layer: arn:aws:lambda:us-east-1:00000000:layer:layer:1',
+    ]);
   });
 });
diff --git a/test/unit/lib/plugins/aws/info/getApiKeyValues.test.js b/test/unit/lib/plugins/aws/info/get-api-key-values.test.js
similarity index 94%
rename from test/unit/lib/plugins/aws/info/getApiKeyValues.test.js
rename to test/unit/lib/plugins/aws/info/get-api-key-values.test.js
index 9417eb58b88..137bd398d67 100644
--- a/test/unit/lib/plugins/aws/info/getApiKeyValues.test.js
+++ b/test/unit/lib/plugins/aws/info/get-api-key-values.test.js
@@ -4,7 +4,7 @@ const expect = require('chai').expect;
 const sinon = require('sinon');
 const AwsInfo = require('../../../../../../lib/plugins/aws/info/index');
 const AwsProvider = require('../../../../../../lib/plugins/aws/provider');
-const Serverless = require('../../../../../../lib/Serverless');
+const Serverless = require('../../../../../../lib/serverless');
 
 describe('#getApiKeyValues()', () => {
   let serverless;
@@ -16,7 +16,7 @@ describe('#getApiKeyValues()', () => {
       stage: 'dev',
       region: 'us-east-1',
     };
-    serverless = new Serverless();
+    serverless = new Serverless({ commands: [], options: {} });
     serverless.setProvider('aws', new AwsProvider(serverless, options));
     serverless.service.service = 'my-service';
     awsInfo = new AwsInfo(serverless, options);
@@ -68,6 +68,8 @@ describe('#getApiKeyValues()', () => {
       info: {
         apiKeys: [
           {
+            customerId: undefined,
+            description: undefined,
             name: 'foo',
             value: 'valueForKeyFoo',
           },
diff --git a/test/unit/lib/plugins/aws/info/getResourceCount.test.js b/test/unit/lib/plugins/aws/info/get-resource-count.test.js
similarity index 97%
rename from test/unit/lib/plugins/aws/info/getResourceCount.test.js
rename to test/unit/lib/plugins/aws/info/get-resource-count.test.js
index c00b44f43f7..5e6e982ee09 100644
--- a/test/unit/lib/plugins/aws/info/getResourceCount.test.js
+++ b/test/unit/lib/plugins/aws/info/get-resource-count.test.js
@@ -6,7 +6,7 @@ const expect = require('chai').expect;
 const sinon = require('sinon');
 const AwsInfo = require('../../../../../../lib/plugins/aws/info/index');
 const AwsProvider = require('../../../../../../lib/plugins/aws/provider');
-const Serverless = require('../../../../../../lib/Serverless');
+const Serverless = require('../../../../../../lib/serverless');
 
 describe('#getResourceCount()', () => {
   let serverless;
@@ -18,7 +18,7 @@ describe('#getResourceCount()', () => {
       stage: 'dev',
       region: 'us-east-1',
     };
-    serverless = new Serverless();
+    serverless = new Serverless({ commands: [], options: {} });
     serverless.setProvider('aws', new AwsProvider(serverless, options));
     serverless.service.service = 'my-service';
     serverless.service.functions = {
diff --git a/test/unit/lib/plugins/aws/info/getStackInfo.test.js b/test/unit/lib/plugins/aws/info/get-stack-info.test.js
similarity index 97%
rename from test/unit/lib/plugins/aws/info/getStackInfo.test.js
rename to test/unit/lib/plugins/aws/info/get-stack-info.test.js
index b370a369b70..eaa1e6c0604 100644
--- a/test/unit/lib/plugins/aws/info/getStackInfo.test.js
+++ b/test/unit/lib/plugins/aws/info/get-stack-info.test.js
@@ -4,7 +4,7 @@ const expect = require('chai').expect;
 const sinon = require('sinon');
 const AwsInfo = require('../../../../../../lib/plugins/aws/info/index');
 const AwsProvider = require('../../../../../../lib/plugins/aws/provider');
-const Serverless = require('../../../../../../lib/Serverless');
+const Serverless = require('../../../../../../lib/serverless');
 
 describe('#getStackInfo()', () => {
   let serverless;
@@ -16,7 +16,7 @@ describe('#getStackInfo()', () => {
       stage: 'dev',
       region: 'us-east-1',
     };
-    serverless = new Serverless();
+    serverless = new Serverless({ commands: [], options: {} });
     serverless.setProvider('aws', new AwsProvider(serverless, options));
     serverless.service.service = 'my-service';
     serverless.service.functions = {
@@ -94,10 +94,12 @@ describe('#getStackInfo()', () => {
           {
             name: 'hello',
             deployedName: 'my-service-dev-hello',
+            artifactSize: undefined,
           },
           {
             name: 'world',
             deployedName: 'customized',
+            artifactSize: undefined,
           },
         ],
         layers: [
diff --git a/test/unit/lib/plugins/aws/info/index.test.js b/test/unit/lib/plugins/aws/info/index.test.js
index 1fb70099629..c053acd1772 100644
--- a/test/unit/lib/plugins/aws/info/index.test.js
+++ b/test/unit/lib/plugins/aws/info/index.test.js
@@ -4,7 +4,7 @@ const expect = require('chai').expect;
 const sinon = require('sinon');
 const AwsInfo = require('../../../../../../lib/plugins/aws/info/index');
 const AwsProvider = require('../../../../../../lib/plugins/aws/provider');
-const Serverless = require('../../../../../../lib/Serverless');
+const Serverless = require('../../../../../../lib/serverless');
 
 describe('AwsInfo', () => {
   let serverless;
@@ -25,7 +25,7 @@ describe('AwsInfo', () => {
       stage: 'dev',
       region: 'us-east-1',
     };
-    serverless = new Serverless();
+    serverless = new Serverless({ commands: [], options: {} });
     serverless.setProvider('aws', new AwsProvider(serverless, options));
     serverless.cli = {
       log: sinon.stub().returns(),
diff --git a/test/unit/lib/plugins/aws/invokeLocal/index.test.js b/test/unit/lib/plugins/aws/invoke-local/index.test.js
similarity index 60%
rename from test/unit/lib/plugins/aws/invokeLocal/index.test.js
rename to test/unit/lib/plugins/aws/invoke-local/index.test.js
index 68b6b560f0e..7ae051e6ddd 100644
--- a/test/unit/lib/plugins/aws/invokeLocal/index.test.js
+++ b/test/unit/lib/plugins/aws/invoke-local/index.test.js
@@ -6,17 +6,16 @@ const path = require('path');
 const EventEmitter = require('events');
 const fse = require('fs-extra');
 const proxyquire = require('proxyquire');
-const stripAnsi = require('strip-ansi');
 const overrideEnv = require('process-utils/override-env');
 const AwsProvider = require('../../../../../../lib/plugins/aws/provider');
-const Serverless = require('../../../../../../lib/Serverless');
-const CLI = require('../../../../../../lib/classes/CLI');
+const Serverless = require('../../../../../../lib/serverless');
+const CLI = require('../../../../../../lib/classes/cli');
 const { getTmpDirPath } = require('../../../../../utils/fs');
 const skipWithNotice = require('@serverless/test/skip-with-notice');
-const log = require('log').get('serverless:test');
 const runServerless = require('../../../../../utils/run-serverless');
+const spawnExt = require('child-process-ext/spawn');
 
-const tmpServicePath = path.resolve(__dirname, '../../../../../../lib/plugins/aws/invokeLocal');
+const tmpServicePath = __dirname;
 
 chai.use(require('chai-as-promised'));
 
@@ -61,11 +60,11 @@ describe('AwsInvokeLocal', () => {
     });
 
     stdinStub = sinon.stub().resolves('');
-    AwsInvokeLocal = proxyquire('../../../../../../lib/plugins/aws/invokeLocal/index', {
+    AwsInvokeLocal = proxyquire('../../../../../../lib/plugins/aws/invoke-local/index', {
       'get-stdin': stdinStub,
       'child-process-ext/spawn': spawnExtStub,
     });
-    serverless = new Serverless();
+    serverless = new Serverless({ commands: [], options: {} });
     serverless.serviceDir = 'servicePath';
     serverless.cli = new CLI(serverless);
     serverless.processedInput = { commands: ['invoke'] };
@@ -478,24 +477,6 @@ describe('AwsInvokeLocal', () => {
       ).to.be.equal(true);
     });
 
-    it('should call invokeLocalRuby with class/module info when used', async () => {
-      awsInvokeLocal.options.functionObj.runtime = 'ruby2.5';
-      awsInvokeLocal.options.functionObj.handler = 'handler.MyModule::MyClass.hello';
-      await awsInvokeLocal.invokeLocal();
-      // NOTE: this is important so that tests on Windows won't fail
-      const runtime = process.platform === 'win32' ? 'ruby.exe' : 'ruby';
-      expect(invokeLocalRubyStub.calledOnce).to.be.equal(true);
-      expect(
-        invokeLocalRubyStub.calledWithExactly(
-          runtime,
-          'handler',
-          'MyModule::MyClass.hello',
-          {},
-          undefined
-        )
-      ).to.be.equal(true);
-    });
-
     it('should call invokeLocalDocker if using runtime provided', async () => {
       awsInvokeLocal.options.functionObj.runtime = 'provided';
       awsInvokeLocal.options.functionObj.handler = 'handler.foobar';
@@ -514,470 +495,10 @@ describe('AwsInvokeLocal', () => {
     });
   });
 
-  describe('#invokeLocalNodeJs', () => {
-    beforeEach(() => {
-      awsInvokeLocal.options = {
-        functionObj: {
-          name: '',
-        },
-      };
-
-      sinon.stub(serverless.cli, 'consoleLog');
-    });
-
-    afterEach(() => {
-      serverless.cli.consoleLog.restore();
-    });
-
-    describe('with done method', () => {
-      it('should exit with error exit code', () => {
-        awsInvokeLocal.serverless.serviceDir = tmpServicePath;
-
-        awsInvokeLocal.invokeLocalNodeJs('fixture/handlerWithSuccess', 'withErrorByDone');
-
-        expect(process.exitCode).to.be.equal(1);
-      });
-
-      it('should succeed if succeed', () => {
-        awsInvokeLocal.serverless.serviceDir = tmpServicePath;
-
-        awsInvokeLocal.invokeLocalNodeJs('fixture/handlerWithSuccess', 'withMessageByDone');
-
-        expect(serverless.cli.consoleLog.lastCall.args[0]).to.contain('"Succeed"');
-      });
-    });
-
-    describe('with Lambda Proxy with application/json response', () => {
-      it('should succeed if succeed', () => {
-        awsInvokeLocal.serverless.serviceDir = tmpServicePath;
-
-        awsInvokeLocal.invokeLocalNodeJs('fixture/handlerWithSuccess', 'withMessageByLambdaProxy');
-
-        expect(serverless.cli.consoleLog.lastCall.args[0]).to.contain(
-          '{\n    "statusCode": 200,\n    "headers": {\n        "Content-Type": "application/json"\n    },\n    "body": {\n        "result": true,\n        "message": "Whatever"\n    }\n}'
-        );
-      });
-    });
-
-    describe('context.remainingTimeInMillis', () => {
-      it('should become lower over time', () => {
-        awsInvokeLocal.serverless.serviceDir = tmpServicePath;
-
-        awsInvokeLocal.invokeLocalNodeJs('fixture/handlerWithSuccess', 'withRemainingTime');
-
-        const remainingTimes = JSON.parse(serverless.cli.consoleLog.lastCall.args[0]);
-        expect(remainingTimes.start).to.be.above(remainingTimes.stop);
-      });
-
-      it('should start with the timeout value', () => {
-        awsInvokeLocal.serverless.serviceDir = tmpServicePath;
-        awsInvokeLocal.serverless.service.provider.timeout = 5;
-
-        awsInvokeLocal.invokeLocalNodeJs('fixture/handlerWithSuccess', 'withRemainingTime');
-
-        const remainingTimes = JSON.parse(serverless.cli.consoleLog.lastCall.args[0]);
-        expect(remainingTimes.start).to.match(/\d+/);
-      });
-
-      it('should never become negative', () => {
-        awsInvokeLocal.serverless.serviceDir = tmpServicePath;
-        awsInvokeLocal.serverless.service.provider.timeout = 0.00001;
-
-        awsInvokeLocal.invokeLocalNodeJs('fixture/handlerWithSuccess', 'withRemainingTime');
-
-        const remainingTimes = JSON.parse(serverless.cli.consoleLog.lastCall.args[0]);
-        expect(remainingTimes.stop).to.eql(0);
-      });
-    });
-
-    describe('with extraServicePath', () => {
-      it('should succeed if succeed', () => {
-        awsInvokeLocal.serverless.serviceDir = tmpServicePath;
-        awsInvokeLocal.options.extraServicePath = 'fixture';
-
-        awsInvokeLocal.invokeLocalNodeJs('handlerWithSuccess', 'withMessageByLambdaProxy');
-
-        expect(serverless.cli.consoleLog.lastCall.args[0]).to.contain(
-          '{\n    "statusCode": 200,\n    "headers": {\n        "Content-Type": "application/json"\n    },\n    "body": {\n        "result": true,\n        "message": "Whatever"\n    }\n}'
-        );
-      });
-    });
-
-    it('should exit with error exit code', () => {
-      awsInvokeLocal.serverless.serviceDir = tmpServicePath;
-
-      awsInvokeLocal.invokeLocalNodeJs('fixture/handlerWithError', 'withError');
-
-      expect(process.exitCode).to.be.equal(1);
-    });
-
-    it('should log Error instance when called back', () => {
-      awsInvokeLocal.serverless.serviceDir = tmpServicePath;
-
-      awsInvokeLocal.invokeLocalNodeJs('fixture/handlerWithError', 'withError');
-      const logMessageContent = JSON.parse(stripAnsi(serverless.cli.consoleLog.lastCall.args[0]));
-
-      expect(logMessageContent.errorMessage).to.equal('failed');
-      expect(logMessageContent.errorType).to.equal('Error');
-      expect(logMessageContent.stackTrace[0]).to.equal('Error: failed');
-    });
-
-    it('should log Error object if handler crashes at initialization', async () => {
-      awsInvokeLocal.serverless.serviceDir = tmpServicePath;
-
-      try {
-        await awsInvokeLocal.invokeLocalNodeJs(
-          'fixture/handlerWithInitializationError',
-          'withError'
-        );
-      } catch (error) {
-        if (!error.message.startsWith('Exception encountered when loading')) {
-          throw error;
-        }
-      }
-
-      expect(serverless.cli.consoleLog.lastCall.args[0]).to.contain('Initialization failed');
-    });
-
-    it('should log error when called back', () => {
-      awsInvokeLocal.serverless.serviceDir = tmpServicePath;
-
-      awsInvokeLocal.invokeLocalNodeJs('fixture/handlerWithError', 'withMessage');
-
-      expect(serverless.cli.consoleLog.lastCall.args[0]).to.contain('"errorMessage": "failed"');
-    });
-
-    it('should throw when module loading error', async () => {
-      awsInvokeLocal.serverless.serviceDir = tmpServicePath;
-
-      try {
-        await awsInvokeLocal.invokeLocalNodeJs('fixture/handlerWithLoadingError', 'anyMethod');
-      } catch (error) {
-        if (!error.message.startsWith('Exception encountered when loading')) {
-          throw error;
-        }
-      }
-    });
-  });
-
-  describe('#invokeLocalNodeJs promise', () => {
-    beforeEach(() => {
-      awsInvokeLocal.options = {
-        functionObj: {
-          name: '',
-        },
-      };
-
-      sinon.stub(serverless.cli, 'consoleLog');
-    });
-
-    afterEach(() => {
-      serverless.cli.consoleLog.restore();
-    });
-
-    describe('with return', () => {
-      it('should exit with error exit code', async () => {
-        awsInvokeLocal.serverless.serviceDir = tmpServicePath;
-        await awsInvokeLocal.invokeLocalNodeJs('fixture/asyncHandlerWithSuccess', 'withError');
-        expect(process.exitCode).to.be.equal(1);
-      });
-
-      it('should succeed if succeed', async () => {
-        awsInvokeLocal.serverless.serviceDir = tmpServicePath;
-
-        await awsInvokeLocal.invokeLocalNodeJs('fixture/asyncHandlerWithSuccess', 'withMessage');
-        expect(serverless.cli.consoleLog.lastCall.args[0]).to.contain('"Succeed"');
-      });
-    });
-
-    describe('by context.done', () => {
-      it('success should trigger one response', async () => {
-        awsInvokeLocal.serverless.serviceDir = tmpServicePath;
-
-        await awsInvokeLocal.invokeLocalNodeJs(
-          'fixture/asyncHandlerWithSuccess',
-          'withMessageByDone'
-        );
-        expect(serverless.cli.consoleLog.lastCall.args[0]).to.contain('"Succeed"');
-        const calls = serverless.cli.consoleLog.getCalls().reduce((acc, call) => {
-          return call.args[0].includes('Succeed') ? [call].concat(acc) : acc;
-        }, []);
-        expect(calls.length).to.equal(1);
-      });
-
-      it('error should trigger one response', async () => {
-        awsInvokeLocal.serverless.serviceDir = tmpServicePath;
-
-        await awsInvokeLocal.invokeLocalNodeJs(
-          'fixture/asyncHandlerWithSuccess',
-          'withErrorByDone'
-        );
-        expect(serverless.cli.consoleLog.lastCall.args[0]).to.contain('"failed"');
-        expect(process.exitCode).to.be.equal(1);
-      });
-    });
-
-    describe('by callback method', () => {
-      it('should succeed once if succeed if by callback', async () => {
-        awsInvokeLocal.serverless.serviceDir = tmpServicePath;
-
-        await awsInvokeLocal.invokeLocalNodeJs(
-          'fixture/asyncHandlerWithSuccess',
-          'withMessageByCallback'
-        );
-        expect(serverless.cli.consoleLog.lastCall.args[0]).to.contain('"Succeed"');
-        const calls = serverless.cli.consoleLog.getCalls().reduce((acc, call) => {
-          return call.args[0].includes('Succeed') ? [call].concat(acc) : acc;
-        }, []);
-        expect(calls.length).to.equal(1);
-      });
-    });
-
-    describe("by callback method even if callback isn't called syncronously", () => {
-      it('should succeed once if succeed if by callback', async () => {
-        awsInvokeLocal.serverless.serviceDir = tmpServicePath;
-
-        await awsInvokeLocal.invokeLocalNodeJs(
-          'fixture/asyncHandlerWithSuccess',
-          'withMessageAndDelayByCallback'
-        );
-        expect(serverless.cli.consoleLog.lastCall.args[0]).to.contain('"Succeed"');
-        const calls = serverless.cli.consoleLog.getCalls().reduce((acc, call) => {
-          return call.args[0].includes('Succeed') ? [call].concat(acc) : acc;
-        }, []);
-        expect(calls.length).to.equal(1);
-      });
-    });
-
-    describe('with Lambda Proxy with application/json response', () => {
-      it('should succeed if succeed', async () => {
-        awsInvokeLocal.serverless.serviceDir = tmpServicePath;
-
-        await awsInvokeLocal.invokeLocalNodeJs(
-          'fixture/asyncHandlerWithSuccess',
-          'withMessageByLambdaProxy'
-        );
-        expect(serverless.cli.consoleLog.lastCall.args[0]).to.contain(
-          '{\n    "statusCode": 200,\n    "headers": {\n        "Content-Type": "application/json"\n    },\n    "body": {\n        "result": true,\n        "message": "Whatever"\n    }\n}'
-        );
-      });
-    });
-
-    describe('context.remainingTimeInMillis', () => {
-      it('should become lower over time', async () => {
-        awsInvokeLocal.serverless.serviceDir = tmpServicePath;
-
-        await awsInvokeLocal.invokeLocalNodeJs(
-          'fixture/asyncHandlerWithSuccess',
-          'withRemainingTime'
-        );
-        const remainingTimes = JSON.parse(serverless.cli.consoleLog.lastCall.args[0]);
-        expect(remainingTimes.start).to.be.above(remainingTimes.stop);
-      });
-
-      it('should start with the timeout value', async () => {
-        awsInvokeLocal.serverless.serviceDir = tmpServicePath;
-        awsInvokeLocal.serverless.service.provider.timeout = 5;
-
-        await awsInvokeLocal.invokeLocalNodeJs(
-          'fixture/asyncHandlerWithSuccess',
-          'withRemainingTime'
-        );
-        const remainingTimes = JSON.parse(serverless.cli.consoleLog.lastCall.args[0]);
-        expect(remainingTimes.start).to.match(/\d+/);
-      });
-
-      it('should never become negative', async () => {
-        awsInvokeLocal.serverless.serviceDir = tmpServicePath;
-        awsInvokeLocal.serverless.service.provider.timeout = 0.00001;
-
-        await awsInvokeLocal.invokeLocalNodeJs(
-          'fixture/asyncHandlerWithSuccess',
-          'withRemainingTime'
-        );
-        const remainingTimes = JSON.parse(serverless.cli.consoleLog.lastCall.args[0]);
-        expect(remainingTimes.stop).to.eql(0);
-      });
-    });
-
-    describe('with extraServicePath', () => {
-      it('should succeed if succeed', async () => {
-        awsInvokeLocal.serverless.serviceDir = tmpServicePath;
-        awsInvokeLocal.options.extraServicePath = 'fixture';
-
-        await awsInvokeLocal.invokeLocalNodeJs(
-          'asyncHandlerWithSuccess',
-          'withMessageByLambdaProxy'
-        );
-        expect(serverless.cli.consoleLog.lastCall.args[0]).to.contain(
-          '{\n    "statusCode": 200,\n    "headers": {\n        "Content-Type": "application/json"\n    },\n    "body": {\n        "result": true,\n        "message": "Whatever"\n    }\n}'
-        );
-      });
-    });
-
-    it('should exit with error exit code', async () => {
-      awsInvokeLocal.serverless.serviceDir = tmpServicePath;
-
-      await awsInvokeLocal.invokeLocalNodeJs('fixture/asyncHandlerWithError', 'withError');
-      expect(process.exitCode).to.be.equal(1);
-    });
-
-    it('should log Error instance when called back', async () => {
-      awsInvokeLocal.serverless.serviceDir = tmpServicePath;
-
-      await awsInvokeLocal.invokeLocalNodeJs('fixture/asyncHandlerWithError', 'withError');
-      expect(serverless.cli.consoleLog.lastCall.args[0]).to.contain('"errorMessage": "failed"');
-      expect(serverless.cli.consoleLog.lastCall.args[0]).to.contain('"errorType": "Error"');
-    });
-
-    it('should log error', async () => {
-      awsInvokeLocal.serverless.serviceDir = tmpServicePath;
-
-      await awsInvokeLocal.invokeLocalNodeJs('fixture/asyncHandlerWithError', 'withMessage');
-      expect(serverless.cli.consoleLog.lastCall.args[0]).to.contain('"errorMessage": "failed"');
-    });
-
-    it('should log error when error is returned', async () => {
-      awsInvokeLocal.serverless.serviceDir = tmpServicePath;
-
-      await awsInvokeLocal.invokeLocalNodeJs('fixture/asyncHandlerWithError', 'returnsError');
-      expect(serverless.cli.consoleLog.lastCall.args[0]).to.contain('"errorMessage": "failed"');
-    });
-  });
-
-  describe('#invokeLocalPython', () => {
-    beforeEach(() => {
-      awsInvokeLocal.options = {
-        functionObj: {
-          name: '',
-        },
-      };
-
-      sinon.stub(serverless.cli, 'consoleLog');
-    });
-
-    const afterEachCallback = () => {
-      serverless.cli.consoleLog.restore();
-    };
-    afterEach(afterEachCallback);
-
-    describe('context.remainingTimeInMillis', () => {
-      it('should become lower over time', async function () {
-        // skipping in CI for now due to handler loading issues
-        // in the Windows machine on Travis CI
-        if (process.env.CI) {
-          this.skip();
-        }
-
-        awsInvokeLocal.serverless.serviceDir = tmpServicePath;
-        process.chdir(tmpServicePath);
-
-        try {
-          await awsInvokeLocal.invokeLocalPython(
-            'python2.7',
-            'fixture/handler',
-            'withRemainingTime'
-          );
-
-          log.debug('test target %o', serverless.cli.consoleLog.lastCall.args);
-          const remainingTimes = JSON.parse(serverless.cli.consoleLog.lastCall.args[0]);
-          expect(remainingTimes.start).to.be.above(remainingTimes.stop);
-        } catch (error) {
-          if (error.code === 'ENOENT' && error.path === 'python2') {
-            skipWithNotice(this, 'Python runtime is not installed', afterEachCallback);
-          }
-          throw error;
-        }
-      });
-    });
-  });
-
-  describe('#invokeLocalRuby', () => {
-    let curdir;
-
-    beforeEach(() => {
-      curdir = process.cwd();
-      process.chdir(tmpServicePath);
-      awsInvokeLocal.options = {
-        functionObj: {
-          name: '',
-        },
-      };
-
-      sinon.stub(serverless.cli, 'consoleLog');
-    });
-
-    const afterEachCallback = () => {
-      serverless.cli.consoleLog.restore();
-      process.chdir(curdir);
-    };
-    afterEach(afterEachCallback);
-
-    describe('context.remainingTimeInMillis', () => {
-      it('should become lower over time', async function () {
-        awsInvokeLocal.serverless.serviceDir = tmpServicePath;
-
-        try {
-          await awsInvokeLocal.invokeLocalRuby('ruby', 'fixture/handler', 'withRemainingTime');
-
-          log.debug('test target %o', serverless.cli.consoleLog.lastCall.args);
-          const remainingTimes = JSON.parse(serverless.cli.consoleLog.lastCall.args[0]);
-          expect(remainingTimes.start).to.be.above(remainingTimes.stop);
-        } catch (error) {
-          if (error.code === 'ENOENT' && error.path === 'ruby') {
-            skipWithNotice(this, 'Ruby runtime is not installed', afterEachCallback);
-          }
-          throw error;
-        }
-      });
-    });
-
-    describe('calling a class method', () => {
-      it('should execute', async function () {
-        awsInvokeLocal.serverless.serviceDir = tmpServicePath;
-
-        try {
-          await awsInvokeLocal.invokeLocalRuby(
-            'ruby',
-            'fixture/handler',
-            'MyModule::MyClass.my_class_method'
-          );
-          log.debug('test target %o', serverless.cli.consoleLog.lastCall.args);
-          const result = JSON.parse(serverless.cli.consoleLog.lastCall.args[0]);
-          expect(result.foo).to.eq('bar');
-        } catch (error) {
-          if (error.code === 'ENOENT' && error.path === 'ruby') {
-            skipWithNotice(this, 'Ruby runtime is not installed', afterEachCallback);
-          }
-          throw error;
-        }
-      });
-    });
-
-    describe('context.deadlineMs', () => {
-      it('should return deadline', async function () {
-        awsInvokeLocal.serverless.serviceDir = tmpServicePath;
-
-        try {
-          await awsInvokeLocal.invokeLocalRuby('ruby', 'fixture/handler', 'withDeadlineMs');
-
-          log.debug('test target %o', serverless.cli.consoleLog.lastCall.args);
-          const result = JSON.parse(serverless.cli.consoleLog.lastCall.args[0]);
-          expect(result.deadlineMs).to.be.closeTo(Date.now() + 6000, 2000);
-        } catch (error) {
-          if (error.code === 'ENOENT' && error.path === 'ruby') {
-            skipWithNotice(this, 'Ruby runtime is not installed', afterEachCallback);
-          }
-          throw error;
-        }
-      });
-    });
-  });
-
   describe('#callJavaBridge()', () => {
     let invokeLocalSpawnStubbed;
     beforeEach(() => {
-      AwsInvokeLocal = proxyquire('../../../../../../lib/plugins/aws/invokeLocal/index', {
+      AwsInvokeLocal = proxyquire('../../../../../../lib/plugins/aws/invoke-local/index', {
         'get-stdin': stdinStub,
         'child-process-ext/spawn': spawnExtStub,
         'child_process': {
@@ -1130,7 +651,6 @@ describe('AwsInvokeLocal', () => {
 
     it('calls docker with packaged artifact', async () => {
       await awsInvokeLocal.invokeLocalDocker();
-      const dockerfilePath = path.join('.serverless', 'invokeLocal', 'nodejs12.x', 'Dockerfile');
 
       expect(pluginMangerSpawnPackageStub.calledOnce).to.equal(true);
       expect(spawnExtStub.getCall(0).args).to.deep.equal(['docker', ['version']]);
@@ -1138,10 +658,6 @@ describe('AwsInvokeLocal', () => {
         'docker',
         ['images', '-q', 'lambci/lambda:nodejs12.x'],
       ]);
-      expect(spawnExtStub.getCall(2).args).to.deep.equal([
-        'docker',
-        ['build', '-t', 'sls-docker-nodejs12.x', 'servicePath', '-f', dockerfilePath],
-      ]);
       expect(spawnExtStub.getCall(3).args).to.deep.equal([
         'docker',
         [
@@ -1454,7 +970,7 @@ describe('test/unit/lib/plugins/aws/invokeLocal/index.test.js', () => {
         process.env.AWS_ACCESS_KEY_ID = 'AAKIXXX';
         process.env.AWS_SECRET_ACCESS_KEY = 'ASAKXXX';
 
-        // Confirm outcome on { stdout }
+        // Confirm outcome on { output }
         const response = await runServerless({
           fixture: 'invocation',
           command: 'invoke local',
@@ -1465,6 +981,7 @@ describe('test/unit/lib/plugins/aws/invokeLocal/index.test.js', () => {
           },
           configExt: {
             provider: {
+              runtime: 'nodejs14.x',
               environment: {
                 PROVIDER_LEVEL_VAR: 'PROVIDER_LEVEL_VAR_VALUE',
                 NULL_VAR: null,
@@ -1480,8 +997,8 @@ describe('test/unit/lib/plugins/aws/invokeLocal/index.test.js', () => {
             },
           },
         });
-        const stdoutAsJson = JSON.parse(response.stdoutData);
-        responseBody = JSON.parse(stdoutAsJson.body);
+        const outputAsJson = JSON.parse(response.output);
+        responseBody = JSON.parse(outputAsJson.body);
       });
 
       after(() => {
@@ -1528,203 +1045,197 @@ describe('test/unit/lib/plugins/aws/invokeLocal/index.test.js', () => {
   describe('Node.js', () => {
     testRuntime('callback');
 
-    // All tested with individual runServerless run
-    xit('TODO: should support success resolution via async function', async () => {
-      // Confirm outcome on { stdout }
-      await runServerless({
+    it('should support success resolution via async function', async () => {
+      const { output } = await runServerless({
         fixture: 'invocation',
         command: 'invoke local',
         options: { function: 'async' },
       });
 
-      // Replaces
-      // https://github.com/serverless/serverless/blob/95c0bc09421b869ae1d8fc5dea42a2fce1c2023e/test/unit/lib/plugins/aws/invokeLocal/index.test.js#L762-L767
-      // https://github.com/serverless/serverless/blob/95c0bc09421b869ae1d8fc5dea42a2fce1c2023e/test/unit/lib/plugins/aws/invokeLocal/index.test.js#L830-L840
-      // https://github.com/serverless/serverless/blob/95c0bc09421b869ae1d8fc5dea42a2fce1c2023e/test/unit/lib/plugins/aws/invokeLocal/index.test.js#L881-L892
-      // https://github.com/serverless/serverless/blob/95c0bc09421b869ae1d8fc5dea42a2fce1c2023e/test/unit/lib/plugins/aws/invokeLocal/index.test.js#L917-L922
+      expect(output).to.include('Invoked');
     });
-    xit('TODO: should support success resolution via context.done', async () => {
-      // Confirm outcome on { stdout }
-      await runServerless({
+
+    it('should support success resolution via context.done', async () => {
+      const { output } = await runServerless({
         fixture: 'invocation',
         command: 'invoke local',
         options: { function: 'contextDone' },
       });
 
-      // Replaces
-      // https://github.com/serverless/serverless/blob/95c0bc09421b869ae1d8fc5dea42a2fce1c2023e/test/unit/lib/plugins/aws/invokeLocal/index.test.js#L609-L625
-      // https://github.com/serverless/serverless/blob/95c0bc09421b869ae1d8fc5dea42a2fce1c2023e/test/unit/lib/plugins/aws/invokeLocal/index.test.js#L771-L783
+      expect(output).to.include('Invoked');
     });
-    xit('TODO: should support success resolution via context.succeed', async () => {
-      // Confirm outcome on { stdout }
-      await runServerless({
+
+    it('should support success resolution via context.succeed', async () => {
+      const { output } = await runServerless({
         fixture: 'invocation',
         command: 'invoke local',
         options: { function: 'contextSucceed' },
       });
+
+      expect(output).to.include('Invoked');
     });
-    xit('TODO: should support immediate failure at initialization', async () => {
+
+    it('should support immediate failure at initialization', async () => {
       await expect(
         runServerless({
           fixture: 'invocation',
           command: 'invoke local',
           options: { function: 'initFail' },
         })
-      ).to.eventually.be.rejected.and.have.property('code', 'TODO');
-
-      // Replaces
-      // https://github.com/serverless/serverless/blob/95c0bc09421b869ae1d8fc5dea42a2fce1c2023e/test/unit/lib/plugins/aws/invokeLocal/index.test.js#L702-L717
-      // https://github.com/serverless/serverless/blob/95c0bc09421b869ae1d8fc5dea42a2fce1c2023e/test/unit/lib/plugins/aws/invokeLocal/index.test.js#L727-L737
+      ).to.eventually.be.rejected.and.have.property(
+        'code',
+        'INVOKE_LOCAL_LAMBDA_INITIALIZATION_FAILED'
+      );
     });
-    xit('TODO: should support immediate failure at invocation', async () => {
+
+    it('should support immediate failure at invocation', async () => {
       await expect(
         runServerless({
           fixture: 'invocation',
           command: 'invoke local',
           options: { function: 'invocationFail' },
         })
-      ).to.eventually.be.rejected.and.have.property('code', 'TODO');
+      ).to.eventually.be.rejectedWith('Invocation fail');
     });
-    xit('TODO: should support failure resolution via async function', async () => {
-      await expect(
-        runServerless({
-          fixture: 'invocation',
-          command: 'invoke local',
-          options: { function: 'async', data: '{"shouldFail":true}' },
-        })
-      ).to.eventually.be.rejected.and.have.property('code', 'TODO');
 
-      // Replaces
-      // https://github.com/serverless/serverless/blob/95c0bc09421b869ae1d8fc5dea42a2fce1c2023e/test/unit/lib/plugins/aws/invokeLocal/index.test.js#L683-L689
-      // https://github.com/serverless/serverless/blob/95c0bc09421b869ae1d8fc5dea42a2fce1c2023e/test/unit/lib/plugins/aws/invokeLocal/index.test.js#L719-L725
-      // https://github.com/serverless/serverless/blob/95c0bc09421b869ae1d8fc5dea42a2fce1c2023e/test/unit/lib/plugins/aws/invokeLocal/index.test.js#L756-L760
-      // https://github.com/serverless/serverless/blob/95c0bc09421b869ae1d8fc5dea42a2fce1c2023e/test/unit/lib/plugins/aws/invokeLocal/index.test.js#L895-L915
+    it('should support failure resolution via async function', async () => {
+      const { output } = await runServerless({
+        fixture: 'invocation',
+        command: 'invoke local',
+        options: { function: 'async', data: '{"shouldFail":true}' },
+      });
+
+      expect(output).to.include('Failed on request');
     });
-    xit('TODO: should support failure resolution via callback', async () => {
-      await expect(
-        runServerless({
-          fixture: 'invocation',
-          command: 'invoke local',
-          options: { function: 'callback', data: '{"shouldFail":true}' },
-        })
-      ).to.eventually.be.rejected.and.have.property('code', 'TODO');
 
-      // Replaces
-      // https://github.com/serverless/serverless/blob/95c0bc09421b869ae1d8fc5dea42a2fce1c2023e/test/unit/lib/plugins/aws/invokeLocal/index.test.js#L691-L700
+    it('should support failure resolution via callback', async () => {
+      const { output } = await runServerless({
+        fixture: 'invocation',
+        command: 'invoke local',
+        options: { function: 'callback', data: '{"shouldFail":true}' },
+      });
+
+      expect(output).to.include('Failed on request');
     });
-    xit('TODO: should support failure resolution via context.done', async () => {
-      await expect(
-        runServerless({
-          fixture: 'invocation',
-          command: 'invoke local',
-          options: { function: 'contextDone', data: '{"shouldFail":true}' },
-        })
-      ).to.eventually.be.rejected.and.have.property('code', 'TODO');
 
-      // Replaces
-      // https://github.com/serverless/serverless/blob/95c0bc09421b869ae1d8fc5dea42a2fce1c2023e/test/unit/lib/plugins/aws/invokeLocal/index.test.js#L785-L794
+    it('should support failure resolution via context.done', async () => {
+      const { output } = await runServerless({
+        fixture: 'invocation',
+        command: 'invoke local',
+        options: { function: 'contextDone', data: '{"shouldFail":true}' },
+      });
+
+      expect(output).to.include('Failed on request');
     });
-    xit('TODO: should support failure resolution via context.fail', async () => {
-      await expect(
-        runServerless({
-          fixture: 'invocation',
-          command: 'invoke local',
-          options: { function: 'contextSucceed', data: '{"shouldFail":true}' },
-        })
-      ).to.eventually.be.rejected.and.have.property('code', 'TODO');
+
+    it('should support failure resolution via context.fail', async () => {
+      const { output } = await runServerless({
+        fixture: 'invocation',
+        command: 'invoke local',
+        options: { function: 'contextSucceed', data: '{"shouldFail":true}' },
+      });
+
+      expect(output).to.include('Failed on request');
     });
-    xit('TODO: should recognize first resolution', async () => {
-      // Confirm outcome on { stdout }
-      await runServerless({
+
+    it('should recognize first resolution', async () => {
+      const { output: firstRunOutput } = await runServerless({
         fixture: 'invocation',
         command: 'invoke local',
         options: { function: 'doubledResolutionCallbackFirst' },
       });
-      // Confirm outcome on { stdout }
-      await runServerless({
+      const { output: secondRunOutput } = await runServerless({
         fixture: 'invocation',
         command: 'invoke local',
         options: { function: 'doubledResolutionPromiseFirst' },
       });
 
-      // Replaces
-      // https://github.com/serverless/serverless/blob/95c0bc09421b869ae1d8fc5dea42a2fce1c2023e/test/unit/lib/plugins/aws/invokeLocal/index.test.js#L798-L810
-      // https://github.com/serverless/serverless/blob/95c0bc09421b869ae1d8fc5dea42a2fce1c2023e/test/unit/lib/plugins/aws/invokeLocal/index.test.js#L814-L826
+      expect(firstRunOutput).to.include('callback');
+      expect(secondRunOutput).to.include('promise');
     });
-    xit('TODO: should support context.remainingTimeInMillis()', async () => {
-      // Confirm outcome on { stdout }
-      await runServerless({
+
+    it('should support context.remainingTimeInMillis()', async () => {
+      const { output } = await runServerless({
         fixture: 'invocation',
         command: 'invoke local',
         options: { function: 'remainingTime' },
       });
 
-      // Replaces
-      // https://github.com/serverless/serverless/blob/95c0bc09421b869ae1d8fc5dea42a2fce1c2023e/test/unit/lib/plugins/aws/invokeLocal/index.test.js#L639-L668
-      // https://github.com/serverless/serverless/blob/95c0bc09421b869ae1d8fc5dea42a2fce1c2023e/test/unit/lib/plugins/aws/invokeLocal/index.test.js#L843-L878
+      const body = JSON.parse(output).body;
+      const [firstRemainingMs, secondRemainingMs, thirdRemainingMs] = JSON.parse(body).data;
+      expect(firstRemainingMs).to.be.lte(3000);
+      expect(secondRemainingMs).to.be.lte(2910);
+      expect(thirdRemainingMs).to.be.lte(secondRemainingMs);
     });
   });
 
-  describe.skip('Python', () => {
-    // If Python runtime is not installed, skip below tests by:
-    // - Invoke skip with notice as here;
-    // https://github.com/serverless/serverless/blob/2d6824cde531ba56758f441b39b5ab018702e866/lib/plugins/aws/invokeLocal/index.test.js#L1001-L1003
-    // - Ensure all other tests are skipped
-    testRuntime('python'); // TODO: Configure python handler
+  describe('Python', () => {
+    before(async function () {
+      const executable = process.platform === 'win32' ? 'python.exe' : 'python';
+      try {
+        await spawnExt(executable, ['--version']);
+      } catch (err) {
+        skipWithNotice(this, 'Python runtime is not installed');
+      }
+    });
+
+    testRuntime('python');
     describe('context.remainingTimeInMillis', () => {
-      it('TODO: should support context.get_remaining_time_in_millis()', async () => {
-        // Confirm outcome on { stdout }
-        await runServerless({
+      it('should support context.get_remaining_time_in_millis()', async () => {
+        const { output } = await runServerless({
           fixture: 'invocation',
           command: 'invoke local',
-          options: { function: 'pythonRemainingTime' }, // TODO: Configure python handler
+          options: { function: 'pythonRemainingTime' },
         });
 
-        // Replaces
-        // https://github.com/serverless/serverless/blob/95c0bc09421b869ae1d8fc5dea42a2fce1c2023e/test/unit/lib/plugins/aws/invokeLocal/index.test.js#L941-L969
+        const { start, stop } = JSON.parse(output);
+        expect(start).to.lte(3000);
+        expect(stop).to.lte(2910);
       });
     });
   });
 
-  describe.skip('Ruby', () => {
-    // If Ruby runtime is not installed, skip below tests by:
-    // - Invoke skip with notice as here;
-    // https://github.com/serverless/serverless/blob/2d6824cde531ba56758f441b39b5ab018702e866/lib/plugins/aws/invokeLocal/index.test.js#L1043-L1045
-    // - Ensure all other tests are skipped
-    testRuntime('ruby'); // TODO: Configure ruby handler
-    it('TODO: should suppurt class/module address in handler for "ruby*" runtime', async () => {
-      // Confirm outcome on { stdout }
-      await runServerless({
+  describe('Ruby', () => {
+    before(async function () {
+      const executable = process.platform === 'win32' ? 'ruby.exe' : 'ruby';
+      try {
+        await spawnExt(executable, ['--version']);
+      } catch (err) {
+        skipWithNotice(this, 'Ruby runtime is not installed');
+      }
+    });
+
+    testRuntime('ruby');
+
+    it('should support class/module address in handler for "ruby*" runtime', async () => {
+      const { output } = await runServerless({
         fixture: 'invocation',
         command: 'invoke local',
-        options: { function: 'rubyClass' }, // TODO: Configure ruby handler
+        options: { function: 'rubyClass' },
       });
 
-      // Replaces
-      // https://github.com/serverless/serverless/blob/95c0bc09421b869ae1d8fc5dea42a2fce1c2023e/test/unit/lib/plugins/aws/invokeLocal/index.test.js#L549-L565
-      // https://github.com/serverless/serverless/blob/95c0bc09421b869ae1d8fc5dea42a2fce1c2023e/test/unit/lib/plugins/aws/invokeLocal/index.test.js#L1012-L1032
+      expect(output).to.include('rubyclass');
     });
-    it('TODO: should support context.get_remaining_time_in_millis()', async () => {
-      // Confirm outcome on { stdout }
-      await runServerless({
+    it('should support context.get_remaining_time_in_millis()', async () => {
+      const { output } = await runServerless({
         fixture: 'invocation',
         command: 'invoke local',
-        options: { function: 'rubyRemainingTime' }, // TODO: Configure ruby handler
+        options: { function: 'rubyRemainingTime' },
       });
 
-      // Replaces
-      // https://github.com/serverless/serverless/blob/95c0bc09421b869ae1d8fc5dea42a2fce1c2023e/test/unit/lib/plugins/aws/invokeLocal/index.test.js#L993-L1010
+      const { start, stop } = JSON.parse(output);
+      expect(start).to.lte(6000);
+      expect(stop).to.lte(5910);
     });
-    it('TODO: should support context.deadline_ms', async () => {
-      // Confirm outcome on { stdout }
-      await runServerless({
+    it('should support context.deadline_ms', async () => {
+      const { output } = await runServerless({
         fixture: 'invocation',
         command: 'invoke local',
-        options: { function: 'rubyDeadline' }, // TODO: Configure ruby handler
+        options: { function: 'rubyDeadline' },
       });
 
-      // Replaces
-      // https://github.com/serverless/serverless/blob/95c0bc09421b869ae1d8fc5dea42a2fce1c2023e/test/unit/lib/plugins/aws/invokeLocal/index.test.js#L1034-L1051
+      const { deadlineMs } = JSON.parse(output);
+      expect(deadlineMs).to.be.gt(Date.now());
     });
   });
 
diff --git a/test/unit/lib/plugins/aws/invoke.test.js b/test/unit/lib/plugins/aws/invoke.test.js
index ce032ac2b83..89c6f9672c5 100644
--- a/test/unit/lib/plugins/aws/invoke.test.js
+++ b/test/unit/lib/plugins/aws/invoke.test.js
@@ -3,244 +3,16 @@
 const chai = require('chai');
 const sinon = require('sinon');
 const path = require('path');
-const proxyquire = require('proxyquire');
-const AwsProvider = require('../../../../../lib/plugins/aws/provider');
-const Serverless = require('../../../../../lib/Serverless');
 const { getTmpDirPath } = require('../../../../utils/fs');
 const runServerless = require('../../../../utils/run-serverless');
 const ServerlessError = require('../../../../../lib/serverless-error');
+const fixtures = require('../../../../fixtures/programmatic');
 
 chai.use(require('chai-as-promised'));
 chai.use(require('sinon-chai'));
 
 const expect = chai.expect;
 
-describe('AwsInvoke', () => {
-  let AwsInvoke;
-  let awsInvoke;
-  let serverless;
-  let stdinStub;
-  const options = {
-    stage: 'dev',
-    region: 'us-east-1',
-    function: 'first',
-  };
-
-  beforeEach(() => {
-    stdinStub = sinon.stub().resolves('');
-    AwsInvoke = proxyquire('../../../../../lib/plugins/aws/invoke', {
-      'get-stdin': stdinStub,
-    });
-    serverless = new Serverless();
-    serverless.setProvider('aws', new AwsProvider(serverless, options));
-    serverless.processedInput = { commands: ['invoke'] };
-    awsInvoke = new AwsInvoke(serverless, options);
-  });
-
-  describe('#extendedValidate()', () => {
-    let backupIsTTY;
-    beforeEach(() => {
-      serverless.serviceDir = true;
-      serverless.service.environment = {
-        vars: {},
-        stages: {
-          dev: {
-            vars: {},
-            regions: {
-              'us-east-1': {
-                vars: {},
-              },
-            },
-          },
-        },
-      };
-      serverless.service.functions = {
-        first: {
-          handler: true,
-        },
-      };
-      awsInvoke.options.data = null;
-      awsInvoke.options.path = false;
-      awsInvoke.provider.cachedCredentials = { accessKeyId: 'foo', secretAccessKey: 'bar' };
-
-      // Ensure there's no attempt to read path from stdin
-      backupIsTTY = process.stdin.isTTY;
-      process.stdin.isTTY = true;
-    });
-
-    afterEach(() => {
-      if (backupIsTTY) process.stdin.isTTY = backupIsTTY;
-      else delete process.stdin.isTTY;
-    });
-
-    it('it should throw error if function is not provided', () => {
-      serverless.service.functions = null;
-      return expect(awsInvoke.extendedValidate()).to.be.rejected;
-    });
-
-    it('should not throw error when there is no input data', async () => {
-      awsInvoke.options.data = undefined;
-
-      await expect(awsInvoke.extendedValidate()).to.be.fulfilled;
-
-      expect(awsInvoke.options.data).to.equal('');
-    });
-
-    it('should keep data if it is a simple string', async () => {
-      awsInvoke.options.data = 'simple-string';
-
-      await expect(awsInvoke.extendedValidate()).to.be.fulfilled;
-
-      expect(awsInvoke.options.data).to.equal('simple-string');
-    });
-
-    it('should parse data if it is a json string', async () => {
-      awsInvoke.options.data = '{"key": "value"}';
-
-      await expect(awsInvoke.extendedValidate()).to.be.fulfilled;
-
-      expect(awsInvoke.options.data).to.deep.equal({ key: 'value' });
-    });
-
-    it('should skip parsing data if "raw" requested', async () => {
-      awsInvoke.options.data = '{"key": "value"}';
-      awsInvoke.options.raw = true;
-
-      await expect(awsInvoke.extendedValidate()).to.be.fulfilled;
-
-      expect(awsInvoke.options.data).to.deep.equal('{"key": "value"}');
-    });
-
-    it('it should parse file if relative file path is provided', async () => {
-      serverless.serviceDir = getTmpDirPath();
-      const data = {
-        testProp: 'testValue',
-      };
-      serverless.utils.writeFileSync(
-        path.join(serverless.serviceDir, 'data.json'),
-        JSON.stringify(data)
-      );
-      awsInvoke.options.path = 'data.json';
-
-      await expect(awsInvoke.extendedValidate()).to.be.fulfilled;
-
-      expect(awsInvoke.options.data).to.deep.equal(data);
-    });
-
-    it('it should parse file if absolute file path is provided', async () => {
-      serverless.serviceDir = getTmpDirPath();
-      const data = {
-        testProp: 'testValue',
-      };
-      const dataFile = path.join(serverless.serviceDir, 'data.json');
-      serverless.utils.writeFileSync(dataFile, JSON.stringify(data));
-      awsInvoke.options.path = dataFile;
-
-      await expect(awsInvoke.extendedValidate()).to.be.fulfilled;
-
-      expect(awsInvoke.options.data).to.deep.equal(data);
-    });
-
-    it('it should parse a yaml file if file path is provided', async () => {
-      serverless.serviceDir = getTmpDirPath();
-      const yamlContent = 'testProp: testValue';
-
-      serverless.utils.writeFileSync(path.join(serverless.serviceDir, 'data.yml'), yamlContent);
-      awsInvoke.options.path = 'data.yml';
-
-      await expect(awsInvoke.extendedValidate()).to.be.fulfilled;
-
-      expect(awsInvoke.options.data).to.deep.equal({
-        testProp: 'testValue',
-      });
-    });
-
-    it('it should throw error if file path does not exist', () => {
-      serverless.serviceDir = getTmpDirPath();
-      awsInvoke.options.path = 'some/path';
-
-      return expect(awsInvoke.extendedValidate()).to.be.rejectedWith(
-        'The file you provided does not exist.'
-      );
-    });
-
-    it('should resolve if path is not given', () => {
-      awsInvoke.options.path = false;
-      return expect(awsInvoke.extendedValidate()).to.be.fulfilled;
-    });
-  });
-
-  describe('#invoke()', () => {
-    let invokeStub;
-    beforeEach(() => {
-      invokeStub = sinon.stub(awsInvoke.provider, 'request').resolves();
-      awsInvoke.serverless.service.service = 'new-service';
-      awsInvoke.options = {
-        stage: 'dev',
-        function: 'first',
-        functionObj: {
-          name: 'customName',
-        },
-      };
-    });
-
-    it('should invoke with other invocation type', async () => {
-      awsInvoke.options.type = 'OtherType';
-
-      await awsInvoke.invoke();
-      expect(invokeStub.calledOnce).to.be.equal(true);
-      expect(
-        invokeStub.calledWithExactly('Lambda', 'invoke', {
-          FunctionName: 'customName',
-          InvocationType: 'OtherType',
-          LogType: 'None',
-          Payload: Buffer.from(JSON.stringify({})),
-        })
-      ).to.be.equal(true);
-      awsInvoke.provider.request.restore();
-    });
-
-    it('should be able to invoke with a qualifier', async () => {
-      awsInvoke.options.qualifier = 'somelongqualifier';
-
-      await awsInvoke.invoke();
-
-      expect(invokeStub.calledOnce).to.be.equal(true);
-
-      expect(
-        invokeStub.calledWithExactly('Lambda', 'invoke', {
-          FunctionName: 'customName',
-          InvocationType: 'RequestResponse',
-          LogType: 'None',
-          Payload: Buffer.from(JSON.stringify({})),
-          Qualifier: 'somelongqualifier',
-        })
-      ).to.be.equal(true);
-
-      awsInvoke.provider.request.restore();
-    });
-  });
-
-  describe('#log()', () => {
-    it('rejects the promise for failed invocations', () => {
-      const invocationReplyMock = {
-        Payload: `
-        {
-         "testProp": "testValue"
-        }
-        `,
-        LogResult: 'test',
-        FunctionError: true,
-      };
-
-      return expect(() => awsInvoke.log(invocationReplyMock)).to.throw(
-        Error,
-        'Invoked function failed'
-      );
-    });
-  });
-});
-
 describe('test/unit/lib/plugins/aws/invoke.test.js', () => {
   describe('Common', () => {
     let lambdaInvokeStub;
@@ -281,49 +53,74 @@ describe('test/unit/lib/plugins/aws/invoke.test.js', () => {
       });
     });
 
-    xit('TODO: should support JSON string data', async () => {
-      // Replaces
-      // https://github.com/serverless/serverless/blob/537fcac7597f0c6efbae7a5fc984270a78a2a53a/test/unit/lib/plugins/aws/invoke.test.js#L123-L129
+    it('should support JSON string data', async () => {
+      expect(lambdaInvokeStub).to.be.calledWith({
+        FunctionName: result.serverless.service.getFunction('callback').name,
+        InvocationType: 'RequestResponse',
+        LogType: 'Tail',
+        Payload: Buffer.from(JSON.stringify({ inputKey: 'inputValue' })),
+      });
     });
 
     it('should log payload', () => {
-      expect(result.stdoutData).to.contain(
-        '{\n    "inputKey": "inputValue"\n}\n\u001b[90m--------------------------------------------------------------------\u001b[39m\ntest\n'
-      );
+      expect(result.output).to.contain('"inputKey": "inputValue"');
     });
   });
 
-  xit('TODO: should accept no data', async () => {
-    await runServerless({
+  it('should accept no data', async () => {
+    const lambdaInvokeStub = sinon.stub();
+    const result = await runServerless({
       fixture: 'invocation',
       command: 'invoke',
-      options: { function: 'callback' },
+      options: {
+        function: 'callback',
+      },
       awsRequestStubMap: {
-        // Stub AWS SDK invocation, and confirm `Payload` param
+        Lambda: {
+          invoke: (args) => {
+            lambdaInvokeStub.returns('payload');
+            return lambdaInvokeStub(args);
+          },
+        },
       },
     });
-    // Replaces
-    // https://github.com/serverless/serverless/blob/537fcac7597f0c6efbae7a5fc984270a78a2a53a/test/unit/lib/plugins/aws/invoke.test.js#L107-L113
+    expect(lambdaInvokeStub.args[0][0]).to.deep.equal({
+      FunctionName: result.serverless.service.getFunction('callback').name,
+      InvocationType: 'RequestResponse',
+      LogType: 'None',
+      Payload: Buffer.from('{}'),
+    });
   });
 
-  xit('TODO: should support plain string data', async () => {
-    await runServerless({
+  it('should support plain string data', async () => {
+    const lambdaInvokeStub = sinon.stub();
+    const result = await runServerless({
       fixture: 'invocation',
       command: 'invoke',
       options: {
         function: 'callback',
-        data: 'inputData',
+        data: 'simple-string',
       },
       awsRequestStubMap: {
-        // Stub AWS SDK invocation, and confirm `Payload` param
+        Lambda: {
+          invoke: (args) => {
+            lambdaInvokeStub.returns('payload');
+            return lambdaInvokeStub(args);
+          },
+        },
       },
     });
-    // Replaces
-    // https://github.com/serverless/serverless/blob/537fcac7597f0c6efbae7a5fc984270a78a2a53a/test/unit/lib/plugins/aws/invoke.test.js#L115-L121
+    expect(lambdaInvokeStub.args[0][0]).to.deep.equal({
+      FunctionName: result.serverless.service.getFunction('callback').name,
+      InvocationType: 'RequestResponse',
+      LogType: 'None',
+      Payload: Buffer.from(JSON.stringify('simple-string')),
+    });
   });
 
-  xit('TODO: should should not attempt to parse data with raw option', async () => {
-    await runServerless({
+  it('should should not attempt to parse data with raw option', async () => {
+    const lambdaInvokeStub = sinon.stub();
+    const result = await runServerless({
       fixture: 'invocation',
       command: 'invoke',
       options: {
@@ -332,15 +129,25 @@ describe('test/unit/lib/plugins/aws/invoke.test.js', () => {
         raw: true,
       },
       awsRequestStubMap: {
-        // Stub AWS SDK invocation, and confirm `Payload` param
+        Lambda: {
+          invoke: (args) => {
+            lambdaInvokeStub.returns('payload');
+            return lambdaInvokeStub(args);
+          },
+        },
       },
     });
-    // Replaces
-    // https://github.com/serverless/serverless/blob/537fcac7597f0c6efbae7a5fc984270a78a2a53a/test/unit/lib/plugins/aws/invoke.test.js#L131-L138
+    expect(lambdaInvokeStub.args[0][0]).to.deep.equal({
+      FunctionName: result.serverless.service.getFunction('callback').name,
+      InvocationType: 'RequestResponse',
+      LogType: 'None',
+      Payload: Buffer.from(JSON.stringify('{"inputKey":"inputValue"}')),
+    });
   });
 
-  xit('TODO: should support JSON file path as data', async () => {
-    await runServerless({
+  it('should support JSON file path as data', async () => {
+    const lambdaInvokeStub = sinon.stub();
+    const result = await runServerless({
       fixture: 'invocation',
       command: 'invoke',
       options: {
@@ -348,31 +155,53 @@ describe('test/unit/lib/plugins/aws/invoke.test.js', () => {
         path: 'payload.json',
       },
       awsRequestStubMap: {
-        // Stub AWS SDK invocation, and confirm `Payload` param
+        Lambda: {
+          invoke: (args) => {
+            lambdaInvokeStub.returns('payload');
+            return lambdaInvokeStub(args);
+          },
+        },
       },
     });
-    // Replaces
-    // https://github.com/serverless/serverless/blob/537fcac7597f0c6efbae7a5fc984270a78a2a53a/test/unit/lib/plugins/aws/invoke.test.js#L140-L154
+    expect(lambdaInvokeStub.args[0][0]).to.deep.equal({
+      FunctionName: result.serverless.service.getFunction('callback').name,
+      InvocationType: 'RequestResponse',
+      LogType: 'None',
+      Payload: Buffer.from(JSON.stringify({ dataInputKey: 'dataInputValue' })),
+    });
   });
 
-  xit('TODO: should support absolute file path as data', async () => {
-    await runServerless({
-      fixture: 'invocation',
+  it('should support absolute file path as data', async () => {
+    const lambdaInvokeStub = sinon.stub();
+    const { servicePath: serviceDir } = await fixtures.setup('invocation');
+    const pathToPayload = path.join(serviceDir, 'payload.json');
+    const result = await runServerless({
+      cwd: serviceDir,
       command: 'invoke',
       options: {
         function: 'callback',
-        path: '' /* TODO: Pass absolute path to payload.json in fixture */,
+        path: pathToPayload,
       },
       awsRequestStubMap: {
-        // Stub AWS SDK invocation, and confirm `Payload` param
+        Lambda: {
+          invoke: (args) => {
+            lambdaInvokeStub.returns('payload');
+            return lambdaInvokeStub(args);
+          },
+        },
       },
     });
-    // Replaces
-    // https://github.com/serverless/serverless/blob/537fcac7597f0c6efbae7a5fc984270a78a2a53a/test/unit/lib/plugins/aws/invoke.test.js#L156-L168
+    expect(lambdaInvokeStub.args[0][0]).to.deep.equal({
+      FunctionName: result.serverless.service.getFunction('callback').name,
+      InvocationType: 'RequestResponse',
+      LogType: 'None',
+      Payload: Buffer.from(JSON.stringify({ dataInputKey: 'dataInputValue' })),
+    });
   });
 
-  xit('TODO: should support YAML file path as data', async () => {
-    await runServerless({
+  it('should support YAML file path as data', async () => {
+    const lambdaInvokeStub = sinon.stub();
+    const result = await runServerless({
       fixture: 'invocation',
       command: 'invoke',
       options: {
@@ -380,14 +209,23 @@ describe('test/unit/lib/plugins/aws/invoke.test.js', () => {
         path: 'payload.yaml',
       },
       awsRequestStubMap: {
-        // Stub AWS SDK invocation, and confirm `Payload` param
+        Lambda: {
+          invoke: (args) => {
+            lambdaInvokeStub.returns('payload');
+            return lambdaInvokeStub(args);
+          },
+        },
       },
     });
-    // Replaces
-    // https://github.com/serverless/serverless/blob/537fcac7597f0c6efbae7a5fc984270a78a2a53a/test/unit/lib/plugins/aws/invoke.test.js#L170-L185
+    expect(lambdaInvokeStub.args[0][0]).to.deep.equal({
+      FunctionName: result.serverless.service.getFunction('callback').name,
+      InvocationType: 'RequestResponse',
+      LogType: 'None',
+      Payload: Buffer.from(JSON.stringify({ dataInputKey: 'dataInputValue' })),
+    });
   });
 
-  xit('TODO: should throw error if data file path does not exist', async () => {
+  it('should throw error if data file path does not exist', async () => {
     await expect(
       runServerless({
         fixture: 'invocation',
@@ -397,25 +235,22 @@ describe('test/unit/lib/plugins/aws/invoke.test.js', () => {
           path: 'not-existing.yaml',
         },
       })
-    ).to.eventually.be.rejected.and.have.property('code', 'TODO');
-    // Replaces
-    // https://github.com/serverless/serverless/blob/537fcac7597f0c6efbae7a5fc984270a78a2a53a/test/unit/lib/plugins/aws/invoke.test.js#L192-L199
+    ).to.eventually.be.rejected.and.have.property('code', 'FILE_NOT_FOUND');
   });
 
-  xit('TODO: should throw error if function is not provided', async () => {
+  it('should throw error if function is not provided', async () => {
     await expect(
       runServerless({
         fixture: 'invocation',
         command: 'invoke',
         options: { function: 'notExisting' },
       })
-    ).to.eventually.be.rejected.and.have.property('code', 'TODO');
-    // Replaces
-    // https://github.com/serverless/serverless/blob/537fcac7597f0c6efbae7a5fc984270a78a2a53a/test/unit/lib/plugins/aws/invoke.test.js#L102-L105
+    ).to.eventually.be.rejected.and.have.property('code', 'FUNCTION_MISSING_IN_SERVICE');
   });
 
-  xit('TODO: should support --type option', async () => {
-    await runServerless({
+  it('should support --type option', async () => {
+    const lambdaInvokeStub = sinon.stub();
+    const result = await runServerless({
       fixture: 'invocation',
       command: 'invoke',
       options: {
@@ -423,15 +258,25 @@ describe('test/unit/lib/plugins/aws/invoke.test.js', () => {
         type: 'Event',
       },
       awsRequestStubMap: {
-        // Stub AWS SDK invocation, and confirm `InvocationType` param
+        Lambda: {
+          invoke: (args) => {
+            lambdaInvokeStub.returns('payload');
+            return lambdaInvokeStub(args);
+          },
+        },
       },
     });
-    // Replaces
-    // https://github.com/serverless/serverless/blob/537fcac7597f0c6efbae7a5fc984270a78a2a53a/test/unit/lib/plugins/aws/invoke.test.js#L253-L267
+    expect(lambdaInvokeStub.args[0][0]).to.deep.equal({
+      FunctionName: result.serverless.service.getFunction('callback').name,
+      InvocationType: 'Event',
+      LogType: 'None',
+      Payload: Buffer.from('{}'),
+    });
   });
 
-  xit('TODO: should support --qualifier option', async () => {
-    await runServerless({
+  it('should support --qualifier option', async () => {
+    const lambdaInvokeStub = sinon.stub();
+    const result = await runServerless({
       fixture: 'invocation',
       command: 'invoke',
       options: {
@@ -439,11 +284,21 @@ describe('test/unit/lib/plugins/aws/invoke.test.js', () => {
         qualifier: 'foo',
       },
       awsRequestStubMap: {
-        // Stub AWS SDK invocation, and confirm `Qualifier` param
+        Lambda: {
+          invoke: (args) => {
+            lambdaInvokeStub.returns('payload');
+            return lambdaInvokeStub(args);
+          },
+        },
       },
     });
-    // Replaces
-    // https://github.com/serverless/serverless/blob/537fcac7597f0c6efbae7a5fc984270a78a2a53a/test/unit/lib/plugins/aws/invoke.test.js#L269-L287
+    expect(lambdaInvokeStub.args[0][0]).to.deep.equal({
+      FunctionName: result.serverless.service.getFunction('callback').name,
+      InvocationType: 'RequestResponse',
+      LogType: 'None',
+      Qualifier: 'foo',
+      Payload: Buffer.from('{}'),
+    });
   });
 
   it('should support `--context` param', async () => {
@@ -573,18 +428,50 @@ describe('test/unit/lib/plugins/aws/invoke.test.js', () => {
     expect(lambdaInvokeStub).to.have.been.callCount(0);
   });
 
-  xit('TODO: should fail the process for failed invocations', async () => {
+  it('should fail the process for failed invocations', async () => {
+    const lambdaInvokeStub = sinon.stub();
     await expect(
       runServerless({
         fixture: 'invocation',
         command: 'invoke',
         options: {
           function: 'callback',
-          path: 'not-existing.yaml',
+        },
+        awsRequestStubMap: {
+          Lambda: {
+            invoke: (args) => {
+              lambdaInvokeStub.returns({
+                Payload: args.Payload,
+                LogResult: Buffer.from('test').toString('base64'),
+                FunctionError: true,
+              });
+              return lambdaInvokeStub(args);
+            },
+          },
+        },
+      })
+    ).to.be.eventually.rejectedWith(Error, 'Invoked function failed');
+  });
+
+  it('should resolve if path is not given', async () => {
+    const lambdaInvokeStub = sinon.stub();
+    await expect(
+      runServerless({
+        fixture: 'invocation',
+        command: 'invoke',
+        options: {
+          function: 'callback',
+          path: false,
+        },
+        awsRequestStubMap: {
+          Lambda: {
+            invoke: (args) => {
+              lambdaInvokeStub.returns('payload');
+              return lambdaInvokeStub(args);
+            },
+          },
         },
       })
-    ).to.eventually.be.rejected.and.have.property('code', 'TODO');
-    // Replace
-    // https://github.com/serverless/serverless/blob/537fcac7597f0c6efbae7a5fc984270a78a2a53a/test/unit/lib/plugins/aws/invoke.test.js#L317-L332
+    ).to.be.eventually.fulfilled;
   });
 });
diff --git a/test/unit/lib/plugins/aws/lib/getServiceState.test.js b/test/unit/lib/plugins/aws/lib/get-service-state.test.js
similarity index 90%
rename from test/unit/lib/plugins/aws/lib/getServiceState.test.js
rename to test/unit/lib/plugins/aws/lib/get-service-state.test.js
index dfcf4d47701..1d9789e238e 100644
--- a/test/unit/lib/plugins/aws/lib/getServiceState.test.js
+++ b/test/unit/lib/plugins/aws/lib/get-service-state.test.js
@@ -3,9 +3,9 @@
 const path = require('path');
 const chai = require('chai');
 const sinon = require('sinon');
-const Serverless = require('../../../../../../lib/Serverless');
+const Serverless = require('../../../../../../lib/serverless');
 const AwsProvider = require('../../../../../../lib/plugins/aws/provider');
-const getServiceState = require('../../../../../../lib/plugins/aws/lib/getServiceState');
+const getServiceState = require('../../../../../../lib/plugins/aws/lib/get-service-state');
 
 const expect = chai.expect;
 chai.use(require('sinon-chai'));
@@ -17,7 +17,7 @@ describe('#getServiceState()', () => {
   const awsPlugin = {};
 
   beforeEach(() => {
-    serverless = new Serverless();
+    serverless = new Serverless({ commands: [], options: {} });
     serverless.serviceDir = 'my-service';
     awsPlugin.serverless = serverless;
     awsPlugin.provider = new AwsProvider(serverless, options);
diff --git a/test/unit/lib/plugins/aws/lib/monitorStack.test.js b/test/unit/lib/plugins/aws/lib/monitor-stack.test.js
similarity index 99%
rename from test/unit/lib/plugins/aws/lib/monitorStack.test.js
rename to test/unit/lib/plugins/aws/lib/monitor-stack.test.js
index 604f23f3134..490ee3f3fdb 100644
--- a/test/unit/lib/plugins/aws/lib/monitorStack.test.js
+++ b/test/unit/lib/plugins/aws/lib/monitor-stack.test.js
@@ -2,17 +2,17 @@
 
 const chai = require('chai');
 const sinon = require('sinon');
-const Serverless = require('../../../../../../lib/Serverless');
+const Serverless = require('../../../../../../lib/serverless');
 const AwsProvider = require('../../../../../../lib/plugins/aws/provider');
-const CLI = require('../../../../../../lib/classes/CLI');
-const monitorStack = require('../../../../../../lib/plugins/aws/lib/monitorStack');
+const CLI = require('../../../../../../lib/classes/cli');
+const monitorStack = require('../../../../../../lib/plugins/aws/lib/monitor-stack');
 
 chai.use(require('chai-as-promised'));
 
 const { expect } = chai;
 
 describe('monitorStack', () => {
-  const serverless = new Serverless();
+  const serverless = new Serverless({ commands: [], options: {} });
   const awsPlugin = {};
 
   beforeEach(() => {
@@ -407,7 +407,7 @@ describe('monitorStack', () => {
             EventId: '1e2f3g4h',
             StackName: 'new-service-dev',
             LogicalResourceId: 'mochaS3',
-            ResourceType: 'S3::Bucket',
+            ResourceType: 'AWS::S3::Bucket',
             Timestamp: new Date(),
             ResourceStatus: 'CREATE_FAILED',
             ResourceStatusReason: 'Bucket already exists',
@@ -921,7 +921,6 @@ describe('monitorStack', () => {
             ResourceType: 'AWS::CloudFormation::Stack',
             Timestamp: new Date(),
             ResourceStatus: 'UPDATE_ROLLBACK_IN_PROGRESS',
-            ResourceStatusReason: 'Export is in use',
           },
         ],
       };
@@ -943,7 +942,7 @@ describe('monitorStack', () => {
 
       return awsPlugin.monitorStack('update', cfDataMock, { frequency: 10 }).catch((e) => {
         let errorMessage = 'An error occurred: ';
-        errorMessage += 'mocha - Export is in use.';
+        errorMessage += 'mocha - UPDATE_ROLLBACK_IN_PROGRESS.';
         expect(e.name).to.be.equal('ServerlessError');
         expect(e.message).to.be.equal(errorMessage);
         // callCount is 2 because Serverless will immediately exits and shows the error
diff --git a/test/unit/lib/plugins/aws/lib/naming.test.js b/test/unit/lib/plugins/aws/lib/naming.test.js
index 949f4f37a37..f72e3a433d5 100644
--- a/test/unit/lib/plugins/aws/lib/naming.test.js
+++ b/test/unit/lib/plugins/aws/lib/naming.test.js
@@ -4,7 +4,7 @@ const expect = require('chai').expect;
 const _ = require('lodash');
 
 const SDK = require('../../../../../../lib/plugins/aws/provider');
-const Serverless = require('../../../../../../lib/Serverless');
+const Serverless = require('../../../../../../lib/serverless');
 
 describe('#naming()', () => {
   let options;
@@ -15,6 +15,8 @@ describe('#naming()', () => {
     options = {
       stage: 'dev',
       region: 'us-east-1',
+      commands: [],
+      options: {},
     };
     serverless = new Serverless(options);
     sdk = new SDK(serverless, options);
@@ -102,10 +104,32 @@ describe('#naming()', () => {
     });
   });
 
+  describe('#getStackChangeSetName()', () => {
+    it('should use the service name & stage if custom stack name not provided', () => {
+      serverless.service.service = 'myService';
+      expect(sdk.naming.getStackChangeSetName()).to.equal(
+        `${serverless.service.service}-${sdk.naming.provider.getStage()}-change-set`
+      );
+    });
+
+    it('should use the custom stack name if provided', () => {
+      serverless.service.provider.stackName = 'app-dev-testApp';
+      serverless.service.service = 'myService';
+      serverless.service.provider.stage = sdk.naming.provider.getStage();
+      expect(sdk.naming.getStackChangeSetName()).to.equal('app-dev-testApp-change-set');
+    });
+  });
+
   describe('#getRolePath()', () => {
     it('should return `/`', () => {
       expect(sdk.naming.getRolePath()).to.equal('/');
     });
+
+    it('uses custom role path', () => {
+      const customRolePath = '/custom-role-path/';
+      _.set(sdk.naming.provider, 'serverless.service.provider.iam.role.path', customRolePath);
+      expect(sdk.naming.getRolePath()).to.eql(customRolePath);
+    });
   });
 
   describe('#getRoleName()', () => {
@@ -699,9 +723,11 @@ describe('#naming()', () => {
         sdk.naming.getLambdaCognitoUserPoolPermissionLogicalId(
           'functionName',
           'Pool1',
-          'CustomMessage'
+          'PreSignUp_ExternalProvider'
         )
-      ).to.equal('FunctionNameLambdaPermissionCognitoUserPoolPool1TriggerSourceCustomMessage');
+      ).to.equal(
+        'FunctionNameLambdaPermissionCognitoUserPoolPool1TriggerSourcePreSignUpExternalProvider'
+      );
     });
 
     describe('#getLambdaAlbPermissionLogicalId()', () => {
@@ -786,7 +812,7 @@ describe('#naming()', () => {
       );
     });
 
-    it('should return a prefixed unique identifer of not longer than 32 characters if alb.targetGroupPrefix is set', () => {
+    it('should return a prefixed unique identifier of not longer than 32 characters if alb.targetGroupPrefix is set', () => {
       serverless.service.service = 'myService';
       serverless.service.provider.alb = {};
       serverless.service.provider.alb.targetGroupPrefix = 'myPrefix-';
@@ -1017,4 +1043,28 @@ describe('#naming()', () => {
       );
     });
   });
+
+  describe('#getHttpApiName()', () => {
+    it('should return the composition of service & stage name if custom name not provided and shouldStartNameWithService is true', () => {
+      serverless.service.service = 'myService';
+      serverless.service.provider.httpApi = { shouldStartNameWithService: true };
+      expect(sdk.naming.getHttpApiName()).to.equal(
+        `${serverless.service.service}-${sdk.naming.provider.getStage()}`
+      );
+    });
+
+    it('should return the composition of stage & service name if custom name not provided', () => {
+      serverless.service.service = 'myService';
+      expect(sdk.naming.getHttpApiName()).to.equal(
+        `${sdk.naming.provider.getStage()}-${serverless.service.service}`
+      );
+    });
+
+    it('should return the custom api name if provided', () => {
+      serverless.service.provider.httpApi = { name: 'app-dev-testApi' };
+      serverless.service.service = 'myService';
+      serverless.service.provider.stage = sdk.naming.provider.getStage();
+      expect(sdk.naming.getHttpApiName()).to.equal('app-dev-testApi');
+    });
+  });
 });
diff --git a/test/unit/lib/plugins/aws/lib/normalizeFiles.test.js b/test/unit/lib/plugins/aws/lib/normalize-files.test.js
similarity index 99%
rename from test/unit/lib/plugins/aws/lib/normalizeFiles.test.js
rename to test/unit/lib/plugins/aws/lib/normalize-files.test.js
index 0d9ea475eec..cd3baaba6db 100644
--- a/test/unit/lib/plugins/aws/lib/normalizeFiles.test.js
+++ b/test/unit/lib/plugins/aws/lib/normalize-files.test.js
@@ -1,7 +1,7 @@
 'use strict';
 
 const expect = require('chai').expect;
-const normalizeFiles = require('../../../../../../lib/plugins/aws/lib/normalizeFiles');
+const normalizeFiles = require('../../../../../../lib/plugins/aws/lib/normalize-files');
 
 describe('normalizeFiles', () => {
   describe('#normalizeCloudFormationTemplate()', () => {
diff --git a/test/unit/lib/plugins/aws/lib/setBucketName.test.js b/test/unit/lib/plugins/aws/lib/set-bucket-name.test.js
similarity index 92%
rename from test/unit/lib/plugins/aws/lib/setBucketName.test.js
rename to test/unit/lib/plugins/aws/lib/set-bucket-name.test.js
index a015119bd81..1732bd6d829 100644
--- a/test/unit/lib/plugins/aws/lib/setBucketName.test.js
+++ b/test/unit/lib/plugins/aws/lib/set-bucket-name.test.js
@@ -4,7 +4,7 @@ const expect = require('chai').expect;
 const sinon = require('sinon');
 const AwsProvider = require('../../../../../../lib/plugins/aws/provider');
 const AwsDeploy = require('../../../../../../lib/plugins/aws/deploy/index');
-const Serverless = require('../../../../../../lib/Serverless');
+const Serverless = require('../../../../../../lib/serverless');
 
 describe('#setBucketName()', () => {
   let serverless;
@@ -12,7 +12,7 @@ describe('#setBucketName()', () => {
   let getServerlessDeploymentBucketNameStub;
 
   beforeEach(() => {
-    serverless = new Serverless();
+    serverless = new Serverless({ commands: [], options: {} });
     serverless.serviceDir = 'foo';
     const options = {
       stage: 'dev',
diff --git a/test/unit/lib/plugins/aws/lib/updateStack.test.js b/test/unit/lib/plugins/aws/lib/updateStack.test.js
deleted file mode 100644
index b19d148ac40..00000000000
--- a/test/unit/lib/plugins/aws/lib/updateStack.test.js
+++ /dev/null
@@ -1,297 +0,0 @@
-'use strict';
-
-const expect = require('chai').expect;
-const sinon = require('sinon');
-const AwsProvider = require('../../../../../../lib/plugins/aws/provider');
-const AwsDeploy = require('../../../../../../lib/plugins/aws/deploy');
-const Serverless = require('../../../../../../lib/Serverless');
-const { getTmpDirPath } = require('../../../../../utils/fs');
-
-describe('updateStack', () => {
-  let serverless;
-  let awsDeploy;
-  const tmpDirPath = getTmpDirPath();
-
-  beforeEach(() => {
-    const options = {
-      stage: 'dev',
-      region: 'us-east-1',
-    };
-    serverless = new Serverless();
-    serverless.serviceDir = 'foo';
-    serverless.setProvider('aws', new AwsProvider(serverless, options));
-    awsDeploy = new AwsDeploy(serverless, options);
-
-    awsDeploy.deployedFunctions = [{ name: 'first', zipFileKey: 'zipFileOfFirstFunction' }];
-    awsDeploy.bucketName = 'deployment-bucket';
-    serverless.service.service = `service-${new Date().getTime().toString()}`;
-    serverless.serviceDir = tmpDirPath;
-    awsDeploy.serverless.service.package.artifactDirectoryName = 'somedir';
-    awsDeploy.serverless.cli = new serverless.classes.CLI();
-  });
-
-  describe('#createFallback()', () => {
-    let createStackStub;
-
-    beforeEach(() => {
-      createStackStub = sinon.stub(awsDeploy.provider, 'request').resolves();
-      sinon.stub(awsDeploy, 'monitorStack').resolves();
-    });
-
-    afterEach(() => {
-      awsDeploy.provider.request.restore();
-      awsDeploy.monitorStack.restore();
-    });
-
-    it('should create a stack with the CF template URL', () => {
-      const compiledTemplateFileName = 'compiled-cloudformation-template.json';
-
-      return awsDeploy.createFallback().then(() => {
-        expect(createStackStub.calledOnce).to.be.equal(true);
-        expect(
-          createStackStub.calledWithExactly('CloudFormation', 'createStack', {
-            StackName: awsDeploy.provider.naming.getStackName(),
-            OnFailure: 'DELETE',
-            Capabilities: ['CAPABILITY_IAM', 'CAPABILITY_NAMED_IAM'],
-            Parameters: [],
-            TemplateURL: `https://s3.amazonaws.com/${awsDeploy.bucketName}/${awsDeploy.serverless.service.package.artifactDirectoryName}/${compiledTemplateFileName}`,
-            Tags: [{ Key: 'STAGE', Value: awsDeploy.provider.getStage() }],
-          })
-        ).to.be.equal(true);
-      });
-    });
-
-    it('should include custom stack tags', () => {
-      awsDeploy.serverless.service.provider.stackTags = { STAGE: 'overridden', tag1: 'value1' };
-
-      return awsDeploy.createFallback().then(() => {
-        expect(createStackStub.args[0][2].Tags).to.deep.equal([
-          { Key: 'STAGE', Value: 'overridden' },
-          { Key: 'tag1', Value: 'value1' },
-        ]);
-      });
-    });
-
-    it('should override the default tags custom stack tags (case-insensitive)', () => {
-      awsDeploy.serverless.service.provider.stackTags = { stage: 'overridden', tag1: 'value1' };
-
-      return awsDeploy.createFallback().then(() => {
-        expect(createStackStub.args[0][2].Tags).to.deep.equal([
-          { Key: 'stage', Value: 'overridden' },
-          { Key: 'tag1', Value: 'value1' },
-        ]);
-      });
-    });
-
-    it('should add CAPABILITY_AUTO_EXPAND if a Transform directive is specified', () => {
-      awsDeploy.serverless.service.provider.compiledCloudFormationTemplate = {
-        Transform: 'MyMacro',
-      };
-
-      return awsDeploy.createFallback().then(() => {
-        expect(createStackStub.args[0][2].Capabilities).to.contain('CAPABILITY_AUTO_EXPAND');
-      });
-    });
-
-    it('should use CloudFormation service role if it is specified', () => {
-      awsDeploy.serverless.service.provider.cfnRole = 'arn:aws:iam::123456789012:role/myrole';
-
-      return awsDeploy.createFallback().then(() => {
-        expect(createStackStub.args[0][2].RoleARN).to.equal(
-          'arn:aws:iam::123456789012:role/myrole'
-        );
-      });
-    });
-
-    it('should use use notificationArns if it is specified', () => {
-      const mytopicArn = 'arn:aws:sns::123456789012:mytopic';
-      awsDeploy.serverless.service.provider.notificationArns = [mytopicArn];
-
-      return awsDeploy.createFallback().then(() => {
-        expect(createStackStub.args[0][2].NotificationARNs).to.deep.equal([mytopicArn]);
-      });
-    });
-
-    it('should add Stack Parameters on createFallback', () => {
-      awsDeploy.serverless.service.provider.stackParameters = [
-        { ParameterKey: 'key', ParameterValue: 'value' },
-      ];
-
-      return awsDeploy.createFallback().then(() => {
-        expect(createStackStub.args[0][2].Parameters).to.deep.equal(
-          awsDeploy.serverless.service.provider.stackParameters
-        );
-      });
-    });
-  });
-
-  describe('#update()', () => {
-    let updateStackStub;
-
-    beforeEach(() => {
-      updateStackStub = sinon.stub(awsDeploy.provider, 'request').resolves();
-      sinon.stub(awsDeploy, 'monitorStack').resolves();
-    });
-
-    afterEach(() => {
-      awsDeploy.provider.request.restore();
-      awsDeploy.monitorStack.restore();
-    });
-
-    it('should update the stack', () =>
-      awsDeploy.update().then(() => {
-        const compiledTemplateFileName = 'compiled-cloudformation-template.json';
-        expect(updateStackStub.calledOnce).to.be.equal(true);
-        expect(
-          updateStackStub.calledWithExactly('CloudFormation', 'updateStack', {
-            StackName: awsDeploy.provider.naming.getStackName(),
-            Capabilities: ['CAPABILITY_IAM', 'CAPABILITY_NAMED_IAM'],
-            Parameters: [],
-            TemplateURL: `https://s3.amazonaws.com/${awsDeploy.bucketName}/${awsDeploy.serverless.service.package.artifactDirectoryName}/${compiledTemplateFileName}`,
-            Tags: [{ Key: 'STAGE', Value: awsDeploy.provider.getStage() }],
-          })
-        ).to.be.equal(true);
-      }));
-
-    it('should include custom stack tags and policy', () => {
-      awsDeploy.serverless.service.provider.stackTags = { STAGE: 'overridden', tag1: 'value1' };
-      awsDeploy.serverless.service.provider.stackPolicy = [
-        {
-          Effect: 'Allow',
-          Principal: '*',
-          Action: 'Update:*',
-          Resource: '*',
-        },
-      ];
-
-      return awsDeploy.update().then(() => {
-        expect(updateStackStub.args[0][2].Tags).to.deep.equal([
-          { Key: 'STAGE', Value: 'overridden' },
-          { Key: 'tag1', Value: 'value1' },
-        ]);
-        expect(updateStackStub.args[0][2].StackPolicyBody).to.equal(
-          '{"Statement":[{"Effect":"Allow","Principal":"*","Action":"Update:*","Resource":"*"}]}'
-        );
-      });
-    });
-
-    it('should include custom policy and override the default tags custom stack tags (case-insensitive)', () => {
-      awsDeploy.serverless.service.provider.stackTags = { stage: 'overridden', tag1: 'value1' };
-      awsDeploy.serverless.service.provider.stackPolicy = [
-        {
-          Effect: 'Allow',
-          Principal: '*',
-          Action: 'Update:*',
-          Resource: '*',
-        },
-      ];
-
-      return awsDeploy.update().then(() => {
-        expect(updateStackStub.args[0][2].Tags).to.deep.equal([
-          { Key: 'stage', Value: 'overridden' },
-          { Key: 'tag1', Value: 'value1' },
-        ]);
-        expect(updateStackStub.args[0][2].StackPolicyBody).to.equal(
-          '{"Statement":[{"Effect":"Allow","Principal":"*","Action":"Update:*","Resource":"*"}]}'
-        );
-      });
-    });
-
-    it('should success if no changes to stack happened', () => {
-      awsDeploy.provider.request.restore();
-      sinon
-        .stub(awsDeploy.provider, 'request')
-        .rejects(new Error('No updates are to be performed.'));
-
-      return awsDeploy.update();
-    });
-
-    it('should add CAPABILITY_AUTO_EXPAND if a Transform directive is specified', () => {
-      awsDeploy.serverless.service.provider.compiledCloudFormationTemplate = {
-        Transform: 'MyMacro',
-      };
-
-      return awsDeploy.update().then(() => {
-        expect(updateStackStub.args[0][2].Capabilities).to.contain('CAPABILITY_AUTO_EXPAND');
-      });
-    });
-
-    it('should use CloudFormation service role if it is specified', () => {
-      awsDeploy.serverless.service.provider.cfnRole = 'arn:aws:iam::123456789012:role/myrole';
-
-      return awsDeploy.update().then(() => {
-        expect(updateStackStub.args[0][2].RoleARN).to.equal(
-          'arn:aws:iam::123456789012:role/myrole'
-        );
-      });
-    });
-
-    it('should use use notificationArns if it is specified', () => {
-      const mytopicArn = 'arn:aws:sns::123456789012:mytopic';
-      awsDeploy.serverless.service.provider.notificationArns = [mytopicArn];
-
-      return awsDeploy.update().then(() => {
-        expect(updateStackStub.args[0][2].NotificationARNs).to.deep.equal([mytopicArn]);
-      });
-    });
-
-    it('should use use rollbackConfiguration if it is specified', () => {
-      const myRollbackConfiguration = {
-        MonitoringTimeInMinutes: 20,
-        RollbackTriggers: [
-          {
-            Arn: 'arn:aws:cloudwatch:us-east-1:000000000000:alarm:health',
-            Type: 'AWS::CloudWatch::Alarm',
-          },
-          {
-            Arn: 'arn:aws:cloudwatch:us-east-1:000000000000:alarm:latency',
-            Type: 'AWS::CloudWatch::Alarm',
-          },
-        ],
-      };
-      awsDeploy.serverless.service.provider.rollbackConfiguration = myRollbackConfiguration;
-
-      return awsDeploy.update().then(() => {
-        expect(updateStackStub.args[0][2].RollbackConfiguration).to.deep.equal(
-          myRollbackConfiguration
-        );
-      });
-    });
-
-    it('should add Stack Parameters on update', () => {
-      awsDeploy.serverless.service.provider.stackParameters = [
-        { ParameterKey: 'key', ParameterValue: 'value' },
-      ];
-
-      return awsDeploy.update().then(() => {
-        expect(updateStackStub.args[0][2].Parameters).to.deep.equal(
-          awsDeploy.serverless.service.provider.stackParameters
-        );
-      });
-    });
-  });
-
-  describe('#updateStack()', () => {
-    it('should fallback to createStack if createLater flag exists', () => {
-      awsDeploy.createLater = true;
-      const createFallbackStub = sinon.stub(awsDeploy, 'createFallback').resolves();
-      const updateStub = sinon.stub(awsDeploy, 'update').resolves();
-
-      return awsDeploy.updateStack().then(() => {
-        expect(createFallbackStub.calledOnce).to.be.equal(true);
-        expect(updateStub.called).to.be.equal(false);
-        awsDeploy.update.restore();
-      });
-    });
-
-    it('should run promise chain in order', () => {
-      const updateStub = sinon.stub(awsDeploy, 'update').resolves();
-
-      return awsDeploy.updateStack().then(() => {
-        expect(updateStub.calledOnce).to.be.equal(true);
-
-        awsDeploy.update.restore();
-      });
-    });
-  });
-});
diff --git a/test/unit/lib/plugins/aws/lib/validate.test.js b/test/unit/lib/plugins/aws/lib/validate.test.js
index 4f9f149bc52..70db8932d4f 100644
--- a/test/unit/lib/plugins/aws/lib/validate.test.js
+++ b/test/unit/lib/plugins/aws/lib/validate.test.js
@@ -3,7 +3,7 @@
 const chai = require('chai');
 const AwsProvider = require('../../../../../../lib/plugins/aws/provider');
 const validate = require('../../../../../../lib/plugins/aws/lib/validate');
-const Serverless = require('../../../../../../lib/Serverless');
+const Serverless = require('../../../../../../lib/serverless');
 const ServerlessError = require('../../../../../../lib/serverless-error');
 
 chai.use(require('chai-as-promised'));
@@ -11,7 +11,7 @@ chai.use(require('chai-as-promised'));
 const expect = chai.expect;
 
 describe('#validate', () => {
-  const serverless = new Serverless();
+  const serverless = new Serverless({ commands: [], options: {} });
   let provider;
   const awsPlugin = {};
 
diff --git a/test/unit/lib/plugins/aws/logs.test.js b/test/unit/lib/plugins/aws/logs.test.js
index ec92dc92a6f..fafcbf490fc 100644
--- a/test/unit/lib/plugins/aws/logs.test.js
+++ b/test/unit/lib/plugins/aws/logs.test.js
@@ -5,7 +5,7 @@ const sinon = require('sinon');
 const proxyquire = require('proxyquire');
 const AwsProvider = require('../../../../../lib/plugins/aws/provider');
 const AwsLogs = require('../../../../../lib/plugins/aws/logs');
-const Serverless = require('../../../../../lib/Serverless');
+const Serverless = require('../../../../../lib/serverless');
 
 // Configure chai
 chai.use(require('chai-as-promised'));
@@ -21,7 +21,7 @@ describe('AwsLogs', () => {
       region: 'us-east-1',
       function: 'first',
     };
-    serverless = new Serverless();
+    serverless = new Serverless({ commands: [], options: {} });
     const provider = new AwsProvider(serverless, options);
     provider.cachedCredentials = {
       credentials: { accessKeyId: 'foo', secretAccessKey: 'bar' },
@@ -335,7 +335,7 @@ describe('AwsLogs', () => {
         region: 'us-east-1',
         function: 'first',
       };
-      serverless = new Serverless();
+      serverless = new Serverless({ commands: [], options: {} });
       const provider = new AwsProvider(serverless, options);
       provider.cachedCredentials = {
         credentials: { accessKeyId: 'foo', secretAccessKey: 'bar' },
diff --git a/test/unit/lib/plugins/aws/metrics.test.js b/test/unit/lib/plugins/aws/metrics.test.js
index 19d0beece82..4e982c11676 100644
--- a/test/unit/lib/plugins/aws/metrics.test.js
+++ b/test/unit/lib/plugins/aws/metrics.test.js
@@ -4,9 +4,8 @@ const expect = require('chai').expect;
 const sinon = require('sinon');
 const AwsProvider = require('../../../../../lib/plugins/aws/provider');
 const AwsMetrics = require('../../../../../lib/plugins/aws/metrics');
-const Serverless = require('../../../../../lib/Serverless');
-const CLI = require('../../../../../lib/classes/CLI');
-const chalk = require('chalk');
+const Serverless = require('../../../../../lib/serverless');
+const CLI = require('../../../../../lib/classes/cli');
 const dayjs = require('dayjs');
 
 const LocalizedFormat = require('dayjs/plugin/localizedFormat');
@@ -18,7 +17,7 @@ describe('AwsMetrics', () => {
   let serverless;
 
   beforeEach(() => {
-    serverless = new Serverless();
+    serverless = new Serverless({ commands: [], options: {} });
     serverless.cli = new CLI(serverless);
     const options = {
       stage: 'dev',
@@ -371,197 +370,4 @@ describe('AwsMetrics', () => {
       ).to.equal(true);
     });
   });
-
-  describe('#showMetrics()', () => {
-    let consoleLogStub;
-
-    beforeEach(() => {
-      awsMetrics.serverless.service.functions = {
-        function1: {
-          name: 'func1',
-        },
-        function2: {
-          name: 'func2',
-        },
-      };
-      awsMetrics.options.startTime = '1970-01-01';
-      awsMetrics.options.endTime = '1970-01-02';
-      consoleLogStub = sinon.stub(serverless.cli, 'consoleLog').returns();
-    });
-
-    afterEach(() => {
-      serverless.cli.consoleLog.restore();
-    });
-
-    it('should display service wide metrics if no function option is specified', () => {
-      const metrics = [
-        [
-          {
-            ResponseMetadata: {
-              RequestId: '1f50045b-b569-11e6-86c6-eb54d1aaa755-func1',
-            },
-            Label: 'Invocations',
-            Datapoints: [{ Sum: 12 }, { Sum: 8 }],
-          },
-          {
-            ResponseMetadata: {
-              RequestId: '1f59059b-b569-11e6-aa18-c7bab68810d2-func1',
-            },
-            Label: 'Throttles',
-            Datapoints: [{ Sum: 15 }, { Sum: 15 }],
-          },
-          {
-            ResponseMetadata: {
-              RequestId: '1f50c7b1-b569-11e6-b1b6-ab86694b617b-func1',
-            },
-            Label: 'Errors',
-            Datapoints: [{ Sum: 0 }],
-          },
-          {
-            ResponseMetadata: {
-              RequestId: '1f63db14-b569-11e6-8501-d98a275ce164-func1',
-            },
-            Label: 'Duration',
-            Datapoints: [{ Average: 1000 }],
-          },
-        ],
-        [
-          {
-            ResponseMetadata: {
-              RequestId: '1f50045b-b569-11e6-86c6-eb54d1aaa755-func2',
-            },
-            Label: 'Invocations',
-            Datapoints: [{ Sum: 12 }, { Sum: 8 }],
-          },
-          {
-            ResponseMetadata: {
-              RequestId: '1f59059b-b569-11e6-aa18-c7bab68810d2-func2',
-            },
-            Label: 'Throttles',
-            Datapoints: [{ Sum: 15 }, { Sum: 15 }],
-          },
-          {
-            ResponseMetadata: {
-              RequestId: '1f50c7b1-b569-11e6-b1b6-ab86694b617b-func2',
-            },
-            Label: 'Errors',
-            Datapoints: [{ Sum: 0 }],
-          },
-          {
-            ResponseMetadata: {
-              RequestId: '1f63db14-b569-11e6-8501-d98a275ce164-func2',
-            },
-            Label: 'Duration',
-            Datapoints: [{ Average: 1000 }],
-          },
-        ],
-      ];
-
-      let expectedMessage = '';
-      expectedMessage += `${chalk.yellow.underline('Service wide metrics')}\n`;
-      expectedMessage += 'January 1, 1970 12:00 AM - January 2, 1970 12:00 AM\n\n';
-      expectedMessage += `${chalk.yellow('Invocations: 40 \n')}`;
-      expectedMessage += `${chalk.yellow('Throttles: 60 \n')}`;
-      expectedMessage += `${chalk.yellow('Errors: 0 \n')}`;
-      expectedMessage += `${chalk.yellow('Duration (avg.): 1000ms')}`;
-
-      awsMetrics.showMetrics(metrics);
-
-      expect(consoleLogStub.calledOnce).to.equal(true);
-      expect(consoleLogStub.getCall(0).args[0]).to.equal(expectedMessage);
-    });
-
-    it('should display correct average of service wide average function duration', () => {
-      const metrics = [
-        [
-          {
-            Label: 'Duration',
-            Datapoints: [{ Average: 100 }, { Average: 200 }, { Average: 300 }],
-          },
-        ],
-        [
-          {
-            Label: 'Duration',
-            Datapoints: [{ Average: 400 }, { Average: 500 }],
-          },
-        ],
-      ];
-
-      awsMetrics.showMetrics(metrics);
-
-      expect(consoleLogStub.getCall(0).args[0]).to.include('Duration (avg.): 300ms');
-    });
-
-    it('should display 0 as average function duration if no data by given period', () => {
-      const metrics = [[], []];
-
-      awsMetrics.showMetrics(metrics);
-
-      expect(consoleLogStub.getCall(0).args[0]).to.include('Duration (avg.): 0ms');
-    });
-
-    it('should display function metrics if function option is specified', () => {
-      awsMetrics.options.function = 'function1';
-
-      const metrics = [
-        [
-          {
-            ResponseMetadata: {
-              RequestId: '1f50045b-b569-11e6-86c6-eb54d1aaa755-func1',
-            },
-            Label: 'Invocations',
-            Datapoints: [{ Sum: 12 }, { Sum: 8 }],
-          },
-          {
-            ResponseMetadata: {
-              RequestId: '1f59059b-b569-11e6-aa18-c7bab68810d2-func1',
-            },
-            Label: 'Throttles',
-            Datapoints: [{ Sum: 15 }, { Sum: 15 }],
-          },
-          {
-            ResponseMetadata: {
-              RequestId: '1f50c7b1-b569-11e6-b1b6-ab86694b617b-func1',
-            },
-            Label: 'Errors',
-            Datapoints: [{ Sum: 0 }],
-          },
-          {
-            ResponseMetadata: {
-              RequestId: '1f63db14-b569-11e6-8501-d98a275ce164-func1',
-            },
-            Label: 'Duration',
-            Datapoints: [{ Average: 1000 }],
-          },
-        ],
-      ];
-
-      let expectedMessage = '';
-      expectedMessage += `${chalk.yellow.underline(awsMetrics.options.function)}\n`;
-      expectedMessage += 'January 1, 1970 12:00 AM - January 2, 1970 12:00 AM\n\n';
-      expectedMessage += `${chalk.yellow('Invocations: 20 \n')}`;
-      expectedMessage += `${chalk.yellow('Throttles: 30 \n')}`;
-      expectedMessage += `${chalk.yellow('Errors: 0 \n')}`;
-      expectedMessage += `${chalk.yellow('Duration (avg.): 1000ms')}`;
-
-      awsMetrics.showMetrics(metrics);
-
-      expect(consoleLogStub.calledOnce).to.equal(true);
-      expect(consoleLogStub.getCall(0).args[0]).to.equal(expectedMessage);
-    });
-
-    it('should resolve with an error message if no metrics are available', () => {
-      awsMetrics.options.function = 'function1';
-
-      let expectedMessage = '';
-      expectedMessage += `${chalk.yellow.underline(awsMetrics.options.function)}\n`;
-      expectedMessage += 'January 1, 1970 12:00 AM - January 2, 1970 12:00 AM\n\n';
-      expectedMessage += `${chalk.yellow('There are no metrics to show for these options')}`;
-
-      awsMetrics.showMetrics();
-
-      expect(consoleLogStub.calledOnce).to.equal(true);
-      expect(consoleLogStub.getCall(0).args[0]).to.equal(expectedMessage);
-    });
-  });
 });
diff --git a/test/unit/lib/plugins/aws/package/compile/events/activemq.test.js b/test/unit/lib/plugins/aws/package/compile/events/activemq.test.js
new file mode 100644
index 00000000000..78dd2d27565
--- /dev/null
+++ b/test/unit/lib/plugins/aws/package/compile/events/activemq.test.js
@@ -0,0 +1,201 @@
+'use strict';
+
+const chai = require('chai');
+const runServerless = require('../../../../../../../utils/run-serverless');
+
+const { expect } = chai;
+
+chai.use(require('chai-as-promised'));
+
+describe('test/unit/lib/plugins/aws/package/compile/events/activemq.test.js', () => {
+  const brokerArn = 'arn:aws:mq:us-east-1:0000:broker:ExampleMQBroker:b-xxx-xxx';
+  const basicAuthArn = 'arn:aws:secretsmanager:us-east-1:01234567890:secret:MyBrokerSecretName';
+  const queue = 'TestingQueue';
+  const enabled = false;
+  const batchSize = 5000;
+  const maximumBatchingWindow = 20;
+
+  describe('when there are activemq events defined', () => {
+    let minimalEventSourceMappingResource;
+    let allParamsEventSourceMappingResource;
+    let defaultIamRole;
+    let naming;
+
+    before(async () => {
+      const { awsNaming, cfTemplate } = await runServerless({
+        fixture: 'function',
+        configExt: {
+          functions: {
+            basic: {
+              events: [
+                {
+                  activemq: {
+                    queue,
+                    arn: brokerArn,
+                    basicAuthArn,
+                  },
+                },
+              ],
+            },
+            other: {
+              events: [
+                {
+                  activemq: {
+                    queue,
+                    arn: brokerArn,
+                    basicAuthArn,
+                    batchSize,
+                    maximumBatchingWindow,
+                    enabled,
+                  },
+                },
+              ],
+            },
+          },
+        },
+        command: 'package',
+      });
+      naming = awsNaming;
+      minimalEventSourceMappingResource =
+        cfTemplate.Resources[naming.getActiveMQEventLogicalId('basic', queue)];
+      allParamsEventSourceMappingResource =
+        cfTemplate.Resources[naming.getActiveMQEventLogicalId('other', queue)];
+      defaultIamRole = cfTemplate.Resources.IamRoleLambdaExecution;
+    });
+
+    it('should correctly compile EventSourceMapping resource properties with minimal configuration', () => {
+      expect(minimalEventSourceMappingResource.Properties).to.deep.equal({
+        EventSourceArn: brokerArn,
+        SourceAccessConfigurations: [
+          {
+            Type: 'BASIC_AUTH',
+            URI: basicAuthArn,
+          },
+        ],
+        Queues: [queue],
+        FunctionName: {
+          'Fn::GetAtt': [naming.getLambdaLogicalId('basic'), 'Arn'],
+        },
+      });
+    });
+
+    it('should update default IAM role with DescribeBroker statement', () => {
+      expect(defaultIamRole.Properties.Policies[0].PolicyDocument.Statement).to.deep.include({
+        Effect: 'Allow',
+        Action: ['mq:DescribeBroker'],
+        Resource: [brokerArn],
+      });
+    });
+
+    it('should update default IAM role with SecretsManager statement', () => {
+      expect(defaultIamRole.Properties.Policies[0].PolicyDocument.Statement).to.deep.include({
+        Effect: 'Allow',
+        Action: ['secretsmanager:GetSecretValue'],
+        Resource: [basicAuthArn],
+      });
+    });
+
+    it('should correctly compile EventSourceMapping resource DependsOn ', () => {
+      expect(minimalEventSourceMappingResource.DependsOn).to.equal('IamRoleLambdaExecution');
+      expect(allParamsEventSourceMappingResource.DependsOn).to.equal('IamRoleLambdaExecution');
+    });
+
+    it('should correctly compile EventSourceMapping resource with all parameters', () => {
+      expect(allParamsEventSourceMappingResource.Properties).to.deep.equal({
+        EventSourceArn: brokerArn,
+        BatchSize: batchSize,
+        MaximumBatchingWindowInSeconds: maximumBatchingWindow,
+        Enabled: enabled,
+        SourceAccessConfigurations: [
+          {
+            Type: 'BASIC_AUTH',
+            URI: basicAuthArn,
+          },
+        ],
+        Queues: [queue],
+        FunctionName: {
+          'Fn::GetAtt': [naming.getLambdaLogicalId('other'), 'Arn'],
+        },
+      });
+    });
+
+    it('should update default IAM role with EC2 statement', async () => {
+      expect(defaultIamRole.Properties.Policies[0].PolicyDocument.Statement).to.deep.include({
+        Effect: 'Allow',
+        Action: [
+          'ec2:CreateNetworkInterface',
+          'ec2:DescribeNetworkInterfaces',
+          'ec2:DescribeVpcs',
+          'ec2:DeleteNetworkInterface',
+          'ec2:DescribeSubnets',
+          'ec2:DescribeSecurityGroups',
+        ],
+        Resource: '*',
+      });
+    });
+  });
+
+  describe('configuring activemq events', () => {
+    it('should not add dependsOn for imported role', async () => {
+      const { awsNaming, cfTemplate } = await runServerless({
+        fixture: 'function',
+        configExt: {
+          functions: {
+            basic: {
+              role: { 'Fn::ImportValue': 'MyImportedRole' },
+              events: [
+                {
+                  activemq: {
+                    queue,
+                    arn: brokerArn,
+                    basicAuthArn,
+                  },
+                },
+              ],
+            },
+          },
+        },
+        command: 'package',
+      });
+
+      const eventSourceMappingResource =
+        cfTemplate.Resources[awsNaming.getActiveMQEventLogicalId('basic', queue)];
+      expect(eventSourceMappingResource.DependsOn).to.deep.equal([]);
+    });
+  });
+
+  describe('when no activemq events are defined', () => {
+    it('should not modify the default IAM role', async () => {
+      const { cfTemplate } = await runServerless({
+        fixture: 'function',
+        command: 'package',
+      });
+
+      const defaultIamRole = cfTemplate.Resources.IamRoleLambdaExecution;
+      expect(defaultIamRole.Properties.Policies[0].PolicyDocument.Statement).not.to.deep.include({
+        Effect: 'Allow',
+        Action: ['mq:DescribeBroker'],
+        Resource: [brokerArn],
+      });
+
+      expect(defaultIamRole.Properties.Policies[0].PolicyDocument.Statement).not.to.deep.include({
+        Effect: 'Allow',
+        Action: ['secretsmanager:GetSecretValue'],
+        Resource: [basicAuthArn],
+      });
+
+      expect(defaultIamRole.Properties.Policies[0].PolicyDocument.Statement).not.to.deep.include({
+        Effect: 'Allow',
+        Action: [
+          'ec2:CreateNetworkInterface',
+          'ec2:DescribeNetworkInterfaces',
+          'ec2:DescribeVpcs',
+          'ec2:DeleteNetworkInterface',
+          'ec2:DescribeSubnets',
+          'ec2:DescribeSecurityGroups',
+        ],
+        Resource: '*',
+      });
+    });
+  });
+});
diff --git a/test/unit/lib/plugins/aws/package/compile/events/alb/lib/healthCheck.test.js b/test/unit/lib/plugins/aws/package/compile/events/alb/lib/health-check.test.js
similarity index 100%
rename from test/unit/lib/plugins/aws/package/compile/events/alb/lib/healthCheck.test.js
rename to test/unit/lib/plugins/aws/package/compile/events/alb/lib/health-check.test.js
diff --git a/test/unit/lib/plugins/aws/package/compile/events/alb/lib/listenerRules.test.js b/test/unit/lib/plugins/aws/package/compile/events/alb/lib/listener-rules.test.js
similarity index 97%
rename from test/unit/lib/plugins/aws/package/compile/events/alb/lib/listenerRules.test.js
rename to test/unit/lib/plugins/aws/package/compile/events/alb/lib/listener-rules.test.js
index 1ed580aa7b9..fd155d69b47 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/alb/lib/listenerRules.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/alb/lib/listener-rules.test.js
@@ -2,14 +2,14 @@
 
 const expect = require('chai').expect;
 const AwsCompileAlbEvents = require('../../../../../../../../../../lib/plugins/aws/package/compile/events/alb/index');
-const Serverless = require('../../../../../../../../../../lib/Serverless');
+const Serverless = require('../../../../../../../../../../lib/serverless');
 const AwsProvider = require('../../../../../../../../../../lib/plugins/aws/provider');
 
 describe('#compileListenerRules()', () => {
   let awsCompileAlbEvents;
 
   beforeEach(() => {
-    const serverless = new Serverless();
+    const serverless = new Serverless({ commands: [], options: {} });
     serverless.setProvider('aws', new AwsProvider(serverless));
     serverless.service.service = 'some-service';
     serverless.service.provider.compiledCloudFormationTemplate = { Resources: {} };
diff --git a/test/unit/lib/plugins/aws/package/compile/events/alb/lib/permissions.test.js b/test/unit/lib/plugins/aws/package/compile/events/alb/lib/permissions.test.js
index 3c00dc18e3e..548e4bdf562 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/alb/lib/permissions.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/alb/lib/permissions.test.js
@@ -2,14 +2,14 @@
 
 const expect = require('chai').expect;
 const AwsCompileAlbEvents = require('../../../../../../../../../../lib/plugins/aws/package/compile/events/alb/index');
-const Serverless = require('../../../../../../../../../../lib/Serverless');
+const Serverless = require('../../../../../../../../../../lib/serverless');
 const AwsProvider = require('../../../../../../../../../../lib/plugins/aws/provider');
 
 describe('#compilePermissions()', () => {
   let awsCompileAlbEvents;
 
   beforeEach(() => {
-    const serverless = new Serverless();
+    const serverless = new Serverless({ commands: [], options: {} });
     serverless.setProvider('aws', new AwsProvider(serverless));
     serverless.service.service = 'some-service';
     serverless.service.provider.compiledCloudFormationTemplate = { Resources: {} };
diff --git a/test/unit/lib/plugins/aws/package/compile/events/alb/lib/targetGroups.test.js b/test/unit/lib/plugins/aws/package/compile/events/alb/lib/target-groups.test.js
similarity index 96%
rename from test/unit/lib/plugins/aws/package/compile/events/alb/lib/targetGroups.test.js
rename to test/unit/lib/plugins/aws/package/compile/events/alb/lib/target-groups.test.js
index a023dae550b..d46f744b8a7 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/alb/lib/targetGroups.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/alb/lib/target-groups.test.js
@@ -2,14 +2,14 @@
 
 const expect = require('chai').expect;
 const AwsCompileAlbEvents = require('../../../../../../../../../../lib/plugins/aws/package/compile/events/alb/index');
-const Serverless = require('../../../../../../../../../../lib/Serverless');
+const Serverless = require('../../../../../../../../../../lib/serverless');
 const AwsProvider = require('../../../../../../../../../../lib/plugins/aws/provider');
 
 describe('#compileTargetGroups()', () => {
   let awsCompileAlbEvents;
 
   beforeEach(() => {
-    const serverless = new Serverless();
+    const serverless = new Serverless({ commands: [], options: {} });
     serverless.setProvider('aws', new AwsProvider(serverless));
     serverless.service.service = 'some-service';
     serverless.service.provider.compiledCloudFormationTemplate = { Resources: {} };
diff --git a/test/unit/lib/plugins/aws/package/compile/events/alb/lib/validate.test.js b/test/unit/lib/plugins/aws/package/compile/events/alb/lib/validate.test.js
index 79f5a719ea8..e6079bfaeb4 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/alb/lib/validate.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/alb/lib/validate.test.js
@@ -2,14 +2,14 @@
 
 const expect = require('chai').expect;
 const AwsCompileAlbEvents = require('../../../../../../../../../../lib/plugins/aws/package/compile/events/alb/index');
-const Serverless = require('../../../../../../../../../../lib/Serverless');
+const Serverless = require('../../../../../../../../../../lib/serverless');
 const AwsProvider = require('../../../../../../../../../../lib/plugins/aws/provider');
 
 describe('#validate()', () => {
   let awsCompileAlbEvents;
 
   beforeEach(() => {
-    const serverless = new Serverless();
+    const serverless = new Serverless({ commands: [], options: {} });
     serverless.setProvider('aws', new AwsProvider(serverless));
     serverless.service.service = 'some-service';
     serverless.service.provider.compiledCloudFormationTemplate = { Resources: {} };
diff --git a/test/unit/lib/plugins/aws/package/compile/events/alexaSkill.test.js b/test/unit/lib/plugins/aws/package/compile/events/alexa-skill.test.js
similarity index 97%
rename from test/unit/lib/plugins/aws/package/compile/events/alexaSkill.test.js
rename to test/unit/lib/plugins/aws/package/compile/events/alexa-skill.test.js
index 27a5d860386..327177b2bde 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/alexaSkill.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/alexa-skill.test.js
@@ -4,15 +4,15 @@
 
 const expect = require('chai').expect;
 const AwsProvider = require('../../../../../../../../lib/plugins/aws/provider');
-const AwsCompileAlexaSkillEvents = require('../../../../../../../../lib/plugins/aws/package/compile/events/alexaSkill');
-const Serverless = require('../../../../../../../../lib/Serverless');
+const AwsCompileAlexaSkillEvents = require('../../../../../../../../lib/plugins/aws/package/compile/events/alexa-skill');
+const Serverless = require('../../../../../../../../lib/serverless');
 
 describe('AwsCompileAlexaSkillEvents', () => {
   let serverless;
   let awsCompileAlexaSkillEvents;
 
   beforeEach(() => {
-    serverless = new Serverless();
+    serverless = new Serverless({ commands: [], options: {} });
     serverless.service.provider.compiledCloudFormationTemplate = { Resources: {} };
     serverless.setProvider('aws', new AwsProvider(serverless));
     awsCompileAlexaSkillEvents = new AwsCompileAlexaSkillEvents(serverless);
diff --git a/test/unit/lib/plugins/aws/package/compile/events/alexaSmartHome.test.js b/test/unit/lib/plugins/aws/package/compile/events/alexa-smart-home.test.js
similarity index 97%
rename from test/unit/lib/plugins/aws/package/compile/events/alexaSmartHome.test.js
rename to test/unit/lib/plugins/aws/package/compile/events/alexa-smart-home.test.js
index cbb6613a28e..853c51ba40f 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/alexaSmartHome.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/alexa-smart-home.test.js
@@ -2,15 +2,15 @@
 
 const expect = require('chai').expect;
 const AwsProvider = require('../../../../../../../../lib/plugins/aws/provider');
-const AwsCompileAlexaSmartHomeEvents = require('../../../../../../../../lib/plugins/aws/package/compile/events/alexaSmartHome');
-const Serverless = require('../../../../../../../../lib/Serverless');
+const AwsCompileAlexaSmartHomeEvents = require('../../../../../../../../lib/plugins/aws/package/compile/events/alexa-smart-home');
+const Serverless = require('../../../../../../../../lib/serverless');
 
 describe('AwsCompileAlexaSmartHomeEvents', () => {
   let serverless;
   let awsCompileAlexaSmartHomeEvents;
 
   beforeEach(() => {
-    serverless = new Serverless();
+    serverless = new Serverless({ commands: [], options: {} });
     serverless.service.provider.compiledCloudFormationTemplate = { Resources: {} };
     serverless.setProvider('aws', new AwsProvider(serverless));
     awsCompileAlexaSmartHomeEvents = new AwsCompileAlexaSmartHomeEvents(serverless);
diff --git a/test/unit/lib/plugins/aws/package/compile/events/apiGateway/index.test.js b/test/unit/lib/plugins/aws/package/compile/events/api-gateway/index.test.js
similarity index 88%
rename from test/unit/lib/plugins/aws/package/compile/events/apiGateway/index.test.js
rename to test/unit/lib/plugins/aws/package/compile/events/api-gateway/index.test.js
index 72460c4631d..2d3fc12240b 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/apiGateway/index.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/api-gateway/index.test.js
@@ -3,18 +3,18 @@
 const expect = require('chai').expect;
 const sinon = require('sinon');
 const AwsProvider = require('../../../../../../../../../lib/plugins/aws/provider');
-const AwsCompileApigEvents = require('../../../../../../../../../lib/plugins/aws/package/compile/events/apiGateway/index');
-const Serverless = require('../../../../../../../../../lib/Serverless');
+const AwsCompileApigEvents = require('../../../../../../../../../lib/plugins/aws/package/compile/events/api-gateway/index');
+const Serverless = require('../../../../../../../../../lib/serverless');
 const validate = require('../../../../../../../../../lib/plugins/aws/lib/validate');
-const getServiceState = require('../../../../../../../../../lib/plugins/aws/lib/getServiceState');
-const updateStage = require('../../../../../../../../../lib/plugins/aws/package/compile/events/apiGateway/lib/hack/updateStage');
-const disassociateUsagePlan = require('../../../../../../../../../lib/plugins/aws/package/compile/events/apiGateway/lib/hack/disassociateUsagePlan');
+const getServiceState = require('../../../../../../../../../lib/plugins/aws/lib/get-service-state');
+const updateStage = require('../../../../../../../../../lib/plugins/aws/package/compile/events/api-gateway/lib/hack/update-stage');
+const disassociateUsagePlan = require('../../../../../../../../../lib/plugins/aws/package/compile/events/api-gateway/lib/hack/disassociate-usage-plan');
 
 describe('AwsCompileApigEvents', () => {
   let awsCompileApigEvents;
 
   beforeEach(() => {
-    const serverless = new Serverless();
+    const serverless = new Serverless({ commands: [], options: {} });
     serverless.service.environment = {
       vars: {},
       stages: {
@@ -40,6 +40,7 @@ describe('AwsCompileApigEvents', () => {
     let compileRestApiStub;
     let compileResourcesStub;
     let compileMethodsStub;
+    let compileRequestValidatorsStub;
     let compileDeploymentStub;
     let compileUsagePlanStub;
     let compilePermissionsStub;
@@ -51,6 +52,9 @@ describe('AwsCompileApigEvents', () => {
       compileRestApiStub = sinon.stub(awsCompileApigEvents, 'compileRestApi').resolves();
       compileResourcesStub = sinon.stub(awsCompileApigEvents, 'compileResources').resolves();
       compileMethodsStub = sinon.stub(awsCompileApigEvents, 'compileMethods').resolves();
+      compileRequestValidatorsStub = sinon
+        .stub(awsCompileApigEvents, 'compileRequestValidators')
+        .resolves();
       compileDeploymentStub = sinon.stub(awsCompileApigEvents, 'compileDeployment').resolves();
       compileUsagePlanStub = sinon.stub(awsCompileApigEvents, 'compileUsagePlan').resolves();
       compilePermissionsStub = sinon.stub(awsCompileApigEvents, 'compilePermissions').resolves();
@@ -65,6 +69,7 @@ describe('AwsCompileApigEvents', () => {
       awsCompileApigEvents.compileRestApi.restore();
       awsCompileApigEvents.compileResources.restore();
       awsCompileApigEvents.compileMethods.restore();
+      awsCompileApigEvents.compileRequestValidators.restore();
       awsCompileApigEvents.compileDeployment.restore();
       awsCompileApigEvents.compileUsagePlan.restore();
       awsCompileApigEvents.compilePermissions.restore();
@@ -99,7 +104,8 @@ describe('AwsCompileApigEvents', () => {
         expect(compileRestApiStub.calledAfter(validateStub)).to.be.equal(true);
         expect(compileResourcesStub.calledAfter(compileRestApiStub)).to.be.equal(true);
         expect(compileMethodsStub.calledAfter(compileResourcesStub)).to.be.equal(true);
-        expect(compileDeploymentStub.calledAfter(compileMethodsStub)).to.be.equal(true);
+        expect(compileRequestValidatorsStub.calledAfter(compileMethodsStub)).to.be.equal(true);
+        expect(compileDeploymentStub.calledAfter(compileRequestValidatorsStub)).to.be.equal(true);
         expect(compileUsagePlanStub.calledAfter(compileDeploymentStub)).to.be.equal(true);
         expect(compilePermissionsStub.calledAfter(compileUsagePlanStub)).to.be.equal(true);
         expect(compileStageStub.calledAfter(compilePermissionsStub)).to.be.equal(true);
diff --git a/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/apiKeys.test.js b/test/unit/lib/plugins/aws/package/compile/events/api-gateway/lib/api-keys.test.js
similarity index 54%
rename from test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/apiKeys.test.js
rename to test/unit/lib/plugins/aws/package/compile/events/api-gateway/lib/api-keys.test.js
index cdefc50eb2d..a4a7dbc1630 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/apiKeys.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/api-gateway/lib/api-keys.test.js
@@ -1,9 +1,10 @@
 'use strict';
 
 const expect = require('chai').expect;
-const AwsCompileApigEvents = require('../../../../../../../../../../lib/plugins/aws/package/compile/events/apiGateway/index');
-const Serverless = require('../../../../../../../../../../lib/Serverless');
+const AwsCompileApigEvents = require('../../../../../../../../../../lib/plugins/aws/package/compile/events/api-gateway/index');
+const Serverless = require('../../../../../../../../../../lib/serverless');
 const AwsProvider = require('../../../../../../../../../../lib/plugins/aws/provider');
+const runServerless = require('../../../../../../../../../utils/run-serverless');
 
 describe('#compileApiKeys()', () => {
   let serverless;
@@ -14,7 +15,7 @@ describe('#compileApiKeys()', () => {
       stage: 'dev',
       region: 'us-east-1',
     };
-    serverless = new Serverless();
+    serverless = new Serverless({ commands: [], options: {} });
     serverless.setProvider('aws', new AwsProvider(serverless, options));
     serverless.service.service = 'first-service';
     serverless.service.provider.compiledCloudFormationTemplate = {
@@ -135,101 +136,96 @@ describe('#compileApiKeys()', () => {
       ).to.equal('ApiGatewayDeploymentTest');
     });
   });
+});
 
-  describe('when using usage plan notation', () => {
-    it('should support usage plan notation', () => {
-      awsCompileApigEvents.serverless.service.provider.apiGateway = {
-        apiKeys: [
-          {
-            free: [
-              '1234567890',
-              { name: '2345678901' },
-              {
-                value: 'valueForKeyWithoutName',
-                description: 'Api key description',
-              },
-              { name: '3456789012', value: 'valueForKey3456789012' },
-            ],
-          },
-          { paid: ['0987654321', 'jihgfedcba'] },
-        ],
-        usagePlan: [{ free: [] }, { paid: [] }],
-      };
-
-      awsCompileApigEvents.compileApiKeys();
-      const expectedApiKeys = {
+describe('lib/plugins/aws/package/compile/events/apiGateway/lib/apiKeys.test.js', () => {
+  let cfResources;
+  let naming;
+  let serverlessInstance;
+  const apiGatewayExt = {
+    apiKeys: [
+      {
         free: [
-          { name: '1234567890', value: undefined, description: undefined },
-          { name: '2345678901', value: undefined, description: undefined },
+          '1234567890',
+          { name: '2345678901' },
           {
-            name: undefined,
             value: 'valueForKeyWithoutName',
             description: 'Api key description',
           },
-          {
-            name: '3456789012',
-            value: 'valueForKey3456789012',
-            description: undefined,
-          },
+          { name: '3456789012', value: 'valueForKey3456789012' },
+          { description: 'descriptionForKeyWithoutNameOrValue' },
         ],
-        paid: [
-          { name: '0987654321', value: undefined, description: undefined },
-          { name: 'jihgfedcba', value: undefined, description: undefined },
-        ],
-      };
-      awsCompileApigEvents.serverless.service.provider.apiGateway.apiKeys.forEach((plan) => {
-        const planName = Object.keys(plan)[0]; // free || paid
-        const apiKeys = expectedApiKeys[planName];
-        apiKeys.forEach((apiKey, index) => {
-          expect(
-            awsCompileApigEvents.serverless.service.provider.compiledCloudFormationTemplate
-              .Resources[
-              awsCompileApigEvents.provider.naming.getApiKeyLogicalId(index + 1, planName)
-            ].Type
-          ).to.equal('AWS::ApiGateway::ApiKey');
-          expect(
-            awsCompileApigEvents.serverless.service.provider.compiledCloudFormationTemplate
-              .Resources[
-              awsCompileApigEvents.provider.naming.getApiKeyLogicalId(index + 1, planName)
-            ].Properties.Enabled
-          ).to.equal(true);
-          expect(
-            awsCompileApigEvents.serverless.service.provider.compiledCloudFormationTemplate
-              .Resources[
-              awsCompileApigEvents.provider.naming.getApiKeyLogicalId(index + 1, planName)
-            ].Properties.Name
-          ).to.equal(apiKey.name);
-          expect(
-            awsCompileApigEvents.serverless.service.provider.compiledCloudFormationTemplate
-              .Resources[
-              awsCompileApigEvents.provider.naming.getApiKeyLogicalId(index + 1, planName)
-            ].Properties.Description
-          ).to.equal(apiKey.description);
-          expect(
-            awsCompileApigEvents.serverless.service.provider.compiledCloudFormationTemplate
-              .Resources[
-              awsCompileApigEvents.provider.naming.getApiKeyLogicalId(index + 1, planName)
-            ].Properties.Value
-          ).to.equal(apiKey.value);
-          expect(
-            awsCompileApigEvents.serverless.service.provider.compiledCloudFormationTemplate
-              .Resources[
-              awsCompileApigEvents.provider.naming.getApiKeyLogicalId(index + 1, planName)
-            ].Properties.StageKeys[0].RestApiId.Ref
-          ).to.equal('ApiGatewayRestApi');
-          expect(
-            awsCompileApigEvents.serverless.service.provider.compiledCloudFormationTemplate
-              .Resources[
-              awsCompileApigEvents.provider.naming.getApiKeyLogicalId(index + 1, planName)
-            ].Properties.StageKeys[0].StageName
-          ).to.equal('dev');
-          expect(
-            awsCompileApigEvents.serverless.service.provider.compiledCloudFormationTemplate
-              .Resources[
-              awsCompileApigEvents.provider.naming.getApiKeyLogicalId(index + 1, planName)
-            ].DependsOn
-          ).to.equal('ApiGatewayDeploymentTest');
-        });
+      },
+      { paid: ['0987654321', 'jihgfedcba'] },
+      {
+        disabled: [{ name: '1111111111', enabled: false }],
+      },
+    ],
+    usagePlan: [{ free: {} }, { paid: {} }, { disabled: {} }],
+  };
+
+  before(async () => {
+    const { awsNaming, cfTemplate, serverless } = await runServerless({
+      fixture: 'api-gateway',
+      command: 'package',
+      configExt: {
+        provider: {
+          apiGateway: apiGatewayExt,
+        },
+      },
+    });
+    naming = awsNaming;
+    cfResources = cfTemplate.Resources;
+    serverlessInstance = serverless;
+  });
+
+  it('should disable keys when enabled: false', () => {
+    const resource = cfResources[naming.getApiKeyLogicalId(1, 'disabled')];
+    expect(resource.Properties.Enabled).to.be.false;
+  });
+
+  it('should support usage plan notation', () => {
+    const expectedApiKeys = {
+      free: [
+        { name: '1234567890', value: undefined, description: undefined },
+        { name: '2345678901', value: undefined, description: undefined },
+        {
+          name: undefined,
+          value: 'valueForKeyWithoutName',
+          description: 'Api key description',
+        },
+        {
+          name: '3456789012',
+          value: 'valueForKey3456789012',
+          description: undefined,
+        },
+        {
+          name: undefined,
+          value: undefined,
+          description: 'descriptionForKeyWithoutNameOrValue',
+        },
+      ],
+      paid: [
+        { name: '0987654321', value: undefined, description: undefined },
+        { name: 'jihgfedcba', value: undefined, description: undefined },
+      ],
+    };
+
+    apiGatewayExt.apiKeys.slice(0, 2).forEach((plan) => {
+      const planName = Object.keys(plan)[0]; // free || paid
+      const apiKeys = expectedApiKeys[planName];
+      apiKeys.forEach((apiKey, index) => {
+        const resource = cfResources[naming.getApiKeyLogicalId(index + 1, planName)];
+        expect(resource.Type).to.equal('AWS::ApiGateway::ApiKey');
+        expect(resource.Properties.Enabled).to.equal(true);
+        expect(resource.Properties.Name).to.equal(apiKey.name);
+        expect(resource.Properties.Description).to.equal(apiKey.description);
+        expect(resource.Properties.Value).to.equal(apiKey.value);
+        expect(resource.Properties.StageKeys[0].RestApiId.Ref).to.equal('ApiGatewayRestApi');
+        expect(resource.Properties.StageKeys[0].StageName).to.equal('dev');
+        expect(resource.DependsOn).to.equal(
+          naming.generateApiGatewayDeploymentLogicalId(serverlessInstance.instanceId)
+        );
       });
     });
   });
diff --git a/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/authorizers.test.js b/test/unit/lib/plugins/aws/package/compile/events/api-gateway/lib/authorizers.test.js
similarity index 91%
rename from test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/authorizers.test.js
rename to test/unit/lib/plugins/aws/package/compile/events/api-gateway/lib/authorizers.test.js
index 0ea4d9cfb90..18e531f3a25 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/authorizers.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/api-gateway/lib/authorizers.test.js
@@ -1,8 +1,8 @@
 'use strict';
 
 const expect = require('chai').expect;
-const AwsCompileApigEvents = require('../../../../../../../../../../lib/plugins/aws/package/compile/events/apiGateway/index');
-const Serverless = require('../../../../../../../../../../lib/Serverless');
+const AwsCompileApigEvents = require('../../../../../../../../../../lib/plugins/aws/package/compile/events/api-gateway/index');
+const Serverless = require('../../../../../../../../../../lib/serverless');
 const AwsProvider = require('../../../../../../../../../../lib/plugins/aws/provider');
 
 const runServerless = require('../../../../../../../../../utils/run-serverless');
@@ -11,7 +11,7 @@ describe('#compileAuthorizers()', () => {
   let awsCompileApigEvents;
 
   beforeEach(() => {
-    const serverless = new Serverless();
+    const serverless = new Serverless({ commands: [], options: {} });
     serverless.setProvider('aws', new AwsProvider(serverless));
     serverless.service.service = 'first-service';
     serverless.service.provider.compiledCloudFormationTemplate = { Resources: {} };
@@ -226,25 +226,37 @@ describe('#compileAuthorizers() #2', () => {
       fixture: 'function',
       configExt: {
         functions: {
-          foo: {
+          basic: {
             provisionedConcurrency: 1,
           },
           authorized: {
             handler: 'index.handler',
-            events: [{ http: { method: 'get', path: '/authorized', authorizer: 'foo' } }],
+            events: [
+              {
+                http: {
+                  method: 'get',
+                  path: '/authorized',
+                  authorizer: {
+                    name: 'basic',
+                    identitySource: 'method.request.header.Authorization',
+                  },
+                },
+              },
+            ],
           },
         },
       },
       command: 'package',
     }).then(({ awsNaming, cfTemplate }) => {
       // console.log(cfTemplate.Resources);
-      const authorizerLogicalId = awsNaming.getAuthorizerLogicalId('foo');
-      const authorizerPermissionLogicalId = awsNaming.getLambdaApiGatewayPermissionLogicalId('foo');
+      const authorizerLogicalId = awsNaming.getAuthorizerLogicalId('basic');
+      const authorizerPermissionLogicalId =
+        awsNaming.getLambdaApiGatewayPermissionLogicalId('basic');
       expect(
         JSON.stringify(cfTemplate.Resources[authorizerLogicalId].Properties.AuthorizerUri)
       ).to.include('provisioned');
       expect(
         cfTemplate.Resources[authorizerPermissionLogicalId].Properties.FunctionName
-      ).to.deep.equal({ Ref: awsNaming.getLambdaProvisionedConcurrencyAliasLogicalId('foo') });
+      ).to.deep.equal({ Ref: awsNaming.getLambdaProvisionedConcurrencyAliasLogicalId('basic') });
     }));
 });
diff --git a/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/cors.test.js b/test/unit/lib/plugins/aws/package/compile/events/api-gateway/lib/cors.test.js
similarity index 98%
rename from test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/cors.test.js
rename to test/unit/lib/plugins/aws/package/compile/events/api-gateway/lib/cors.test.js
index ba9423bcdc1..dcc3fee4900 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/cors.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/api-gateway/lib/cors.test.js
@@ -1,8 +1,8 @@
 'use strict';
 
 const expect = require('chai').expect;
-const AwsCompileApigEvents = require('../../../../../../../../../../lib/plugins/aws/package/compile/events/apiGateway/index');
-const Serverless = require('../../../../../../../../../../lib/Serverless');
+const AwsCompileApigEvents = require('../../../../../../../../../../lib/plugins/aws/package/compile/events/api-gateway/index');
+const Serverless = require('../../../../../../../../../../lib/serverless');
 const AwsProvider = require('../../../../../../../../../../lib/plugins/aws/provider');
 
 describe('#compileCors()', () => {
@@ -14,7 +14,7 @@ describe('#compileCors()', () => {
       stage: 'dev',
       region: 'us-east-1',
     };
-    serverless = new Serverless();
+    serverless = new Serverless({ commands: [], options: {} });
     serverless.setProvider('aws', new AwsProvider(serverless, options));
     serverless.service.service = 'first-service';
     serverless.service.provider.compiledCloudFormationTemplate = { Resources: {} };
diff --git a/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/deployment.test.js b/test/unit/lib/plugins/aws/package/compile/events/api-gateway/lib/deployment.test.js
similarity index 94%
rename from test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/deployment.test.js
rename to test/unit/lib/plugins/aws/package/compile/events/api-gateway/lib/deployment.test.js
index fa8152eea16..491d1ea2703 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/deployment.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/api-gateway/lib/deployment.test.js
@@ -1,8 +1,8 @@
 'use strict';
 
 const expect = require('chai').expect;
-const AwsCompileApigEvents = require('../../../../../../../../../../lib/plugins/aws/package/compile/events/apiGateway/index');
-const Serverless = require('../../../../../../../../../../lib/Serverless');
+const AwsCompileApigEvents = require('../../../../../../../../../../lib/plugins/aws/package/compile/events/api-gateway/index');
+const Serverless = require('../../../../../../../../../../lib/serverless');
 const AwsProvider = require('../../../../../../../../../../lib/plugins/aws/provider');
 
 describe('#compileDeployment()', () => {
@@ -15,7 +15,7 @@ describe('#compileDeployment()', () => {
       stage: 'dev',
       region: 'us-east-1',
     };
-    serverless = new Serverless();
+    serverless = new Serverless({ commands: [], options: {} });
     provider = new AwsProvider(serverless, options);
     serverless.setProvider('aws', provider);
     serverless.service.provider.compiledCloudFormationTemplate = {
diff --git a/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/hack/disassociateUsagePlan.test.js b/test/unit/lib/plugins/aws/package/compile/events/api-gateway/lib/hack/disassociate-usage-plan.test.js
similarity index 94%
rename from test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/hack/disassociateUsagePlan.test.js
rename to test/unit/lib/plugins/aws/package/compile/events/api-gateway/lib/hack/disassociate-usage-plan.test.js
index 5bd08566ef1..3ed389c7514 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/hack/disassociateUsagePlan.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/api-gateway/lib/hack/disassociate-usage-plan.test.js
@@ -2,9 +2,9 @@
 
 const expect = require('chai').expect;
 const sinon = require('sinon');
-const Serverless = require('../../../../../../../../../../../lib/Serverless');
+const Serverless = require('../../../../../../../../../../../lib/serverless');
 const AwsProvider = require('../../../../../../../../../../../lib/plugins/aws/provider');
-const disassociateUsagePlan = require('../../../../../../../../../../../lib/plugins/aws/package/compile/events/apiGateway/lib/hack/disassociateUsagePlan');
+const disassociateUsagePlan = require('../../../../../../../../../../../lib/plugins/aws/package/compile/events/api-gateway/lib/hack/disassociate-usage-plan');
 
 describe('#disassociateUsagePlan()', () => {
   let serverless;
@@ -13,7 +13,7 @@ describe('#disassociateUsagePlan()', () => {
   let providerRequestStub;
 
   beforeEach(() => {
-    serverless = new Serverless();
+    serverless = new Serverless({ commands: [], options: {} });
     serverless.service.service = 'my-service';
     serverless.cli = {
       log: sinon.spy(),
diff --git a/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/hack/updateStage.test.js b/test/unit/lib/plugins/aws/package/compile/events/api-gateway/lib/hack/update-stage.test.js
similarity index 91%
rename from test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/hack/updateStage.test.js
rename to test/unit/lib/plugins/aws/package/compile/events/api-gateway/lib/hack/update-stage.test.js
index 97c386f52f9..f1a020d669e 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/hack/updateStage.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/api-gateway/lib/hack/update-stage.test.js
@@ -6,13 +6,14 @@
 const chai = require('chai');
 const sinon = require('sinon');
 const _ = require('lodash');
-const Serverless = require('../../../../../../../../../../../lib/Serverless');
+const Serverless = require('../../../../../../../../../../../lib/serverless');
 const AwsProvider = require('../../../../../../../../../../../lib/plugins/aws/provider');
 const {
   updateStage,
   defaultApiGatewayLogLevel,
-} = require('../../../../../../../../../../../lib/plugins/aws/package/compile/events/apiGateway/lib/hack/updateStage');
+} = require('../../../../../../../../../../../lib/plugins/aws/package/compile/events/api-gateway/lib/hack/update-stage');
 const runServerless = require('../../../../../../../../../../utils/run-serverless');
+const fixtures = require('../../../../../../../../../../fixtures/programmatic');
 
 chai.use(require('sinon-chai'));
 chai.use(require('chai-as-promised'));
@@ -28,11 +29,13 @@ describe('#updateStage()', () => {
   let context;
 
   beforeEach(() => {
-    serverless = new Serverless();
+    serverless = new Serverless({ commands: [], options: {} });
     serverless.service.service = 'my-service';
     options = { stage: 'dev', region: 'us-east-1' };
     awsProvider = new AwsProvider(serverless, options);
     serverless.setProvider('aws', awsProvider);
+    // Ensure that memoized function will be properly stubbed
+    awsProvider.getAccountInfo;
     providerGetAccountInfoStub = sinon.stub(awsProvider, 'getAccountInfo').resolves({
       accountId: '123456',
       partition: 'aws',
@@ -755,7 +758,7 @@ describe('test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/hack/u
     const tagResourceStub = sinon.stub();
     const untagResourceStub = sinon.stub();
     await runServerless({
-      fixture: 'apiGateway',
+      fixture: 'api-gateway',
       command: 'deploy',
       configExt: {
         provider: {
@@ -787,6 +790,7 @@ describe('test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/hack/u
         S3: {
           listObjectsV2: {},
           headObject: {},
+          headBucket: {},
         },
         APIGateway: {
           getRestApis: () => ({
@@ -809,4 +813,75 @@ describe('test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/hack/u
     expect(untagResourceStub).to.have.been.calledOnce;
     expect(untagResourceStub.args[0][0].tagKeys).to.deep.equal(['keytoremove']);
   });
+
+  it('should correctly resolve `apiId` during deployment', async () => {
+    const { serviceConfig, servicePath, updateConfig } = await fixtures.setup('api-gateway');
+    const getDeploymentsStub = sinon.stub().returns({ items: [{ id: 'deployment-id' }] });
+    const stage = 'dev';
+
+    await updateConfig({
+      provider: {
+        apiGateway: {
+          shouldStartNameWithService: true,
+        },
+        stackTags: { key: 'value' },
+      },
+    });
+
+    await runServerless({
+      command: 'deploy',
+      cwd: servicePath,
+      options: { stage },
+      lastLifecycleHookName: 'after:deploy:deploy',
+      awsRequestStubMap: {
+        APIGateway: {
+          createStage: {},
+          getDeployments: getDeploymentsStub,
+          getRestApis: { items: [{ id: 'api-id', name: `${serviceConfig.service}-${stage}` }] },
+          tagResource: {},
+        },
+        CloudFormation: {
+          describeStacks: { Stacks: [{}] },
+          describeStackEvents: {
+            StackEvents: [
+              {
+                ResourceStatus: 'UPDATE_COMPLETE',
+                ResourceType: 'AWS::CloudFormation::Stack',
+              },
+            ],
+          },
+          describeStackResource: {
+            StackResourceDetail: { PhysicalResourceId: 'deployment-bucket' },
+          },
+          listStackResources: {},
+          validateTemplate: {},
+          deleteChangeSet: {},
+          createChangeSet: {},
+          executeChangeSet: {},
+          describeChangeSet: {
+            ChangeSetName: 'new-service-dev-change-set',
+            ChangeSetId: 'some-change-set-id',
+            StackName: 'new-service-dev',
+            Status: 'CREATE_COMPLETE',
+          },
+        },
+        S3: {
+          listObjectsV2: {},
+          upload: {},
+          headBucket: {},
+        },
+        STS: {
+          getCallerIdentity: {
+            ResponseMetadata: { RequestId: 'ffffffff-ffff-ffff-ffff-ffffffffffff' },
+            UserId: 'XXXXXXXXXXXXXXXXXXXXX',
+            Account: '999999999999',
+            Arn: 'arn:aws-us-gov:iam::999999999999:user/test',
+          },
+        },
+      },
+    });
+
+    expect(getDeploymentsStub).to.have.been.calledOnce;
+    expect(getDeploymentsStub.args[0][0].restApiId).to.equal('api-id');
+  });
 });
diff --git a/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/method/index.test.js b/test/unit/lib/plugins/aws/package/compile/events/api-gateway/lib/method/index.test.js
similarity index 98%
rename from test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/method/index.test.js
rename to test/unit/lib/plugins/aws/package/compile/events/api-gateway/lib/method/index.test.js
index 3fcdb65f8fa..e767ee83a8e 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/method/index.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/api-gateway/lib/method/index.test.js
@@ -1,8 +1,8 @@
 'use strict';
 
 const expect = require('chai').expect;
-const AwsCompileApigEvents = require('../../../../../../../../../../../lib/plugins/aws/package/compile/events/apiGateway/index');
-const Serverless = require('../../../../../../../../../../../lib/Serverless');
+const AwsCompileApigEvents = require('../../../../../../../../../../../lib/plugins/aws/package/compile/events/api-gateway/index');
+const Serverless = require('../../../../../../../../../../../lib/serverless');
 const AwsProvider = require('../../../../../../../../../../../lib/plugins/aws/provider');
 const runServerless = require('../../../../../../../../../../utils/run-serverless');
 
@@ -15,7 +15,7 @@ describe('#compileMethods()', () => {
       stage: 'dev',
       region: 'us-east-1',
     };
-    serverless = new Serverless();
+    serverless = new Serverless({ commands: [], options: {} });
     serverless.setProvider('aws', new AwsProvider(serverless, options));
     serverless.service.service = 'first-service';
     serverless.service.provider.compiledCloudFormationTemplate = { Resources: {} };
@@ -501,7 +501,7 @@ describe('#compileMethods()', () => {
       fixture: 'function',
       configExt: {
         functions: {
-          foo: {
+          basic: {
             events: [
               {
                 http: {
@@ -1748,7 +1748,7 @@ describe('#compileMethods v2()', () => {
         awsNaming,
         cfTemplate: { Resources: cfResources },
       } = await runServerless({
-        fixture: 'apiGateway',
+        fixture: 'api-gateway',
         configExt: {
           functions: {
             foo: {
@@ -1779,7 +1779,7 @@ describe('#compileMethods v2()', () => {
         awsNaming,
         cfTemplate: { Resources: cfResources },
       } = await runServerless({
-        fixture: 'apiGateway',
+        fixture: 'api-gateway',
         configExt: {
           functions: {
             foo: {
@@ -1816,4 +1816,23 @@ describe('#compileMethods v2()', () => {
       expect(apiGatewayTokenMethodConfig.Properties.AuthorizerId).to.deep.equal('another-id');
     });
   });
+
+  it('should depends on permission resource', async () => {
+    const {
+      awsNaming,
+      cfTemplate: { Resources: cfResources },
+    } = await runServerless({
+      command: 'package',
+      fixture: 'api-gateway',
+    });
+    const FooApiGatewayMethodConfig = cfResources[awsNaming.getMethodLogicalId('Foo', 'GET')];
+    const OtherApiGatewayMethodConfig =
+      cfResources[awsNaming.getMethodLogicalId('BarMarkoVar', 'GET')];
+
+    const permNameFoo = awsNaming.getLambdaApiGatewayPermissionLogicalId('Foo');
+    const permNameOther = awsNaming.getLambdaApiGatewayPermissionLogicalId('Other');
+
+    expect(FooApiGatewayMethodConfig.DependsOn).to.include(permNameFoo);
+    expect(OtherApiGatewayMethodConfig.DependsOn).to.include(permNameOther);
+  });
 });
diff --git a/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/method/requestParameters.test.js b/test/unit/lib/plugins/aws/package/compile/events/api-gateway/lib/method/request-parameters.test.js
similarity index 99%
rename from test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/method/requestParameters.test.js
rename to test/unit/lib/plugins/aws/package/compile/events/api-gateway/lib/method/request-parameters.test.js
index 763e251214b..600cd5cf0ea 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/method/requestParameters.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/api-gateway/lib/method/request-parameters.test.js
@@ -13,7 +13,7 @@ describe('ApiGatewayEvents', () => {
     let naming;
     before(() =>
       runServerless({
-        fixture: 'apiGateway',
+        fixture: 'api-gateway',
         configExt: {
           functions: {
             foo: {
diff --git a/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/permissions.test.js b/test/unit/lib/plugins/aws/package/compile/events/api-gateway/lib/permissions.test.js
similarity index 98%
rename from test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/permissions.test.js
rename to test/unit/lib/plugins/aws/package/compile/events/api-gateway/lib/permissions.test.js
index 08a29de6f84..903604eeff1 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/permissions.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/api-gateway/lib/permissions.test.js
@@ -1,15 +1,15 @@
 'use strict';
 
 const expect = require('chai').expect;
-const AwsCompileApigEvents = require('../../../../../../../../../../lib/plugins/aws/package/compile/events/apiGateway/index');
-const Serverless = require('../../../../../../../../../../lib/Serverless');
+const AwsCompileApigEvents = require('../../../../../../../../../../lib/plugins/aws/package/compile/events/api-gateway/index');
+const Serverless = require('../../../../../../../../../../lib/serverless');
 const AwsProvider = require('../../../../../../../../../../lib/plugins/aws/provider');
 
 describe('#awsCompilePermissions()', () => {
   let awsCompileApigEvents;
 
   beforeEach(() => {
-    const serverless = new Serverless();
+    const serverless = new Serverless({ commands: [], options: {} });
     serverless.setProvider('aws', new AwsProvider(serverless));
     serverless.service.provider.compiledCloudFormationTemplate = { Resources: {} };
 
diff --git a/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/requestValidator.test.js b/test/unit/lib/plugins/aws/package/compile/events/api-gateway/lib/request-validator.test.js
similarity index 72%
rename from test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/requestValidator.test.js
rename to test/unit/lib/plugins/aws/package/compile/events/api-gateway/lib/request-validator.test.js
index 0c0d6b2fbb2..f3b6098f6f0 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/requestValidator.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/api-gateway/lib/request-validator.test.js
@@ -6,17 +6,21 @@ const runServerless = require('../../../../../../../../../utils/run-serverless')
 const expect = chai.expect;
 chai.use(require('chai-as-promised'));
 
-describe('#compileRequestValidators()', () => {
+describe('#compileRequestValidators() - schemas', () => {
   let cfResources;
   let naming;
+  let serviceName;
+  let stage;
 
   before(async () => {
-    const { cfTemplate, awsNaming } = await runServerless({
-      fixture: 'requestSchema',
+    const { cfTemplate, awsNaming, serverless } = await runServerless({
+      fixture: 'request-schema',
       command: 'package',
     });
     cfResources = cfTemplate.Resources;
     naming = awsNaming;
+    serviceName = serverless.service.service;
+    stage = serverless.getProvider('aws').getStage();
   });
 
   describe(' reusable schemas ', () => {
@@ -283,121 +287,73 @@ describe('#compileRequestValidators()', () => {
       });
     });
 
-    it('should support existing request:schema property for regression', () => {
-      const modelLogicalId = naming.getEndpointModelLogicalId(
-        'TestDashdeprecatedDashsimple',
-        'get',
-        'application/json'
-      );
+    it('should create validator with that includes `service` and `stage`', () => {
       const validatorLogicalId = naming.getValidatorLogicalId();
-      const methodLogicalId = naming.getMethodLogicalId('TestDashdeprecatedDashsimple', 'get');
-      const methodResource = cfResources[methodLogicalId];
-
-      expect(methodResource.Properties).to.have.property('RequestModels');
-      expect(methodResource.Properties).to.have.property('RequestValidatorId');
+      const validatorResource = cfResources[validatorLogicalId];
 
-      expect(methodResource.Properties.RequestModels['application/json']).to.deep.equal({
-        Ref: modelLogicalId,
-      });
-
-      expect(methodResource.Properties.RequestValidatorId).to.deep.equal({
-        Ref: validatorLogicalId,
-      });
+      expect(validatorResource.Properties.Name).to.equal(
+        `${serviceName}-${stage} | Validate request body and querystring parameters`
+      );
+    });
+  });
+});
 
-      const modelResource = cfResources[modelLogicalId];
+describe('#compileRequestValidators() - parameters', () => {
+  let cfResources;
+  let naming;
+  let validatorLogicalId;
 
-      expect(modelResource).to.deep.equal({
-        Type: 'AWS::ApiGateway::Model',
-        Properties: {
-          ContentType: 'application/json',
-          RestApiId: {
-            Ref: 'ApiGatewayRestApi',
-          },
-          Schema: {
-            $schema: 'http://json-schema.org/draft-04/schema#',
-            definitions: {},
-            properties: {
-              id: {
-                pattern: '[0-9]+',
-                title: 'ID for object',
-                type: 'number',
-              },
-            },
-            required: ['id'],
-            title: 'Test Validation Schema',
-            type: 'object',
-          },
-        },
-      });
+  before(async () => {
+    const { cfTemplate, awsNaming } = await runServerless({
+      fixture: 'request-parameters',
+      command: 'package',
     });
+    cfResources = cfTemplate.Resources;
+    naming = awsNaming;
+    validatorLogicalId = naming.getValidatorLogicalId();
+  });
 
-    it('should support multiple request:schema property for regression', () => {
-      const modelJsonLogicalId = naming.getEndpointModelLogicalId(
-        'TestDashdeprecatedDashmultiple',
-        'get',
-        'application/json'
-      );
-      const modelPlainTextLogicalId = naming.getEndpointModelLogicalId(
-        'TestDashdeprecatedDashmultiple',
-        'get',
-        'text/plain'
+  const noValidator = [
+    'no-params',
+    'querystrings-not-required',
+    'headers-not-required',
+    'paths-not-required',
+    'paths-not-required-object',
+  ];
+
+  const withValidator = [
+    'querystrings-required',
+    'headers-required',
+    'paths-required',
+    'no-params-with-schema',
+    'params-with-schema',
+  ];
+
+  noValidator.forEach((name) => {
+    it(`no validator: ${name}`, () => {
+      const methodLogicalId = naming.getMethodLogicalId(
+        naming.getNormalizedResourceName(name),
+        'get'
       );
-      const validatorLogicalId = naming.getValidatorLogicalId();
-      const methodLogicalId = naming.getMethodLogicalId('TestDashdeprecatedDashmultiple', 'get');
       const methodResource = cfResources[methodLogicalId];
 
-      expect(methodResource.Properties).to.have.property('RequestModels');
-      expect(methodResource.Properties).to.have.property('RequestValidatorId');
-
-      expect(methodResource.Properties.RequestModels['application/json']).to.deep.equal({
-        Ref: modelJsonLogicalId,
-      });
+      expect(methodResource).to.exist;
+      expect(methodResource.Properties).to.not.have.property('RequestValidatorId');
+    });
+  });
 
-      expect(methodResource.Properties.RequestModels['text/plain']).to.deep.equal({
-        Ref: modelPlainTextLogicalId,
-      });
+  withValidator.forEach((name) => {
+    it(`with validator: ${name}`, () => {
+      const methodLogicalId = naming.getMethodLogicalId(
+        naming.getNormalizedResourceName(name),
+        'get'
+      );
+      const methodResource = cfResources[methodLogicalId];
 
-      expect(methodResource.Properties.RequestValidatorId).to.deep.equal({
+      expect(methodResource).to.exist;
+      expect(methodResource.Properties).to.have.deep.property('RequestValidatorId', {
         Ref: validatorLogicalId,
       });
-
-      const modelJsonResource = cfResources[modelJsonLogicalId];
-      const modelPlainTextResource = cfResources[modelPlainTextLogicalId];
-
-      expect(modelJsonResource).to.deep.equal({
-        Type: 'AWS::ApiGateway::Model',
-        Properties: {
-          ContentType: 'application/json',
-          RestApiId: {
-            Ref: 'ApiGatewayRestApi',
-          },
-          Schema: {
-            $schema: 'http://json-schema.org/draft-04/schema#',
-            definitions: {},
-            properties: {
-              id: {
-                pattern: '[0-9]+',
-                title: 'ID for object',
-                type: 'number',
-              },
-            },
-            required: ['id'],
-            title: 'Test Validation Schema',
-            type: 'object',
-          },
-        },
-      });
-
-      expect(modelPlainTextResource).to.deep.equal({
-        Type: 'AWS::ApiGateway::Model',
-        Properties: {
-          ContentType: 'text/plain',
-          RestApiId: {
-            Ref: 'ApiGatewayRestApi',
-          },
-          Schema: 'foo',
-        },
-      });
     });
   });
 });
diff --git a/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/resources.test.js b/test/unit/lib/plugins/aws/package/compile/events/api-gateway/lib/resources.test.js
similarity index 98%
rename from test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/resources.test.js
rename to test/unit/lib/plugins/aws/package/compile/events/api-gateway/lib/resources.test.js
index d6db4f6c4a5..4132561171d 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/resources.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/api-gateway/lib/resources.test.js
@@ -1,8 +1,8 @@
 'use strict';
 
 const expect = require('chai').expect;
-const AwsCompileApigEvents = require('../../../../../../../../../../lib/plugins/aws/package/compile/events/apiGateway/index');
-const Serverless = require('../../../../../../../../../../lib/Serverless');
+const AwsCompileApigEvents = require('../../../../../../../../../../lib/plugins/aws/package/compile/events/api-gateway/index');
+const Serverless = require('../../../../../../../../../../lib/serverless');
 const AwsProvider = require('../../../../../../../../../../lib/plugins/aws/provider');
 
 describe('#compileResources()', () => {
@@ -10,7 +10,7 @@ describe('#compileResources()', () => {
   let awsCompileApigEvents;
 
   beforeEach(() => {
-    serverless = new Serverless();
+    serverless = new Serverless({ commands: [], options: {} });
     serverless.setProvider('aws', new AwsProvider(serverless));
     serverless.service.provider.compiledCloudFormationTemplate = { Resources: {} };
     awsCompileApigEvents = new AwsCompileApigEvents(serverless);
diff --git a/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/restApi.test.js b/test/unit/lib/plugins/aws/package/compile/events/api-gateway/lib/rest-api.test.js
similarity index 63%
rename from test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/restApi.test.js
rename to test/unit/lib/plugins/aws/package/compile/events/api-gateway/lib/rest-api.test.js
index 1d3c8233284..d369e48a3c5 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/restApi.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/api-gateway/lib/rest-api.test.js
@@ -1,9 +1,10 @@
 'use strict';
 
 const chai = require('chai');
-const AwsCompileApigEvents = require('../../../../../../../../../../lib/plugins/aws/package/compile/events/apiGateway/index');
-const Serverless = require('../../../../../../../../../../lib/Serverless');
+const AwsCompileApigEvents = require('../../../../../../../../../../lib/plugins/aws/package/compile/events/api-gateway/index');
+const Serverless = require('../../../../../../../../../../lib/serverless');
 const AwsProvider = require('../../../../../../../../../../lib/plugins/aws/provider');
+const runServerless = require('../../../../../../../../../utils/run-serverless');
 
 const expect = chai.expect;
 chai.use(require('chai-as-promised'));
@@ -17,7 +18,7 @@ describe('#compileRestApi()', () => {
       stage: 'dev',
       region: 'us-east-1',
     };
-    serverless = new Serverless();
+    serverless = new Serverless({ commands: [], options: {} });
     serverless.setProvider('aws', new AwsProvider(serverless, options));
     serverless.service.provider.compiledCloudFormationTemplate = { Resources: {} };
     awsCompileApigEvents = new AwsCompileApigEvents(serverless, options);
@@ -45,6 +46,7 @@ describe('#compileRestApi()', () => {
       Type: 'AWS::ApiGateway::RestApi',
       Properties: {
         BinaryMediaTypes: undefined,
+        DisableExecuteApiEndpoint: undefined,
         Name: 'dev-new-service',
         EndpointConfiguration: {
           Types: ['EDGE'],
@@ -79,6 +81,7 @@ describe('#compileRestApi()', () => {
       Properties: {
         Name: 'dev-new-service',
         BinaryMediaTypes: undefined,
+        DisableExecuteApiEndpoint: undefined,
         EndpointConfiguration: {
           Types: ['EDGE'],
         },
@@ -112,6 +115,7 @@ describe('#compileRestApi()', () => {
       Properties: {
         Name: 'dev-new-service',
         BinaryMediaTypes: undefined,
+        DisableExecuteApiEndpoint: undefined,
         EndpointConfiguration: {
           Types: ['EDGE'],
         },
@@ -143,6 +147,7 @@ describe('#compileRestApi()', () => {
       Type: 'AWS::ApiGateway::RestApi',
       Properties: {
         BinaryMediaTypes: ['*/*'],
+        DisableExecuteApiEndpoint: undefined,
         EndpointConfiguration: {
           Types: ['EDGE'],
         },
@@ -158,3 +163,79 @@ describe('#compileRestApi()', () => {
     expect(() => awsCompileApigEvents.compileRestApi()).to.throw(Error);
   });
 });
+
+describe('lib/plugins/aws/package/compile/events/apiGateway/lib/restApi.test.js', () => {
+  it('should not disable the default execute-api endpoint by default', async () => {
+    const { cfTemplate } = await runServerless({
+      fixture: 'api-gateway',
+      command: 'package',
+    });
+    const resource = cfTemplate.Resources.ApiGatewayRestApi;
+
+    expect(resource.Properties.DisableExecuteApiEndpoint).to.equal(undefined);
+  });
+
+  it('should support `provider.apiGateway.disableDefaultEndpoint`', async () => {
+    const { cfTemplate } = await runServerless({
+      fixture: 'api-gateway',
+      command: 'package',
+      configExt: {
+        provider: {
+          apiGateway: {
+            disableDefaultEndpoint: true,
+          },
+        },
+      },
+    });
+    const resource = cfTemplate.Resources.ApiGatewayRestApi;
+
+    expect(resource.Properties.DisableExecuteApiEndpoint).to.equal(true);
+  });
+
+  it('should support `provider.apiGateway.resourcePolicy[].Principal.AWS with Fn::If`', async () => {
+    const { cfTemplate } = await runServerless({
+      fixture: 'api-gateway',
+      command: 'package',
+      configExt: {
+        provider: {
+          apiGateway: {
+            resourcePolicy: [
+              {
+                Effect: 'Allow',
+                Principal: {
+                  AWS: {
+                    'Fn::If': ['Condition', 'FirstVal', 'SecondVal'],
+                  },
+                },
+                Action: 'execute-api:Invoke',
+                Resource: ['execute-api:/*/*/*'],
+              },
+            ],
+          },
+        },
+      },
+    });
+    const resource = cfTemplate.Resources.ApiGatewayRestApi;
+
+    expect(resource.Properties.Policy.Statement[0].Principal.AWS).to.deep.equal({
+      'Fn::If': ['Condition', 'FirstVal', 'SecondVal'],
+    });
+  });
+
+  it('should support `provider.apiGateway.minimumCompressionSize to be set to 0`', async () => {
+    const { cfTemplate } = await runServerless({
+      fixture: 'api-gateway',
+      command: 'package',
+      configExt: {
+        provider: {
+          apiGateway: {
+            minimumCompressionSize: 0,
+          },
+        },
+      },
+    });
+    const resource = cfTemplate.Resources.ApiGatewayRestApi;
+
+    expect(resource.Properties.MinimumCompressionSize).to.equal(0);
+  });
+});
diff --git a/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/stage/index.test.js b/test/unit/lib/plugins/aws/package/compile/events/api-gateway/lib/stage/index.test.js
similarity index 84%
rename from test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/stage/index.test.js
rename to test/unit/lib/plugins/aws/package/compile/events/api-gateway/lib/stage/index.test.js
index 6b51f082a98..2aadb3f6387 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/stage/index.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/api-gateway/lib/stage/index.test.js
@@ -5,10 +5,11 @@ const sinon = require('sinon');
 const BbPromise = require('bluebird');
 const _ = require('lodash');
 const childProcess = BbPromise.promisifyAll(require('child_process'));
-const AwsCompileApigEvents = require('../../../../../../../../../../../lib/plugins/aws/package/compile/events/apiGateway');
-const Serverless = require('../../../../../../../../../../../lib/Serverless');
+const AwsCompileApigEvents = require('../../../../../../../../../../../lib/plugins/aws/package/compile/events/api-gateway');
+const Serverless = require('../../../../../../../../../../../lib/serverless');
 const AwsProvider = require('../../../../../../../../../../../lib/plugins/aws/provider');
 const { createTmpDir } = require('../../../../../../../../../../utils/fs');
+const runServerless = require('../../../../../../../../../../utils/run-serverless');
 
 describe('#compileStage()', () => {
   let serverless;
@@ -23,7 +24,7 @@ describe('#compileStage()', () => {
       stage: 'dev',
       region: 'us-east-1',
     };
-    serverless = new Serverless();
+    serverless = new Serverless({ commands: [], options: {} });
     provider = new AwsProvider(serverless, options);
     serverless.setProvider('aws', provider);
     serverless.service.service = 'my-service';
@@ -315,3 +316,67 @@ describe('#compileStage()', () => {
     });
   });
 });
+
+describe('test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/stage/index.test.js', () => {
+  it('should not create LogGroup if `accessLogging` set to false', async () => {
+    const { cfTemplate, awsNaming } = await runServerless({
+      fixture: 'api-gateway',
+      command: 'package',
+      configExt: {
+        provider: {
+          logs: {
+            restApi: {
+              accessLogging: false,
+            },
+          },
+        },
+      },
+    });
+
+    expect(cfTemplate.Resources[awsNaming.getApiGatewayLogGroupLogicalId()]).to.be.undefined;
+  });
+
+  it('should create LogGroup with `logs.restApi` set to `true`', async () => {
+    const { cfTemplate, awsNaming, serverless } = await runServerless({
+      fixture: 'api-gateway',
+      command: 'package',
+      configExt: {
+        provider: {
+          logs: {
+            restApi: true,
+          },
+        },
+      },
+    });
+
+    expect(cfTemplate.Resources[awsNaming.getApiGatewayLogGroupLogicalId()]).to.deep.equal({
+      Type: 'AWS::Logs::LogGroup',
+      Properties: {
+        LogGroupName: `/aws/api-gateway/${serverless.service.service}-dev`,
+      },
+    });
+  });
+
+  it('should create LogGroup with default setting for `accessLogging`', async () => {
+    const { cfTemplate, awsNaming, serverless } = await runServerless({
+      fixture: 'api-gateway',
+      command: 'package',
+      configExt: {
+        provider: {
+          logs: {
+            restApi: {
+              executionLogging: false,
+            },
+          },
+        },
+      },
+    });
+
+    expect(cfTemplate.Resources[awsNaming.getApiGatewayLogGroupLogicalId()]).to.deep.equal({
+      Type: 'AWS::Logs::LogGroup',
+      Properties: {
+        LogGroupName: `/aws/api-gateway/${serverless.service.service}-dev`,
+      },
+    });
+  });
+});
diff --git a/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/usagePlanKeys.test.js b/test/unit/lib/plugins/aws/package/compile/events/api-gateway/lib/usage-plan-keys.test.js
similarity index 96%
rename from test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/usagePlanKeys.test.js
rename to test/unit/lib/plugins/aws/package/compile/events/api-gateway/lib/usage-plan-keys.test.js
index 47dd0823438..dae2d62ecda 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/usagePlanKeys.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/api-gateway/lib/usage-plan-keys.test.js
@@ -2,8 +2,8 @@
 
 const _ = require('lodash');
 const expect = require('chai').expect;
-const AwsCompileApigEvents = require('../../../../../../../../../../lib/plugins/aws/package/compile/events/apiGateway/index');
-const Serverless = require('../../../../../../../../../../lib/Serverless');
+const AwsCompileApigEvents = require('../../../../../../../../../../lib/plugins/aws/package/compile/events/api-gateway/index');
+const Serverless = require('../../../../../../../../../../lib/serverless');
 const AwsProvider = require('../../../../../../../../../../lib/plugins/aws/provider');
 
 describe('#compileUsagePlanKeys()', () => {
@@ -15,7 +15,7 @@ describe('#compileUsagePlanKeys()', () => {
       stage: 'dev',
       region: 'us-east-1',
     };
-    serverless = new Serverless();
+    serverless = new Serverless({ commands: [], options: {} });
     serverless.setProvider('aws', new AwsProvider(serverless, options));
     serverless.service.service = 'first-service';
     serverless.service.provider.compiledCloudFormationTemplate = {
diff --git a/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/usagePlan.test.js b/test/unit/lib/plugins/aws/package/compile/events/api-gateway/lib/usage-plan.test.js
similarity index 97%
rename from test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/usagePlan.test.js
rename to test/unit/lib/plugins/aws/package/compile/events/api-gateway/lib/usage-plan.test.js
index b6723aa837f..80b8aa68b62 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/usagePlan.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/api-gateway/lib/usage-plan.test.js
@@ -1,8 +1,8 @@
 'use strict';
 
 const expect = require('chai').expect;
-const AwsCompileApigEvents = require('../../../../../../../../../../lib/plugins/aws/package/compile/events/apiGateway/index');
-const Serverless = require('../../../../../../../../../../lib/Serverless');
+const AwsCompileApigEvents = require('../../../../../../../../../../lib/plugins/aws/package/compile/events/api-gateway/index');
+const Serverless = require('../../../../../../../../../../lib/serverless');
 const AwsProvider = require('../../../../../../../../../../lib/plugins/aws/provider');
 const runServerless = require('../../../../../../../../../utils/run-serverless');
 
@@ -15,7 +15,7 @@ describe('#compileUsagePlan()', () => {
       stage: 'dev',
       region: 'us-east-1',
     };
-    serverless = new Serverless();
+    serverless = new Serverless({ commands: [], options: {} });
     serverless.setProvider('aws', new AwsProvider(serverless, options));
     serverless.service.service = 'first-service';
     serverless.service.provider.compiledCloudFormationTemplate = {
@@ -312,7 +312,6 @@ describe('UsagePlan', () => {
   const serverlessConfigurationExtension = {
     provider: {
       name: 'aws',
-      usagePlan: {},
     },
     functions: {
       foo: {
@@ -331,7 +330,7 @@ describe('UsagePlan', () => {
   it('Should have values for throttle', async () => {
     serverlessConfigurationExtension.provider.apiGateway = { usagePlan: { throttle } };
     const { cfTemplate } = await runServerless({
-      fixture: 'apiGateway',
+      fixture: 'api-gateway',
       configExt: serverlessConfigurationExtension,
       command: 'package',
     });
@@ -347,7 +346,7 @@ describe('UsagePlan', () => {
   it('Should have values for quota', async () => {
     serverlessConfigurationExtension.provider.apiGateway = { usagePlan: { quota } };
     const { cfTemplate } = await runServerless({
-      fixture: 'apiGateway',
+      fixture: 'api-gateway',
       configExt: serverlessConfigurationExtension,
       command: 'package',
     });
@@ -360,7 +359,7 @@ describe('UsagePlan', () => {
   it('Should have values for throttle and not quota', async () => {
     serverlessConfigurationExtension.provider.apiGateway = { usagePlan: { throttle } };
     const { cfTemplate } = await runServerless({
-      fixture: 'apiGateway',
+      fixture: 'api-gateway',
       configExt: serverlessConfigurationExtension,
       command: 'package',
     });
@@ -378,7 +377,7 @@ describe('UsagePlan', () => {
   it('Should have values for quota and throttle', async () => {
     serverlessConfigurationExtension.provider.apiGateway = { usagePlan: { throttle, quota } };
     const { cfTemplate } = await runServerless({
-      fixture: 'apiGateway',
+      fixture: 'api-gateway',
       configExt: serverlessConfigurationExtension,
       command: 'package',
     });
diff --git a/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/validate.test.js b/test/unit/lib/plugins/aws/package/compile/events/api-gateway/lib/validate.test.js
similarity index 86%
rename from test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/validate.test.js
rename to test/unit/lib/plugins/aws/package/compile/events/api-gateway/lib/validate.test.js
index 740145de88d..f8c7abb51a7 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/validate.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/api-gateway/lib/validate.test.js
@@ -1,12 +1,18 @@
 'use strict';
 
-const expect = require('chai').expect;
+const chai = require('chai');
 const sinon = require('sinon');
-const AwsCompileApigEvents = require('../../../../../../../../../../lib/plugins/aws/package/compile/events/apiGateway/index');
-const Serverless = require('../../../../../../../../../../lib/Serverless');
+const runServerless = require('../../../../../../../../../utils/run-serverless');
+const AwsCompileApigEvents = require('../../../../../../../../../../lib/plugins/aws/package/compile/events/api-gateway/index');
+const Serverless = require('../../../../../../../../../../lib/serverless');
 const AwsProvider = require('../../../../../../../../../../lib/plugins/aws/provider');
 const ServerlessError = require('../../../../../../../../../../lib/serverless-error');
 
+chai.use(require('chai-as-promised'));
+chai.use(require('sinon-chai'));
+
+const expect = chai.expect;
+
 describe('#validate()', () => {
   let serverless;
   let awsCompileApigEvents;
@@ -16,7 +22,7 @@ describe('#validate()', () => {
       stage: 'dev',
       region: 'us-east-1',
     };
-    serverless = new Serverless();
+    serverless = new Serverless({ commands: ['print'], options: {}, serviceDir: null });
     serverless.setProvider('aws', new AwsProvider(serverless, options));
     awsCompileApigEvents = new AwsCompileApigEvents(serverless, options);
   });
@@ -412,39 +418,6 @@ describe('#validate()', () => {
     expect(authorizer.identityValidationExpression).to.equal('foo');
   });
 
-  it('should process cors defaults', () => {
-    awsCompileApigEvents.serverless.service.functions = {
-      first: {
-        events: [
-          {
-            http: {
-              method: 'POST',
-              path: '/foo/bar',
-              cors: true,
-            },
-          },
-        ],
-      },
-    };
-
-    const validated = awsCompileApigEvents.validate();
-    expect(validated.events).to.be.an('Array').with.length(1);
-    expect(validated.events[0].http.cors).to.deep.equal({
-      headers: [
-        'Content-Type',
-        'X-Amz-Date',
-        'Authorization',
-        'X-Api-Key',
-        'X-Amz-Security-Token',
-        'X-Amz-User-Agent',
-      ],
-      methods: ['OPTIONS', 'POST'],
-      origin: '*',
-      origins: ['*'],
-      allowCredentials: false,
-    });
-  });
-
   it('should accept cors headers as a single string value', () => {
     awsCompileApigEvents.serverless.service.functions = {
       first: {
@@ -1127,123 +1100,6 @@ describe('#validate()', () => {
     expect(() => awsCompileApigEvents.validate()).to.throw(Error);
   });
 
-  it('should show a warning message when using request / response config with HTTP-PROXY', () => {
-    awsCompileApigEvents.serverless.service.functions = {
-      first: {
-        events: [
-          {
-            http: {
-              method: 'GET',
-              path: 'users/list',
-              integration: 'http-proxy',
-              request: {
-                uri: 'http://www.example.com',
-                template: {
-                  'template/1': '{ "stage" : "$context.stage" }',
-                  'template/2': '{ "httpMethod" : "$context.httpMethod" }',
-                },
-              },
-              response: {
-                template: "$input.path('$.foo')",
-              },
-            },
-          },
-        ],
-      },
-    };
-    // initialize so we get the log method from the CLI in place
-    return serverless.init().then(() => {
-      const logStub = sinon.stub(serverless.cli, 'log');
-
-      awsCompileApigEvents.validate();
-
-      expect(logStub.calledTwice).to.be.equal(true);
-      expect(logStub.args[0][0].length).to.be.at.least(1);
-    });
-  });
-
-  it('should not show a warning message when using request.parameter with HTTP-PROXY', () => {
-    awsCompileApigEvents.serverless.service.functions = {
-      first: {
-        events: [
-          {
-            http: {
-              method: 'GET',
-              path: 'users/list',
-              integration: 'http-proxy',
-              request: {
-                uri: 'http://www.example.com',
-                parameters: {
-                  querystrings: {
-                    foo: true,
-                    bar: false,
-                  },
-                  paths: {
-                    foo: true,
-                    bar: false,
-                  },
-                  headers: {
-                    foo: true,
-                    bar: false,
-                  },
-                },
-              },
-            },
-          },
-        ],
-      },
-    };
-    // initialize so we get the log method from the CLI in place
-    return serverless.init().then(() => {
-      const logStub = sinon.stub(serverless.cli, 'log');
-
-      awsCompileApigEvents.validate();
-
-      expect(logStub.called).to.be.equal(false);
-    });
-  });
-
-  it('should remove non-parameter or uri request/response config with HTTP-PROXY', () => {
-    awsCompileApigEvents.serverless.service.functions = {
-      first: {
-        events: [
-          {
-            http: {
-              method: 'GET',
-              path: 'users/list',
-              integration: 'http-proxy',
-              request: {
-                uri: 'http://www.example.com',
-                template: {
-                  'template/1': '{ "stage" : "$context.stage" }',
-                },
-                parameters: {
-                  paths: {
-                    foo: true,
-                  },
-                },
-              },
-              response: {},
-            },
-          },
-        ],
-      },
-    };
-    // initialize so we get the log method from the CLI in place
-    return serverless.init().then(() => {
-      // don't want to print the logs in this test
-      sinon.stub(serverless.cli, 'log');
-
-      const validated = awsCompileApigEvents.validate();
-      expect(validated.events).to.be.an('Array').with.length(1);
-      expect(validated.events[0].http.response).to.equal(undefined);
-      expect(validated.events[0].http.request.uri).to.equal('http://www.example.com');
-      expect(validated.events[0].http.request.parameters).to.deep.equal({
-        'method.request.path.foo': true,
-      });
-    });
-  });
-
   it('should support MOCK integration', () => {
     awsCompileApigEvents.serverless.service.functions = {
       first: {
@@ -1285,40 +1141,6 @@ describe('#validate()', () => {
     expect(validated.events[0].http.async);
   });
 
-  it('should show a warning message when using request / response config with LAMBDA-PROXY', () => {
-    awsCompileApigEvents.serverless.service.functions = {
-      first: {
-        events: [
-          {
-            http: {
-              method: 'GET',
-              path: 'users/list',
-              integration: 'lambda-proxy',
-              request: {
-                template: {
-                  'template/1': '{ "stage" : "$context.stage" }',
-                  'template/2': '{ "httpMethod" : "$context.httpMethod" }',
-                },
-              },
-              response: {
-                template: "$input.path('$.foo')",
-              },
-            },
-          },
-        ],
-      },
-    };
-    // initialize so we get the log method from the CLI in place
-    return serverless.init().then(() => {
-      const logStub = sinon.stub(serverless.cli, 'log');
-
-      awsCompileApigEvents.validate();
-
-      expect(logStub.calledTwice).to.be.equal(true);
-      expect(logStub.args[0][0].length).to.be.at.least(1);
-    });
-  });
-
   it('should not show a warning message when using request.parameter with LAMBDA-PROXY', () => {
     awsCompileApigEvents.serverless.service.functions = {
       first: {
@@ -1589,3 +1411,226 @@ describe('#validate()', () => {
     });
   });
 });
+
+describe('test/unit/lib/plugins/aws/package/compile/events/apiGateway/lib/validate.test.js', () => {
+  let cfTemplate;
+  let cfResources;
+  let naming;
+
+  const getApiGatewayMethod = (path, method) =>
+    cfResources[naming.getMethodLogicalId(naming.normalizePath(path), method)];
+
+  describe('regular', () => {
+    before(async () => {
+      const result = await runServerless({
+        fixture: 'function',
+        command: 'package',
+        configExt: {
+          functions: {
+            authorized: {
+              handler: 'index.handler',
+              events: [
+                {
+                  http: {
+                    method: 'get',
+                    path: '/authorized',
+                    authorizer: {
+                      type: 'REQUEST',
+                      name: 'basic',
+                      resultTtlInSeconds: 0,
+                    },
+                  },
+                },
+              ],
+            },
+            corsDefault: {
+              handler: 'index.handler',
+              events: [
+                {
+                  http: {
+                    method: 'POST',
+                    path: '/cors-default-set-by-boolean',
+                    cors: true,
+                  },
+                },
+                {
+                  http: {
+                    method: 'POST',
+                    path: '/cors-default-set-by-object',
+                    cors: {},
+                  },
+                },
+              ],
+            },
+          },
+        },
+      });
+      cfTemplate = result.cfTemplate;
+      cfResources = cfTemplate.Resources;
+      naming = result.awsNaming;
+    });
+
+    it('should process cors defaults', async () => {
+      const expected = {
+        'method.response.header.Access-Control-Allow-Headers': `'${[
+          'Content-Type',
+          'X-Amz-Date',
+          'Authorization',
+          'X-Api-Key',
+          'X-Amz-Security-Token',
+          'X-Amz-User-Agent',
+        ].join(',')}'`,
+        'method.response.header.Access-Control-Allow-Methods': `'${['OPTIONS', 'POST'].join(',')}'`,
+        'method.response.header.Access-Control-Allow-Origin': "'*'",
+      };
+
+      expect(
+        getApiGatewayMethod('/cors-default-set-by-boolean', 'OPTIONS').Properties.Integration
+          .IntegrationResponses[0].ResponseParameters
+      ).to.deep.eq(expected);
+      expect(
+        getApiGatewayMethod('/cors-default-set-by-object', 'OPTIONS').Properties.Integration
+          .IntegrationResponses[0].ResponseParameters
+      ).to.deep.eq(expected);
+    });
+
+    it('Should not set default `identitySource` for `request` authorizers with caching disabled', async () => {
+      expect(cfResources[naming.getAuthorizerLogicalId('basic')].Properties.IdentitySource).to.be
+        .undefined;
+    });
+  });
+
+  it('should throw an error when restApiRootResourceId is not provided with restApiId', async () => {
+    await expect(
+      runServerless({
+        fixture: 'function',
+        command: 'package',
+        configExt: {
+          provider: {
+            apiGateway: {
+              restApiId: 'ivrcdpj7y2',
+            },
+          },
+          functions: {
+            first: {
+              handler: 'index.handler',
+              events: [
+                {
+                  http: {
+                    method: 'GET',
+                    path: 'foo/bar',
+                  },
+                },
+              ],
+            },
+          },
+        },
+      })
+    ).to.be.eventually.rejected.and.have.property(
+      'code',
+      'API_GATEWAY_MISSING_REST_API_ROOT_RESOURCE_ID'
+    );
+  });
+  it('should throw when using a CUSTOM authorizer without an authorizer id', async () => {
+    await expect(
+      runServerless({
+        fixture: 'function',
+        command: 'package',
+        configExt: {
+          functions: {
+            first: {
+              handler: 'index.handler',
+              events: [
+                {
+                  http: {
+                    method: 'POST',
+                    path: '/custom-authorizer',
+                    integration: 'lambda-proxy',
+                    authorizer: {
+                      type: 'CUSTOM',
+                    },
+                  },
+                },
+              ],
+            },
+          },
+        },
+      })
+    ).to.be.eventually.rejected.and.have.property(
+      'code',
+      'API_GATEWAY_MISSING_AUTHORIZER_NAME_OR_ARN'
+    );
+  });
+
+  it('should not throw when using CUSTOM authorizer with an authorizer id', async () => {
+    const result = await runServerless({
+      fixture: 'function',
+      command: 'package',
+      configExt: {
+        functions: {
+          first: {
+            handler: 'index.handler',
+            events: [
+              {
+                http: {
+                  method: 'POST',
+                  path: '/custom-authorizer',
+                  integration: 'lambda-proxy',
+                  authorizer: {
+                    type: 'CUSTOM',
+                    authorizerId: 'MyAuthorizerId',
+                  },
+                },
+              },
+            ],
+          },
+        },
+      },
+    });
+
+    cfResources = result.cfTemplate.Resources;
+    naming = result.awsNaming;
+    const resource = getApiGatewayMethod('/custom-authorizer', 'POST');
+    expect(resource.Properties.AuthorizationType).to.equal('CUSTOM');
+  });
+
+  it('Should error when using external API Gateway and enabling tracing', async () => {
+    await expect(
+      runServerless({
+        fixture: 'api-gateway',
+        command: 'package',
+        configExt: {
+          provider: {
+            apiGateway: {
+              restApiId: 'xxx',
+              restApiRootResourceId: 'yyy',
+            },
+            tracing: {
+              apiGateway: true,
+            },
+          },
+        },
+      })
+    ).to.be.eventually.rejected.and.have.property('code', 'API_GATEWAY_EXTERNAL_API_TRACING');
+  });
+
+  it('Should error when using external API Gateway and enabling logs', async () => {
+    await expect(
+      runServerless({
+        fixture: 'api-gateway',
+        command: 'package',
+        configExt: {
+          provider: {
+            apiGateway: {
+              restApiId: 'xxx',
+              restApiRootResourceId: 'yyy',
+            },
+            logs: {
+              restApi: true,
+            },
+          },
+        },
+      })
+    ).to.be.eventually.rejected.and.have.property('code', 'API_GATEWAY_EXTERNAL_API_LOGS');
+  });
+});
diff --git a/test/unit/lib/plugins/aws/package/compile/events/cloudFront.test.js b/test/unit/lib/plugins/aws/package/compile/events/cloud-front.test.js
similarity index 80%
rename from test/unit/lib/plugins/aws/package/compile/events/cloudFront.test.js
rename to test/unit/lib/plugins/aws/package/compile/events/cloud-front.test.js
index e0b61a30c29..27b619faec7 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/cloudFront.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/cloud-front.test.js
@@ -1,10 +1,9 @@
 'use strict';
 
 const chai = require('chai');
-const sandbox = require('sinon');
 const AwsProvider = require('../../../../../../../../lib/plugins/aws/provider');
-const AwsCompileCloudFrontEvents = require('../../../../../../../../lib/plugins/aws/package/compile/events/cloudFront');
-const Serverless = require('../../../../../../../../lib/Serverless');
+const AwsCompileCloudFrontEvents = require('../../../../../../../../lib/plugins/aws/package/compile/events/cloud-front');
+const Serverless = require('../../../../../../../../lib/serverless');
 const runServerless = require('../../../../../../../utils/run-serverless');
 
 chai.use(require('sinon-chai'));
@@ -22,7 +21,7 @@ describe('AwsCompileCloudFrontEvents', () => {
       stage: 'dev',
       region: 'us-east-1',
     };
-    serverless = new Serverless();
+    serverless = new Serverless({ commands: [], options: {} });
     serverless.processedInput = {
       commands: [],
     };
@@ -77,44 +76,9 @@ describe('AwsCompileCloudFrontEvents', () => {
       },
     };
     serverless.setProvider('aws', new AwsProvider(serverless, options));
-    serverless.cli = { log: sandbox.spy() };
     awsCompileCloudFrontEvents = new AwsCompileCloudFrontEvents(serverless, options);
   });
 
-  describe('#constructor()', () => {
-    it('should use "before:remove:remove" hook to log a message before removing the service', () => {
-      serverless.processedInput.commands = ['remove'];
-      serverless.service.functions = {
-        first: {
-          events: [
-            {
-              cloudFront: {
-                eventType: 'viewer-request',
-                origin: 's3://bucketname.s3.amazonaws.com/files',
-              },
-            },
-          ],
-        },
-      };
-      const awsCompileCloudFrontEventsRemoval = new AwsCompileCloudFrontEvents(serverless, options);
-
-      awsCompileCloudFrontEventsRemoval.hooks['before:remove:remove']();
-      expect(awsCompileCloudFrontEventsRemoval.serverless.cli.log).to.have.been.calledOnce;
-      expect(awsCompileCloudFrontEventsRemoval.serverless.cli.log.args[0][0]).to.include(
-        'remove your Lambda@Edge functions'
-      );
-    });
-  });
-
-  describe('#logRemoveReminder()', () => {
-    it('should not log an info message if the users wants to remove the stack without a cloudFront event', () => {
-      serverless.processedInput.commands = ['remove'];
-      const awsCompileCloudFrontEventsRemoval = new AwsCompileCloudFrontEvents(serverless, options);
-
-      expect(awsCompileCloudFrontEventsRemoval.serverless.cli.log).not.to.have.been.calledOnce;
-    });
-  });
-
   describe('#validate()', () => {
     it('should throw if memorySize is greater than 128 for viewer-request or viewer-response functions', () => {
       awsCompileCloudFrontEvents.serverless.service.functions = {
@@ -355,62 +319,63 @@ describe('AwsCompileCloudFrontEvents', () => {
           ],
         },
       };
-      awsCompileCloudFrontEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources = {
-        FirstLambdaFunction: {
-          Type: 'AWS::Lambda::Function',
-          Properties: {
-            FunctionName: 'first',
+      awsCompileCloudFrontEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources =
+        {
+          FirstLambdaFunction: {
+            Type: 'AWS::Lambda::Function',
+            Properties: {
+              FunctionName: 'first',
+            },
           },
-        },
-        FirstLambdaVersion: {
-          Type: 'AWS::Lambda::Version',
-          Properties: {
-            FunctionName: { Ref: 'FirstLambdaFunction' },
+          FirstLambdaVersion: {
+            Type: 'AWS::Lambda::Version',
+            Properties: {
+              FunctionName: { Ref: 'FirstLambdaFunction' },
+            },
           },
-        },
-        IamRoleLambdaExecution: {
-          Type: 'AWS::IAM::Role',
-          Properties: {
-            AssumeRolePolicyDocument: {
-              Version: '2012-10-17',
-              Statement: [
+          IamRoleLambdaExecution: {
+            Type: 'AWS::IAM::Role',
+            Properties: {
+              AssumeRolePolicyDocument: {
+                Version: '2012-10-17',
+                Statement: [
+                  {
+                    Effect: 'Allow',
+                    Principal: {
+                      Service: ['lambda.amazonaws.com'],
+                    },
+                    Action: ['sts:AssumeRole'],
+                  },
+                ],
+              },
+              Policies: [
                 {
-                  Effect: 'Allow',
-                  Principal: {
-                    Service: ['lambda.amazonaws.com'],
+                  PolicyName: {
+                    'Fn::Join': ['-', ['dev', 'first', 'lambda']],
+                  },
+                  PolicyDocument: {
+                    Version: '2012-10-17',
+                    Statement: [],
                   },
-                  Action: ['sts:AssumeRole'],
                 },
               ],
-            },
-            Policies: [
-              {
-                PolicyName: {
-                  'Fn::Join': ['-', ['dev', 'first', 'lambda']],
-                },
-                PolicyDocument: {
-                  Version: '2012-10-17',
-                  Statement: [],
-                },
-              },
-            ],
-            Path: '/',
-            RoleName: {
-              'Fn::Join': [
-                '-',
-                [
-                  'first',
-                  'dev',
-                  {
-                    Ref: 'AWS::Region',
-                  },
-                  'lambdaRole',
+              Path: '/',
+              RoleName: {
+                'Fn::Join': [
+                  '-',
+                  [
+                    'first',
+                    'dev',
+                    {
+                      Ref: 'AWS::Region',
+                    },
+                    'lambdaRole',
+                  ],
                 ],
-              ],
+              },
             },
           },
-        },
-      };
+        };
 
       expect(() => awsCompileCloudFrontEvents.compileCloudFrontEvents()).to.throw(
         /to the us-east-1 region/
@@ -431,62 +396,63 @@ describe('AwsCompileCloudFrontEvents', () => {
           ],
         },
       };
-      awsCompileCloudFrontEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources = {
-        FirstLambdaFunction: {
-          Type: 'AWS::Lambda::Function',
-          Properties: {
-            FunctionName: 'first',
+      awsCompileCloudFrontEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources =
+        {
+          FirstLambdaFunction: {
+            Type: 'AWS::Lambda::Function',
+            Properties: {
+              FunctionName: 'first',
+            },
           },
-        },
-        FirstLambdaVersion: {
-          Type: 'AWS::Lambda::Version',
-          Properties: {
-            FunctionName: { Ref: 'FirstLambdaFunction' },
+          FirstLambdaVersion: {
+            Type: 'AWS::Lambda::Version',
+            Properties: {
+              FunctionName: { Ref: 'FirstLambdaFunction' },
+            },
           },
-        },
-        IamRoleLambdaExecution: {
-          Type: 'AWS::IAM::Role',
-          Properties: {
-            AssumeRolePolicyDocument: {
-              Version: '2012-10-17',
-              Statement: [
+          IamRoleLambdaExecution: {
+            Type: 'AWS::IAM::Role',
+            Properties: {
+              AssumeRolePolicyDocument: {
+                Version: '2012-10-17',
+                Statement: [
+                  {
+                    Effect: 'Allow',
+                    Principal: {
+                      Service: ['lambda.amazonaws.com'],
+                    },
+                    Action: ['sts:AssumeRole'],
+                  },
+                ],
+              },
+              Policies: [
                 {
-                  Effect: 'Allow',
-                  Principal: {
-                    Service: ['lambda.amazonaws.com'],
+                  PolicyName: {
+                    'Fn::Join': ['-', ['dev', 'first', 'lambda']],
+                  },
+                  PolicyDocument: {
+                    Version: '2012-10-17',
+                    Statement: [],
                   },
-                  Action: ['sts:AssumeRole'],
                 },
               ],
-            },
-            Policies: [
-              {
-                PolicyName: {
-                  'Fn::Join': ['-', ['dev', 'first', 'lambda']],
-                },
-                PolicyDocument: {
-                  Version: '2012-10-17',
-                  Statement: [],
-                },
-              },
-            ],
-            Path: '/',
-            RoleName: {
-              'Fn::Join': [
-                '-',
-                [
-                  'first',
-                  'dev',
-                  {
-                    Ref: 'AWS::Region',
-                  },
-                  'lambdaRole',
+              Path: '/',
+              RoleName: {
+                'Fn::Join': [
+                  '-',
+                  [
+                    'first',
+                    'dev',
+                    {
+                      Ref: 'AWS::Region',
+                    },
+                    'lambdaRole',
+                  ],
                 ],
-              ],
+              },
             },
           },
-        },
-      };
+        };
 
       awsCompileCloudFrontEvents.compileCloudFrontEvents();
 
@@ -607,20 +573,21 @@ describe('AwsCompileCloudFrontEvents', () => {
         },
       };
 
-      awsCompileCloudFrontEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources = {
-        FirstLambdaFunction: {
-          Type: 'AWS::Lambda::Function',
-          Properties: {
-            FunctionName: 'first',
+      awsCompileCloudFrontEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources =
+        {
+          FirstLambdaFunction: {
+            Type: 'AWS::Lambda::Function',
+            Properties: {
+              FunctionName: 'first',
+            },
           },
-        },
-        SecondLambdaFunction: {
-          Type: 'AWS::Lambda::Function',
-          Properties: {
-            FunctionName: 'second',
+          SecondLambdaFunction: {
+            Type: 'AWS::Lambda::Function',
+            Properties: {
+              FunctionName: 'second',
+            },
           },
-        },
-      };
+        };
 
       awsCompileCloudFrontEvents.compileCloudFrontEvents();
 
@@ -677,20 +644,21 @@ describe('AwsCompileCloudFrontEvents', () => {
         },
       };
 
-      awsCompileCloudFrontEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources = {
-        FirstLambdaFunction: {
-          Type: 'AWS::Lambda::Function',
-          Properties: {
-            FunctionName: 'first',
+      awsCompileCloudFrontEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources =
+        {
+          FirstLambdaFunction: {
+            Type: 'AWS::Lambda::Function',
+            Properties: {
+              FunctionName: 'first',
+            },
           },
-        },
-        SecondLambdaFunction: {
-          Type: 'AWS::Lambda::Function',
-          Properties: {
-            FunctionName: 'second',
+          SecondLambdaFunction: {
+            Type: 'AWS::Lambda::Function',
+            Properties: {
+              FunctionName: 'second',
+            },
           },
-        },
-      };
+        };
 
       awsCompileCloudFrontEvents.compileCloudFrontEvents();
 
@@ -744,14 +712,15 @@ describe('AwsCompileCloudFrontEvents', () => {
         },
       };
 
-      awsCompileCloudFrontEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources = {
-        FirstLambdaFunction: {
-          Type: 'AWS::Lambda::Function',
-          Properties: {
-            FunctionName: 'first',
+      awsCompileCloudFrontEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources =
+        {
+          FirstLambdaFunction: {
+            Type: 'AWS::Lambda::Function',
+            Properties: {
+              FunctionName: 'first',
+            },
           },
-        },
-      };
+        };
 
       awsCompileCloudFrontEvents.compileCloudFrontEvents();
 
@@ -807,20 +776,21 @@ describe('AwsCompileCloudFrontEvents', () => {
         },
       };
 
-      awsCompileCloudFrontEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources = {
-        FirstLambdaFunction: {
-          Type: 'AWS::Lambda::Function',
-          Properties: {
-            FunctionName: 'first',
+      awsCompileCloudFrontEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources =
+        {
+          FirstLambdaFunction: {
+            Type: 'AWS::Lambda::Function',
+            Properties: {
+              FunctionName: 'first',
+            },
           },
-        },
-        SecondLambdaFunction: {
-          Type: 'AWS::Lambda::Function',
-          Properties: {
-            FunctionName: 'second',
+          SecondLambdaFunction: {
+            Type: 'AWS::Lambda::Function',
+            Properties: {
+              FunctionName: 'second',
+            },
           },
-        },
-      };
+        };
 
       awsCompileCloudFrontEvents.compileCloudFrontEvents();
 
@@ -863,14 +833,15 @@ describe('AwsCompileCloudFrontEvents', () => {
         },
       };
 
-      awsCompileCloudFrontEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources = {
-        FirstLambdaFunction: {
-          Type: 'AWS::Lambda::Function',
-          Properties: {
-            FunctionName: 'first',
+      awsCompileCloudFrontEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources =
+        {
+          FirstLambdaFunction: {
+            Type: 'AWS::Lambda::Function',
+            Properties: {
+              FunctionName: 'first',
+            },
           },
-        },
-      };
+        };
 
       awsCompileCloudFrontEvents.compileCloudFrontEvents();
 
@@ -936,20 +907,21 @@ describe('AwsCompileCloudFrontEvents', () => {
         },
       };
 
-      awsCompileCloudFrontEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources = {
-        FirstLambdaFunction: {
-          Type: 'AWS::Lambda::Function',
-          Properties: {
-            FunctionName: 'first',
+      awsCompileCloudFrontEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources =
+        {
+          FirstLambdaFunction: {
+            Type: 'AWS::Lambda::Function',
+            Properties: {
+              FunctionName: 'first',
+            },
           },
-        },
-        SecondLambdaFunction: {
-          Type: 'AWS::Lambda::Function',
-          Properties: {
-            FunctionName: 'second',
+          SecondLambdaFunction: {
+            Type: 'AWS::Lambda::Function',
+            Properties: {
+              FunctionName: 'second',
+            },
           },
-        },
-      };
+        };
 
       awsCompileCloudFrontEvents.compileCloudFrontEvents();
 
@@ -1001,20 +973,21 @@ describe('AwsCompileCloudFrontEvents', () => {
         },
       };
 
-      awsCompileCloudFrontEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources = {
-        FirstLambdaFunction: {
-          Type: 'AWS::Lambda::Function',
-          Properties: {
-            FunctionName: 'first',
+      awsCompileCloudFrontEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources =
+        {
+          FirstLambdaFunction: {
+            Type: 'AWS::Lambda::Function',
+            Properties: {
+              FunctionName: 'first',
+            },
           },
-        },
-        SecondLambdaFunction: {
-          Type: 'AWS::Lambda::Function',
-          Properties: {
-            FunctionName: 'second',
+          SecondLambdaFunction: {
+            Type: 'AWS::Lambda::Function',
+            Properties: {
+              FunctionName: 'second',
+            },
           },
-        },
-      };
+        };
 
       expect(() => {
         awsCompileCloudFrontEvents.compileCloudFrontEvents();
@@ -1048,32 +1021,33 @@ describe('AwsCompileCloudFrontEvents', () => {
         },
       };
 
-      awsCompileCloudFrontEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources = {
-        FirstLambdaFunction: {
-          Type: 'AWS::Lambda::Function',
-          Properties: {
-            FunctionName: 'first',
+      awsCompileCloudFrontEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources =
+        {
+          FirstLambdaFunction: {
+            Type: 'AWS::Lambda::Function',
+            Properties: {
+              FunctionName: 'first',
+            },
           },
-        },
-        FirstLambdaVersion: {
-          Type: 'AWS::Lambda::Version',
-          Properties: {
-            FunctionName: { Ref: 'FirstLambdaFunction' },
+          FirstLambdaVersion: {
+            Type: 'AWS::Lambda::Version',
+            Properties: {
+              FunctionName: { Ref: 'FirstLambdaFunction' },
+            },
           },
-        },
-        SecondLambdaFunction: {
-          Type: 'AWS::Lambda::Function',
-          Properties: {
-            FunctionName: 'second',
+          SecondLambdaFunction: {
+            Type: 'AWS::Lambda::Function',
+            Properties: {
+              FunctionName: 'second',
+            },
           },
-        },
-        SecondLambdaVersion: {
-          Type: 'AWS::Lambda::Version',
-          Properties: {
-            FunctionName: { Ref: 'SecondLambdaFunction' },
+          SecondLambdaVersion: {
+            Type: 'AWS::Lambda::Version',
+            Properties: {
+              FunctionName: { Ref: 'SecondLambdaFunction' },
+            },
           },
-        },
-      };
+        };
 
       awsCompileCloudFrontEvents.compileCloudFrontEvents();
 
@@ -1134,20 +1108,21 @@ describe('AwsCompileCloudFrontEvents', () => {
         },
       };
 
-      awsCompileCloudFrontEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources = {
-        FirstLambdaFunction: {
-          Type: 'AWS::Lambda::Function',
-          Properties: {
-            FunctionName: 'first',
+      awsCompileCloudFrontEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources =
+        {
+          FirstLambdaFunction: {
+            Type: 'AWS::Lambda::Function',
+            Properties: {
+              FunctionName: 'first',
+            },
           },
-        },
-        FirstLambdaVersion: {
-          Type: 'AWS::Lambda::Version',
-          Properties: {
-            FunctionName: { Ref: 'FirstLambdaFunction' },
+          FirstLambdaVersion: {
+            Type: 'AWS::Lambda::Version',
+            Properties: {
+              FunctionName: { Ref: 'FirstLambdaFunction' },
+            },
           },
-        },
-      };
+        };
 
       awsCompileCloudFrontEvents.compileCloudFrontEvents();
 
@@ -1213,32 +1188,33 @@ describe('AwsCompileCloudFrontEvents', () => {
         },
       };
 
-      awsCompileCloudFrontEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources = {
-        FirstLambdaFunction: {
-          Type: 'AWS::Lambda::Function',
-          Properties: {
-            FunctionName: 'first',
+      awsCompileCloudFrontEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources =
+        {
+          FirstLambdaFunction: {
+            Type: 'AWS::Lambda::Function',
+            Properties: {
+              FunctionName: 'first',
+            },
           },
-        },
-        FirstLambdaVersion: {
-          Type: 'AWS::Lambda::Version',
-          Properties: {
-            FunctionName: { Ref: 'FirstLambdaFunction' },
+          FirstLambdaVersion: {
+            Type: 'AWS::Lambda::Version',
+            Properties: {
+              FunctionName: { Ref: 'FirstLambdaFunction' },
+            },
           },
-        },
-        SecondLambdaFunction: {
-          Type: 'AWS::Lambda::Function',
-          Properties: {
-            FunctionName: 'second',
+          SecondLambdaFunction: {
+            Type: 'AWS::Lambda::Function',
+            Properties: {
+              FunctionName: 'second',
+            },
           },
-        },
-        SecondLambdaVersion: {
-          Type: 'AWS::Lambda::Version',
-          Properties: {
-            FunctionName: { Ref: 'SecondLambdaFunction' },
+          SecondLambdaVersion: {
+            Type: 'AWS::Lambda::Version',
+            Properties: {
+              FunctionName: { Ref: 'SecondLambdaFunction' },
+            },
           },
-        },
-      };
+        };
 
       awsCompileCloudFrontEvents.compileCloudFrontEvents();
 
@@ -1321,32 +1297,33 @@ describe('AwsCompileCloudFrontEvents', () => {
         },
       };
 
-      awsCompileCloudFrontEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources = {
-        FirstLambdaFunction: {
-          Type: 'AWS::Lambda::Function',
-          Properties: {
-            FunctionName: 'first',
+      awsCompileCloudFrontEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources =
+        {
+          FirstLambdaFunction: {
+            Type: 'AWS::Lambda::Function',
+            Properties: {
+              FunctionName: 'first',
+            },
           },
-        },
-        FirstLambdaVersion: {
-          Type: 'AWS::Lambda::Version',
-          Properties: {
-            FunctionName: { Ref: 'FirstLambdaFunction' },
+          FirstLambdaVersion: {
+            Type: 'AWS::Lambda::Version',
+            Properties: {
+              FunctionName: { Ref: 'FirstLambdaFunction' },
+            },
           },
-        },
-        SecondLambdaFunction: {
-          Type: 'AWS::Lambda::Function',
-          Properties: {
-            FunctionName: 'second',
+          SecondLambdaFunction: {
+            Type: 'AWS::Lambda::Function',
+            Properties: {
+              FunctionName: 'second',
+            },
           },
-        },
-        SecondLambdaVersion: {
-          Type: 'AWS::Lambda::Version',
-          Properties: {
-            FunctionName: { Ref: 'SecondLambdaFunction' },
+          SecondLambdaVersion: {
+            Type: 'AWS::Lambda::Version',
+            Properties: {
+              FunctionName: { Ref: 'SecondLambdaFunction' },
+            },
           },
-        },
-      };
+        };
 
       expect(() => {
         awsCompileCloudFrontEvents.compileCloudFrontEvents();
@@ -1382,32 +1359,33 @@ describe('AwsCompileCloudFrontEvents', () => {
         },
       };
 
-      awsCompileCloudFrontEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources = {
-        FirstLambdaFunction: {
-          Type: 'AWS::Lambda::Function',
-          Properties: {
-            FunctionName: 'first',
+      awsCompileCloudFrontEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources =
+        {
+          FirstLambdaFunction: {
+            Type: 'AWS::Lambda::Function',
+            Properties: {
+              FunctionName: 'first',
+            },
           },
-        },
-        FirstLambdaVersion: {
-          Type: 'AWS::Lambda::Version',
-          Properties: {
-            FunctionName: { Ref: 'FirstLambdaFunction' },
+          FirstLambdaVersion: {
+            Type: 'AWS::Lambda::Version',
+            Properties: {
+              FunctionName: { Ref: 'FirstLambdaFunction' },
+            },
           },
-        },
-        SecondLambdaFunction: {
-          Type: 'AWS::Lambda::Function',
-          Properties: {
-            FunctionName: 'second',
+          SecondLambdaFunction: {
+            Type: 'AWS::Lambda::Function',
+            Properties: {
+              FunctionName: 'second',
+            },
           },
-        },
-        SecondLambdaVersion: {
-          Type: 'AWS::Lambda::Version',
-          Properties: {
-            FunctionName: { Ref: 'SecondLambdaFunction' },
+          SecondLambdaVersion: {
+            Type: 'AWS::Lambda::Version',
+            Properties: {
+              FunctionName: { Ref: 'SecondLambdaFunction' },
+            },
           },
-        },
-      };
+        };
 
       awsCompileCloudFrontEvents.compileCloudFrontEvents();
 
@@ -1440,70 +1418,6 @@ describe('AwsCompileCloudFrontEvents', () => {
       ).to.not.have.any.keys('CacheBehaviors');
     });
 
-    it('should create behavior with all values given as an object', () => {
-      awsCompileCloudFrontEvents.serverless.service.functions = {
-        first: {
-          name: 'first',
-          events: [
-            {
-              cloudFront: {
-                eventType: 'viewer-request',
-                origin: 's3://bucketname.s3.amazonaws.com/files',
-                behavior: {
-                  ForwardedValues: {
-                    QueryString: true,
-                    Headers: ['*'],
-                  },
-                  ViewerProtocolPolicy: 'https-only',
-                  AllowedMethods: ['GET', 'HEAD', 'OPTIONS'],
-                  CachedMethods: ['GET', 'HEAD', 'OPTIONS'],
-                },
-              },
-            },
-          ],
-        },
-      };
-
-      awsCompileCloudFrontEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources = {
-        FirstLambdaFunction: {
-          Type: 'AWS::Lambda::Function',
-          Properties: {
-            FunctionName: 'first',
-          },
-        },
-        FirstLambdaVersion: {
-          Type: 'AWS::Lambda::Version',
-          Properties: {
-            FunctionName: { Ref: 'FirstLambdaFunction' },
-          },
-        },
-      };
-
-      awsCompileCloudFrontEvents.compileCloudFrontEvents();
-
-      expect(
-        awsCompileCloudFrontEvents.serverless.service.provider.compiledCloudFormationTemplate
-          .Resources.CloudFrontDistribution.Properties.DistributionConfig.DefaultCacheBehavior
-      ).to.eql({
-        TargetOriginId: 's3/bucketname.s3.amazonaws.com/files',
-        ViewerProtocolPolicy: 'https-only',
-        ForwardedValues: {
-          QueryString: true,
-          Headers: ['*'],
-        },
-        AllowedMethods: ['GET', 'HEAD', 'OPTIONS'],
-        CachedMethods: ['GET', 'HEAD', 'OPTIONS'],
-        LambdaFunctionAssociations: [
-          {
-            EventType: 'viewer-request',
-            LambdaFunctionARN: {
-              Ref: 'FirstLambdaVersion',
-            },
-          },
-        ],
-      });
-    });
-
     it('should throw if more than one behavior with the same PathPattern', () => {
       awsCompileCloudFrontEvents.serverless.service.functions = {
         first: {
@@ -1532,32 +1446,33 @@ describe('AwsCompileCloudFrontEvents', () => {
         },
       };
 
-      awsCompileCloudFrontEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources = {
-        FirstLambdaFunction: {
-          Type: 'AWS::Lambda::Function',
-          Properties: {
-            FunctionName: 'first',
+      awsCompileCloudFrontEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources =
+        {
+          FirstLambdaFunction: {
+            Type: 'AWS::Lambda::Function',
+            Properties: {
+              FunctionName: 'first',
+            },
           },
-        },
-        FirstLambdaVersion: {
-          Type: 'AWS::Lambda::Version',
-          Properties: {
-            FunctionName: { Ref: 'FirstLambdaFunction' },
+          FirstLambdaVersion: {
+            Type: 'AWS::Lambda::Version',
+            Properties: {
+              FunctionName: { Ref: 'FirstLambdaFunction' },
+            },
           },
-        },
-        SecondLambdaFunction: {
-          Type: 'AWS::Lambda::Function',
-          Properties: {
-            FunctionName: 'second',
+          SecondLambdaFunction: {
+            Type: 'AWS::Lambda::Function',
+            Properties: {
+              FunctionName: 'second',
+            },
           },
-        },
-        SecondLambdaVersion: {
-          Type: 'AWS::Lambda::Version',
-          Properties: {
-            FunctionName: { Ref: 'SecondLambdaFunction' },
+          SecondLambdaVersion: {
+            Type: 'AWS::Lambda::Version',
+            Properties: {
+              FunctionName: { Ref: 'SecondLambdaFunction' },
+            },
           },
-        },
-      };
+        };
 
       expect(() => {
         awsCompileCloudFrontEvents.compileCloudFrontEvents();
@@ -1592,32 +1507,33 @@ describe('AwsCompileCloudFrontEvents', () => {
         },
       };
 
-      awsCompileCloudFrontEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources = {
-        FirstLambdaFunction: {
-          Type: 'AWS::Lambda::Function',
-          Properties: {
-            FunctionName: 'first',
+      awsCompileCloudFrontEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources =
+        {
+          FirstLambdaFunction: {
+            Type: 'AWS::Lambda::Function',
+            Properties: {
+              FunctionName: 'first',
+            },
           },
-        },
-        FirstLambdaVersion: {
-          Type: 'AWS::Lambda::Version',
-          Properties: {
-            FunctionName: { Ref: 'FirstLambdaFunction' },
+          FirstLambdaVersion: {
+            Type: 'AWS::Lambda::Version',
+            Properties: {
+              FunctionName: { Ref: 'FirstLambdaFunction' },
+            },
           },
-        },
-        SecondLambdaFunction: {
-          Type: 'AWS::Lambda::Function',
-          Properties: {
-            FunctionName: 'second',
+          SecondLambdaFunction: {
+            Type: 'AWS::Lambda::Function',
+            Properties: {
+              FunctionName: 'second',
+            },
           },
-        },
-        SecondLambdaVersion: {
-          Type: 'AWS::Lambda::Version',
-          Properties: {
-            FunctionName: { Ref: 'SecondLambdaFunction' },
+          SecondLambdaVersion: {
+            Type: 'AWS::Lambda::Version',
+            Properties: {
+              FunctionName: { Ref: 'SecondLambdaFunction' },
+            },
           },
-        },
-      };
+        };
 
       expect(() => {
         awsCompileCloudFrontEvents.compileCloudFrontEvents();
@@ -1629,7 +1545,7 @@ describe('AwsCompileCloudFrontEvents', () => {
   });
 });
 
-describe('lib/plugins/aws/package/compile/events/cloudFront/index.new.test.js', () => {
+describe('test/unit/lib/plugins/aws/package/compile/events/cloudFront.test.js', () => {
   describe.skip('TODO: Removal notice', () => {
     it('should show preconfigured notice on "sls remove" if service has cloudFront event', async () => {
       // Replaces
@@ -1643,7 +1559,7 @@ describe('lib/plugins/aws/package/compile/events/cloudFront/index.new.test.js',
       });
     });
 
-    it('should not show preconfigured notice on "sls remove" if service doesn\'t have  cloudFront event', async () => {
+    it('should not show preconfigured notice on "sls remove" if service doesn\'t have cloudFront event', async () => {
       // Replaces
       // https://github.com/serverless/serverless/blob/85e480b5771d5deeb45ae5eb586723c26cf61a90/lib/plugins/aws/package/compile/events/cloudFront/index.test.js#L113-L118
 
@@ -1748,7 +1664,7 @@ describe('lib/plugins/aws/package/compile/events/cloudFront/index.new.test.js',
           command: 'package',
           configExt: {
             functions: {
-              foo: {
+              basic: {
                 handler: 'myLambdaAtEdge.handler',
                 events: [
                   {
@@ -1768,42 +1684,6 @@ describe('lib/plugins/aws/package/compile/events/cloudFront/index.new.test.js',
       ).to.eventually.be.rejected.and.have.property('code', 'UNRECOGNIZED_CLOUDFRONT_CACHE_POLICY');
     });
 
-    it('Should throw if lambda config includes both deprecated behavior values and cache policy reference', () => {
-      const cachePolicyId = '08627262-05a9-4f76-9ded-b50ca2e3a84f';
-      return expect(
-        runServerless({
-          fixture: 'function',
-          command: 'package',
-          configExt: {
-            functions: {
-              foo: {
-                handler: 'myLambdaAtEdge.handler',
-                events: [
-                  {
-                    cloudFront: {
-                      origin: 's3://bucketname.s3.amazonaws.com/files',
-                      eventType: 'viewer-response',
-                      behavior: {
-                        ForwardedValues: {
-                          QueryString: true,
-                        },
-                      },
-                      cachePolicy: {
-                        id: cachePolicyId,
-                      },
-                    },
-                  },
-                ],
-              },
-            },
-          },
-        })
-      ).to.eventually.be.rejected.and.have.property(
-        'code',
-        'CACHE_POLICY_ID_AND_DEPRECATED_FIELDS_USED'
-      );
-    });
-
     it('Should not throw if lambda config includes AllowedMethods or CachedMethods behavior values and cache policy reference', async () => {
       const cachePolicyId = '08627262-05a9-4f76-9ded-b50ca2e3a84f';
       await runServerless({
@@ -1811,7 +1691,7 @@ describe('lib/plugins/aws/package/compile/events/cloudFront/index.new.test.js',
         command: 'package',
         configExt: {
           functions: {
-            foo: {
+            basic: {
               handler: 'myLambdaAtEdge.handler',
               events: [
                 {
@@ -1873,6 +1753,7 @@ describe('lib/plugins/aws/package/compile/events/cloudFront/index.new.test.js',
     const stage = 'custom-stage';
     const cachePolicyName = 'allInCache';
     const cachePolicyId = '08627262-05a9-4f76-9ded-b50ca2e3a84f';
+    const cachePolicyId2 = '4135ea2d-6df8-44a3-9df3-4b5a84be39ad';
     const cachePolicyConfig = {
       DefaultTTL: 60,
       MinTTL: 30,
@@ -1978,6 +1859,57 @@ describe('lib/plugins/aws/package/compile/events/cloudFront/index.new.test.js',
                 },
               ],
             },
+            fnCachePolicyManagedSetViaBehavior: {
+              handler: 'myLambdaAtEdge.handler',
+              events: [
+                {
+                  cloudFront: {
+                    origin: 's3://bucketname.s3.amazonaws.com',
+                    eventType: 'viewer-response',
+                    pathPattern: 'managedPolicySetViaBehavior',
+                    behavior: {
+                      CachePolicyId: cachePolicyId,
+                    },
+                  },
+                },
+              ],
+            },
+            fnCachePolicySetViaCachePolicyIdAndBehavior: {
+              handler: 'myLambdaAtEdge.handler',
+              events: [
+                {
+                  cloudFront: {
+                    origin: 's3://bucketname.s3.amazonaws.com',
+                    eventType: 'viewer-response',
+                    pathPattern: 'policySetViaCachePolicyIdAndBehavior',
+                    cachePolicy: {
+                      id: cachePolicyId,
+                    },
+                    behavior: {
+                      CachePolicyId: cachePolicyId2,
+                    },
+                  },
+                },
+              ],
+            },
+            fnCachePolicySetViaCachePolicyNameAndBehavior: {
+              handler: 'myLambdaAtEdge.handler',
+              events: [
+                {
+                  cloudFront: {
+                    origin: 's3://bucketname.s3.amazonaws.com',
+                    eventType: 'viewer-response',
+                    pathPattern: 'policySetViaCachePolicyNameAndBehavior',
+                    cachePolicy: {
+                      name: cachePolicyName,
+                    },
+                    behavior: {
+                      CachePolicyId: cachePolicyId2,
+                    },
+                  },
+                },
+              ],
+            },
           },
         },
       });
@@ -2069,7 +2001,7 @@ describe('lib/plugins/aws/package/compile/events/cloudFront/index.new.test.js',
     });
     it('should ignore provider VPC config', () => {
       const edgeResolvedName = naming.getLambdaLogicalId('fnOriginResponse');
-      const otherResolvedName = naming.getLambdaLogicalId('foo');
+      const otherResolvedName = naming.getLambdaLogicalId('basic');
       expect(cfResources[edgeResolvedName].Properties).not.to.contain.keys('VpcConfig');
       expect(cfResources[otherResolvedName].Properties).to.contain.keys('VpcConfig');
     });
@@ -2095,7 +2027,28 @@ describe('lib/plugins/aws/package/compile/events/cloudFront/index.new.test.js',
       expect(getAssociatedCacheBehavior('managedPolicy').CachePolicyId).to.eq(cachePolicyId);
     });
 
-    it('Should attach a default cache policy when none are provided, and no deprecated behavior values are used', () => {
+    it('Should attach a cache policy to a cloudfront behavior when specified by id via `behavior.CachePolicyId` in lambda config', () => {
+      expect(getAssociatedCacheBehavior('managedPolicySetViaBehavior').CachePolicyId).to.eq(
+        cachePolicyId
+      );
+    });
+
+    it('Should attach a cache policy specified via `cachePolicy.id` to a cloudfront behavior when specified via both of `cachePolicy.id` and `behavior.CachePolicyId` in lambda config', () => {
+      expect(
+        getAssociatedCacheBehavior('policySetViaCachePolicyIdAndBehavior').CachePolicyId
+      ).to.eq(cachePolicyId);
+    });
+
+    it('Should attach a cache policy specified via `cachePolicy.name` to a cloudfront behavior when specified via both of `cachePolicy.name` and `behavior.CachePolicyId` in lambda config', () => {
+      const cachePolicyLogicalId = naming.getCloudFrontCachePolicyLogicalId(cachePolicyName);
+      expect(
+        getAssociatedCacheBehavior('policySetViaCachePolicyNameAndBehavior').CachePolicyId
+      ).to.deep.eq({
+        Ref: cachePolicyLogicalId,
+      });
+    });
+
+    it('Should attach a default cache policy when none are provided', () => {
       // Default Managed-CachingOptimized Cache Policy id
       const defaultCachePolicyId = '658327ea-f89d-4fab-a63d-7e88639e58f6';
       expect(getAssociatedCacheBehavior('noPolicy').CachePolicyId).to.eq(defaultCachePolicyId);
diff --git a/test/unit/lib/plugins/aws/package/compile/events/cloudWatchEvent.test.js b/test/unit/lib/plugins/aws/package/compile/events/cloud-watch-event.test.js
similarity index 98%
rename from test/unit/lib/plugins/aws/package/compile/events/cloudWatchEvent.test.js
rename to test/unit/lib/plugins/aws/package/compile/events/cloud-watch-event.test.js
index fb02e8ef735..42524032a1f 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/cloudWatchEvent.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/cloud-watch-event.test.js
@@ -2,15 +2,15 @@
 
 const expect = require('chai').expect;
 const AwsProvider = require('../../../../../../../../lib/plugins/aws/provider');
-const AwsCompileCloudWatchEventEvents = require('../../../../../../../../lib/plugins/aws/package/compile/events/cloudWatchEvent');
-const Serverless = require('../../../../../../../../lib/Serverless');
+const AwsCompileCloudWatchEventEvents = require('../../../../../../../../lib/plugins/aws/package/compile/events/cloud-watch-event');
+const Serverless = require('../../../../../../../../lib/serverless');
 
 describe('awsCompileCloudWatchEventEvents', () => {
   let serverless;
   let awsCompileCloudWatchEventEvents;
 
   beforeEach(() => {
-    serverless = new Serverless();
+    serverless = new Serverless({ commands: [], options: {} });
     serverless.service.provider.compiledCloudFormationTemplate = { Resources: {} };
     serverless.setProvider('aws', new AwsProvider(serverless));
     awsCompileCloudWatchEventEvents = new AwsCompileCloudWatchEventEvents(serverless);
diff --git a/test/unit/lib/plugins/aws/package/compile/events/cloudWatchLog.test.js b/test/unit/lib/plugins/aws/package/compile/events/cloud-watch-log.test.js
similarity index 81%
rename from test/unit/lib/plugins/aws/package/compile/events/cloudWatchLog.test.js
rename to test/unit/lib/plugins/aws/package/compile/events/cloud-watch-log.test.js
index 3e4c4d956d5..688d3870fb3 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/cloudWatchLog.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/cloud-watch-log.test.js
@@ -2,15 +2,15 @@
 
 const expect = require('chai').expect;
 const AwsProvider = require('../../../../../../../../lib/plugins/aws/provider');
-const AwsCompileCloudWatchLogEvents = require('../../../../../../../../lib/plugins/aws/package/compile/events/cloudWatchLog');
-const Serverless = require('../../../../../../../../lib/Serverless');
+const AwsCompileCloudWatchLogEvents = require('../../../../../../../../lib/plugins/aws/package/compile/events/cloud-watch-log');
+const Serverless = require('../../../../../../../../lib/serverless');
 
 describe('AwsCompileCloudWatchLogEvents', () => {
   let serverless;
   let awsCompileCloudWatchLogEvents;
 
   beforeEach(() => {
-    serverless = new Serverless();
+    serverless = new Serverless({ commands: [], options: {} });
     serverless.service.provider.compiledCloudFormationTemplate = { Resources: {} };
     serverless.setProvider('aws', new AwsProvider(serverless));
     awsCompileCloudWatchLogEvents = new AwsCompileCloudWatchLogEvents(serverless);
@@ -72,6 +72,63 @@ describe('AwsCompileCloudWatchLogEvents', () => {
       ).to.equal('AWS::Lambda::Permission');
     });
 
+    it('should respect 2 cloudwatchLog events for log group', () => {
+      awsCompileCloudWatchLogEvents.serverless.service.functions = {
+        first: {
+          events: [
+            {
+              cloudwatchLog: {
+                logGroup: '/aws/lambda/hello1',
+              },
+            },
+          ],
+        },
+        second: {
+          events: [
+            {
+              cloudwatchLog: {
+                logGroup: '/aws/lambda/hello1',
+              },
+            },
+          ],
+        },
+      };
+
+      awsCompileCloudWatchLogEvents.compileCloudWatchLogEvents();
+      expect(
+        awsCompileCloudWatchLogEvents.serverless.service.provider.compiledCloudFormationTemplate
+          .Resources.FirstLogsSubscriptionFilterCloudWatchLog1.Type
+      ).to.equal('AWS::Logs::SubscriptionFilter');
+      expect(
+        awsCompileCloudWatchLogEvents.serverless.service.provider.compiledCloudFormationTemplate
+          .Resources.FirstLogsSubscriptionFilterCloudWatchLog1.Properties.LogGroupName
+      ).to.equal('/aws/lambda/hello1');
+      expect(
+        awsCompileCloudWatchLogEvents.serverless.service.provider.compiledCloudFormationTemplate
+          .Resources.FirstLogsSubscriptionFilterCloudWatchLog1.Properties.FilterPattern
+      ).to.equal('');
+      expect(
+        awsCompileCloudWatchLogEvents.serverless.service.provider.compiledCloudFormationTemplate
+          .Resources.FirstLambdaPermissionLogsSubscriptionFilterCloudWatchLog.Type
+      ).to.equal('AWS::Lambda::Permission');
+      expect(
+        awsCompileCloudWatchLogEvents.serverless.service.provider.compiledCloudFormationTemplate
+          .Resources.SecondLogsSubscriptionFilterCloudWatchLog1.Type
+      ).to.equal('AWS::Logs::SubscriptionFilter');
+      expect(
+        awsCompileCloudWatchLogEvents.serverless.service.provider.compiledCloudFormationTemplate
+          .Resources.SecondLogsSubscriptionFilterCloudWatchLog1.Properties.LogGroupName
+      ).to.equal('/aws/lambda/hello1');
+      expect(
+        awsCompileCloudWatchLogEvents.serverless.service.provider.compiledCloudFormationTemplate
+          .Resources.SecondLogsSubscriptionFilterCloudWatchLog1.Properties.FilterPattern
+      ).to.equal('');
+      expect(
+        awsCompileCloudWatchLogEvents.serverless.service.provider.compiledCloudFormationTemplate
+          .Resources.SecondLambdaPermissionLogsSubscriptionFilterCloudWatchLog.Type
+      ).to.equal('AWS::Lambda::Permission');
+    });
+
     it('should respect "filter" variable', () => {
       awsCompileCloudWatchLogEvents.serverless.service.functions = {
         first: {
@@ -250,7 +307,7 @@ describe('AwsCompileCloudWatchLogEvents', () => {
       ).to.equal('/aws/lambda/yada-dev-dummy*');
     });
 
-    it('should throw an error if "logGroup" is duplicated in one CloudFormation stack', () => {
+    it('should throw an error if "logGroup" is configured more than twice in one CloudFormation stack', () => {
       awsCompileCloudWatchLogEvents.serverless.service.functions = {
         first: {
           events: [
@@ -263,6 +320,9 @@ describe('AwsCompileCloudWatchLogEvents', () => {
             {
               cloudwatchLog: '/aws/lambda/hello1',
             },
+            {
+              cloudwatchLog: '/aws/lambda/hello1',
+            },
           ],
         },
       };
@@ -273,19 +333,20 @@ describe('AwsCompileCloudWatchLogEvents', () => {
         first: {
           events: [
             {
-              cloudwatchLog: {
-                logGroup: '/aws/lambda/hello1',
-              },
+              cloudwatchLog: '/aws/lambda/hello1',
             },
             {
-              cloudwatchLog: {
-                logGroup: '/aws/lambda/hello2',
-              },
+              cloudwatchLog: '/aws/lambda/hello2',
             },
             {
-              cloudwatchLog: {
-                logGroup: '/aws/lambda/hello1',
-              },
+              cloudwatchLog: '/aws/lambda/hello1',
+            },
+          ],
+        },
+        second: {
+          events: [
+            {
+              cloudwatchLog: '/aws/lambda/hello1',
             },
           ],
         },
diff --git a/test/unit/lib/plugins/aws/package/compile/events/cognitoUserPool.test.js b/test/unit/lib/plugins/aws/package/compile/events/cognito-user-pool.test.js
similarity index 94%
rename from test/unit/lib/plugins/aws/package/compile/events/cognitoUserPool.test.js
rename to test/unit/lib/plugins/aws/package/compile/events/cognito-user-pool.test.js
index fe379bdb4f5..81cc0684acf 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/cognitoUserPool.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/cognito-user-pool.test.js
@@ -6,7 +6,8 @@ const sinon = require('sinon');
 const chai = require('chai');
 const proxyquire = require('proxyquire').noCallThru();
 const AwsProvider = require('../../../../../../../../lib/plugins/aws/provider');
-const Serverless = require('../../../../../../../../lib/Serverless');
+const Serverless = require('../../../../../../../../lib/serverless');
+const runServerless = require('../../../../../../../utils/run-serverless');
 
 const { expect } = chai;
 chai.use(require('sinon-chai'));
@@ -20,14 +21,14 @@ describe('AwsCompileCognitoUserPoolEvents', () => {
   beforeEach(() => {
     addCustomResourceToServiceStub = sinon.stub().resolves();
     const AwsCompileCognitoUserPoolEvents = proxyquire(
-      '../../../../../../../../lib/plugins/aws/package/compile/events/cognitoUserPool',
+      '../../../../../../../../lib/plugins/aws/package/compile/events/cognito-user-pool',
       {
-        '../../../customResources': {
+        '../../../custom-resources': {
           addCustomResourceToService: addCustomResourceToServiceStub,
         },
       }
     );
-    serverless = new Serverless();
+    serverless = new Serverless({ commands: [], options: {} });
     serverless.service.provider.compiledCloudFormationTemplate = { Resources: {} };
     serverless.setProvider('aws', new AwsProvider(serverless));
     awsCompileCognitoUserPoolEvents = new AwsCompileCognitoUserPoolEvents(serverless);
@@ -295,9 +296,9 @@ describe('AwsCompileCognitoUserPoolEvents', () => {
       return expect(
         awsCompileCognitoUserPoolEvents.existingCognitoUserPools()
       ).to.be.fulfilled.then(() => {
-        const {
-          Resources,
-        } = awsCompileCognitoUserPoolEvents.serverless.service.provider.compiledCloudFormationTemplate;
+        const { Resources } =
+          awsCompileCognitoUserPoolEvents.serverless.service.provider
+            .compiledCloudFormationTemplate;
 
         expect(addCustomResourceToServiceStub).to.have.been.calledOnce;
         expect(addCustomResourceToServiceStub.args[0][1]).to.equal('cognitoUserPool');
@@ -339,11 +340,40 @@ describe('AwsCompileCognitoUserPoolEvents', () => {
                 Trigger: 'CustomMessage',
               },
             ],
+            ForceDeploy: undefined,
           },
         });
       });
     });
 
+    it('should support `forceDeploy` setting', async () => {
+      const result = await runServerless({
+        fixture: 'cognito-user-pool',
+        configExt: {
+          functions: {
+            existingSimple: {
+              events: [
+                {
+                  cognitoUserPool: {
+                    forceDeploy: true,
+                  },
+                },
+              ],
+            },
+          },
+        },
+        command: 'package',
+      });
+
+      const { Resources } = result.cfTemplate;
+      const { awsNaming } = result;
+
+      const customResource =
+        Resources[awsNaming.getCustomResourceCognitoUserPoolResourceLogicalId('existingSimple')];
+
+      expect(typeof customResource.Properties.ForceDeploy).to.equal('number');
+    });
+
     it('should create the necessary resources for a service using multiple event definitions', () => {
       awsCompileCognitoUserPoolEvents.serverless.service.functions = {
         first: {
@@ -377,9 +407,9 @@ describe('AwsCompileCognitoUserPoolEvents', () => {
       return expect(
         awsCompileCognitoUserPoolEvents.existingCognitoUserPools()
       ).to.be.fulfilled.then(() => {
-        const {
-          Resources,
-        } = awsCompileCognitoUserPoolEvents.serverless.service.provider.compiledCloudFormationTemplate;
+        const { Resources } =
+          awsCompileCognitoUserPoolEvents.serverless.service.provider
+            .compiledCloudFormationTemplate;
 
         expect(addCustomResourceToServiceStub).to.have.been.calledOnce;
         expect(addCustomResourceToServiceStub.args[0][1]).to.equal('cognitoUserPool');
@@ -427,6 +457,7 @@ describe('AwsCompileCognitoUserPoolEvents', () => {
                 Trigger: 'DefineAuthChallenge',
               },
             ],
+            ForceDeploy: undefined,
           },
         });
       });
@@ -491,9 +522,9 @@ describe('AwsCompileCognitoUserPoolEvents', () => {
       return expect(
         awsCompileCognitoUserPoolEvents.existingCognitoUserPools()
       ).to.be.fulfilled.then(() => {
-        const {
-          Resources,
-        } = awsCompileCognitoUserPoolEvents.serverless.service.provider.compiledCloudFormationTemplate;
+        const { Resources } =
+          awsCompileCognitoUserPoolEvents.serverless.service.provider
+            .compiledCloudFormationTemplate;
 
         expect(addCustomResourceToServiceStub).to.have.been.calledOnce;
         expect(addCustomResourceToServiceStub.args[0][1]).to.equal('cognitoUserPool');
@@ -556,6 +587,7 @@ describe('AwsCompileCognitoUserPoolEvents', () => {
                 Trigger: 'DefineAuthChallenge',
               },
             ],
+            ForceDeploy: undefined,
           },
         });
         expect(Resources.SecondCustomCognitoUserPool1).to.deep.equal({
@@ -583,6 +615,7 @@ describe('AwsCompileCognitoUserPoolEvents', () => {
                 Trigger: 'PostAuthentication',
               },
             ],
+            ForceDeploy: undefined,
           },
         });
       });
diff --git a/test/unit/lib/plugins/aws/package/compile/events/eventBridge/index.test.js b/test/unit/lib/plugins/aws/package/compile/events/event-bridge/index.test.js
similarity index 67%
rename from test/unit/lib/plugins/aws/package/compile/events/eventBridge/index.test.js
rename to test/unit/lib/plugins/aws/package/compile/events/event-bridge/index.test.js
index 692e6f1e8b7..3bca32b89dc 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/eventBridge/index.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/event-bridge/index.test.js
@@ -127,6 +127,30 @@ const serverlessConfigurationExtension = {
         },
       ],
     },
+    disabled: {
+      handler: 'index.handler',
+      events: [
+        {
+          eventBridge: {
+            eventBus: 'arn:aws:events:us-east-1:12345:event-bus/default',
+            schedule: 'rate(10 minutes)',
+            enabled: false,
+          },
+        },
+      ],
+    },
+    enabled: {
+      handler: 'index.handler',
+      events: [
+        {
+          eventBridge: {
+            eventBus: 'arn:aws:events:us-east-1:12345:event-bus/default',
+            schedule: 'rate(10 minutes)',
+            enabled: true,
+          },
+        },
+      ],
+    },
   },
 };
 
@@ -138,7 +162,15 @@ describe('EventBridgeEvents', () => {
     before(async () => {
       const { cfTemplate, awsNaming } = await runServerless({
         fixture: 'function',
-        configExt: serverlessConfigurationExtension,
+        configExt: {
+          ...serverlessConfigurationExtension,
+          disabledDeprecations: ['AWS_EVENT_BRIDGE_CUSTOM_RESOURCE_LEGACY_OPT_IN'],
+          provider: {
+            eventBridge: {
+              useCloudFormation: false,
+            },
+          },
+        },
         command: 'package',
       });
       cfResources = cfTemplate.Resources;
@@ -156,9 +188,8 @@ describe('EventBridgeEvents', () => {
     it('should create the correct policy Statement', () => {
       const roleId = naming.getCustomResourcesRoleLogicalId('default', '12345');
 
-      const [firstStatement, secondStatement, thirdStatment] = cfResources[
-        roleId
-      ].Properties.Policies[0].PolicyDocument.Statement;
+      const [firstStatement, secondStatement, thirdStatment] =
+        cfResources[roleId].Properties.Policies[0].PolicyDocument.Statement;
       expect(firstStatement.Effect).to.be.eq('Allow');
       expect(firstStatement.Resource['Fn::Join'][1]).to.deep.include('arn');
       expect(firstStatement.Resource['Fn::Join'][1]).to.deep.include('events');
@@ -191,6 +222,21 @@ describe('EventBridgeEvents', () => {
       expect(eventBridgeConfig.RuleName).to.include('dev-default-rule-1');
     });
 
+    it('should ensure state is enabled by default', () => {
+      const eventBridgeConfig = getEventBridgeConfigById('default');
+      expect(eventBridgeConfig.State).to.be.eq('ENABLED');
+    });
+
+    it('should ensure state is enabled when explicity set', () => {
+      const eventBridgeConfig = getEventBridgeConfigById('enabled');
+      expect(eventBridgeConfig.State).to.be.eq('ENABLED');
+    });
+
+    it('should ensure state is disabled when explicity set', () => {
+      const eventBridgeConfig = getEventBridgeConfigById('disabled');
+      expect(eventBridgeConfig.State).to.be.eq('DISABLED');
+    });
+
     it("should ensure rule name doesn't exceed 64 chars", () => {
       const eventBridgeConfig = getEventBridgeConfigById(NAME_OVER_64_CHARS);
       expect(eventBridgeConfig.RuleName.endsWith('rule-1')).to.be.true;
@@ -234,13 +280,92 @@ describe('EventBridgeEvents', () => {
       expect(firstStatement.Effect).to.be.eq('Allow');
     });
 
+    it('should fail when trying to set RetryPolicy', async () => {
+      await expect(
+        runServerless({
+          fixture: 'function',
+          configExt: {
+            disabledDeprecations: ['AWS_EVENT_BRIDGE_CUSTOM_RESOURCE_LEGACY_OPT_IN'],
+            provider: {
+              eventBridge: {
+                useCloudFormation: false,
+              },
+            },
+            functions: {
+              basic: {
+                events: [
+                  {
+                    eventBridge: {
+                      retryPolicy: {
+                        maximumEventAge: 4200,
+                        maximumRetryAttempts: 180,
+                      },
+                      pattern: {
+                        source: ['aws.something'],
+                      },
+                    },
+                  },
+                ],
+              },
+            },
+          },
+          command: 'package',
+        })
+      ).to.be.eventually.rejected.and.have.property(
+        'code',
+        'ERROR_INVALID_RETRY_POLICY_TO_EVENT_BUS_CUSTOM_RESOURCE'
+      );
+    });
+
+    it('should fail when trying to set DeadLetterQueueArn', async () => {
+      await expect(
+        runServerless({
+          fixture: 'function',
+          configExt: {
+            disabledDeprecations: ['AWS_EVENT_BRIDGE_CUSTOM_RESOURCE_LEGACY_OPT_IN'],
+            provider: {
+              eventBridge: {
+                useCloudFormation: false,
+              },
+            },
+            functions: {
+              basic: {
+                events: [
+                  {
+                    eventBridge: {
+                      deadLetterQueueArn: {
+                        'Fn::GetAtt': ['not-supported', 'Arn'],
+                      },
+                      pattern: {
+                        source: ['aws.something'],
+                      },
+                    },
+                  },
+                ],
+              },
+            },
+          },
+          command: 'package',
+        })
+      ).to.be.eventually.rejected.and.have.property(
+        'code',
+        'ERROR_INVALID_DEAD_LETTER_CONFIG_TO_EVENT_BUS_CUSTOM_RESOURCE'
+      );
+    });
+
     it('should fail when trying to reference event bus via CF intrinsic function', async () => {
       await expect(
         runServerless({
           fixture: 'function',
           configExt: {
+            disabledDeprecations: ['AWS_EVENT_BRIDGE_CUSTOM_RESOURCE_LEGACY_OPT_IN'],
+            provider: {
+              eventBridge: {
+                useCloudFormation: false,
+              },
+            },
             functions: {
-              foo: {
+              basic: {
                 events: [
                   {
                     eventBridge: {
@@ -268,8 +393,6 @@ describe('EventBridgeEvents', () => {
       let eventBusLogicalId;
       let ruleResource;
       let ruleTarget;
-      let inputPathRuleTarget;
-      let inputTransformerRuleTarget;
       const schedule = 'rate(10 minutes)';
       const eventBusName = 'nondefault';
       const pattern = {
@@ -288,18 +411,27 @@ describe('EventBridgeEvents', () => {
           eventTime: '$.time',
         },
       };
+      const retryPolicy = {
+        maximumEventAge: 7200,
+        maximumRetryAttempts: 9,
+      };
+
+      const deadLetterQueueArn = {
+        'Fn::GetAtt': ['test', 'Arn'],
+      };
+
+      const getRuleResourceEndingWith = (resources, ending) =>
+        Object.values(resources).find(
+          (resource) =>
+            resource.Type === 'AWS::Events::Rule' && resource.Properties.Name.endsWith(ending)
+        );
 
       before(async () => {
         const { cfTemplate, awsNaming } = await runServerless({
           fixture: 'function',
           configExt: {
-            provider: {
-              eventBridge: {
-                useCloudFormation: true,
-              },
-            },
             functions: {
-              foo: {
+              basic: {
                 events: [
                   {
                     eventBridge: {
@@ -325,6 +457,38 @@ describe('EventBridgeEvents', () => {
                       inputTransformer,
                     },
                   },
+                  {
+                    eventBridge: {
+                      eventBus: eventBusName,
+                      schedule,
+                      enabled: false,
+                      pattern,
+                    },
+                  },
+                  {
+                    eventBridge: {
+                      eventBus: eventBusName,
+                      schedule,
+                      enabled: true,
+                      pattern,
+                    },
+                  },
+                  {
+                    eventBridge: {
+                      eventBus: eventBusName,
+                      schedule,
+                      pattern,
+                      retryPolicy,
+                    },
+                  },
+                  {
+                    eventBridge: {
+                      eventBus: eventBusName,
+                      schedule,
+                      pattern,
+                      deadLetterQueueArn,
+                    },
+                  },
                 ],
               },
             },
@@ -334,21 +498,8 @@ describe('EventBridgeEvents', () => {
         cfResources = cfTemplate.Resources;
         naming = awsNaming;
         eventBusLogicalId = naming.getEventBridgeEventBusLogicalId(eventBusName);
-        ruleResource = Object.values(cfResources).find(
-          (resource) =>
-            resource.Type === 'AWS::Events::Rule' && resource.Properties.Name.endsWith('1')
-        );
+        ruleResource = getRuleResourceEndingWith(cfResources, '1');
         ruleTarget = ruleResource.Properties.Targets[0];
-        const inputPathRuleResource = Object.values(cfResources).find(
-          (resource) =>
-            resource.Type === 'AWS::Events::Rule' && resource.Properties.Name.endsWith('2')
-        );
-        inputPathRuleTarget = inputPathRuleResource.Properties.Targets[0];
-        const inputTransformerRuleResource = Object.values(cfResources).find(
-          (resource) =>
-            resource.Type === 'AWS::Events::Rule' && resource.Properties.Name.endsWith('3')
-        );
-        inputTransformerRuleTarget = inputTransformerRuleResource.Properties.Targets[0];
       });
 
       it('should create an EventBus resource', () => {
@@ -359,8 +510,22 @@ describe('EventBridgeEvents', () => {
         expect(ruleResource.Properties.ScheduleExpression).to.equal('rate(10 minutes)');
       });
 
+      it('should correctly set State by default on a created rule', () => {
+        expect(ruleResource.Properties.State).to.equal('ENABLED');
+      });
+
+      it('should correctly set State when disabled on a created rule', () => {
+        const disabledRuleResource = getRuleResourceEndingWith(cfResources, '4');
+        expect(disabledRuleResource.Properties.State).to.equal('DISABLED');
+      });
+
+      it('should correctly set State when enabled on a created rule', () => {
+        const enabledRuleResource = getRuleResourceEndingWith(cfResources, '5');
+        expect(enabledRuleResource.Properties.State).to.equal('ENABLED');
+      });
+
       it('should correctly set EventPattern on a created rule', () => {
-        expect(ruleResource.Properties.EventPattern).to.deep.equal(JSON.stringify(pattern));
+        expect(ruleResource.Properties.EventPattern).to.deep.equal(pattern);
       });
 
       it('should correctly set Input on the target for the created rule', () => {
@@ -368,10 +533,14 @@ describe('EventBridgeEvents', () => {
       });
 
       it('should correctly set InputPath on the target for the created rule', () => {
+        const inputPathRuleResource = getRuleResourceEndingWith(cfResources, '2');
+        const inputPathRuleTarget = inputPathRuleResource.Properties.Targets[0];
         expect(inputPathRuleTarget.InputPath).to.deep.equal(inputPath);
       });
 
       it('should correctly set InputTransformer on the target for the created rule', () => {
+        const inputTransformerRuleResource = getRuleResourceEndingWith(cfResources, '3');
+        const inputTransformerRuleTarget = inputTransformerRuleResource.Properties.Targets[0];
         expect(inputTransformerRuleTarget.InputTransformer.InputPathsMap).to.deep.equal(
           inputTransformer.inputPathsMap
         );
@@ -380,17 +549,32 @@ describe('EventBridgeEvents', () => {
         );
       });
 
+      it('should support retryPolicy configuration', () => {
+        const retryPolicyRuleTarget = getRuleResourceEndingWith(cfResources, '6').Properties
+          .Targets[0];
+        expect(retryPolicyRuleTarget.RetryPolicy).to.deep.equal({
+          MaximumEventAgeInSeconds: 7200,
+          MaximumRetryAttempts: 9,
+        });
+      });
+
+      it('should support deadLetterQueueArn configuration', () => {
+        const deadLetterConfigRuleTarget = getRuleResourceEndingWith(cfResources, '7').Properties
+          .Targets[0];
+        expect(deadLetterConfigRuleTarget.DeadLetterConfig).to.have.property('Arn');
+      });
+
       it('should create a rule that depends on created EventBus', () => {
         expect(ruleResource.DependsOn).to.equal(eventBusLogicalId);
       });
 
       it('should create a rule that references correct function in target', () => {
-        expect(ruleTarget.Arn['Fn::GetAtt'][0]).to.equal(naming.getLambdaLogicalId('foo'));
+        expect(ruleTarget.Arn['Fn::GetAtt'][0]).to.equal(naming.getLambdaLogicalId('basic'));
       });
 
       it('should create a lambda permission resource that correctly references event bus in SourceArn', () => {
         const lambdaPermissionResource =
-          cfResources[naming.getEventBridgeLambdaPermissionLogicalId('foo', 1)];
+          cfResources[naming.getEventBridgeLambdaPermissionLogicalId('basic', 1)];
 
         expect(
           lambdaPermissionResource.Properties.SourceArn['Fn::Join'][1][5]['Fn::Join'][1][1]
@@ -407,13 +591,8 @@ describe('EventBridgeEvents', () => {
           fixture: 'function',
           command: 'package',
           configExt: {
-            provider: {
-              eventBridge: {
-                useCloudFormation: true,
-              },
-            },
             functions: {
-              foo: {
+              basic: {
                 events: [
                   {
                     eventBridge: {
@@ -454,7 +633,7 @@ describe('EventBridgeEvents', () => {
 
       it('should create a lambda permission resource that correctly references arn event bus in SourceArn', () => {
         const lambdaPermissionResource =
-          cfResources[naming.getEventBridgeLambdaPermissionLogicalId('foo', 1)];
+          cfResources[naming.getEventBridgeLambdaPermissionLogicalId('basic', 1)];
 
         expect(
           lambdaPermissionResource.Properties.SourceArn['Fn::Join'][1][5]['Fn::Join'][1][1]
@@ -463,7 +642,7 @@ describe('EventBridgeEvents', () => {
 
       it('should create a lambda permission resource that correctly references CF event bus in SourceArn', () => {
         const lambdaPermissionResource =
-          cfResources[naming.getEventBridgeLambdaPermissionLogicalId('foo', 2)];
+          cfResources[naming.getEventBridgeLambdaPermissionLogicalId('basic', 2)];
 
         expect(
           lambdaPermissionResource.Properties.SourceArn['Fn::Join'][1][5]['Fn::Join'][1][1]
@@ -472,7 +651,7 @@ describe('EventBridgeEvents', () => {
 
       it('should create a lambda permission resource that correctly references explicit default event bus in SourceArn', () => {
         const lambdaPermissionResource =
-          cfResources[naming.getEventBridgeLambdaPermissionLogicalId('foo', 3)];
+          cfResources[naming.getEventBridgeLambdaPermissionLogicalId('basic', 3)];
 
         expect(
           lambdaPermissionResource.Properties.SourceArn['Fn::Join'][1][5]['Fn::Join'][1][1]
@@ -481,7 +660,7 @@ describe('EventBridgeEvents', () => {
 
       it('should create a lambda permission resource that correctly references implicit default event bus in SourceArn', () => {
         const lambdaPermissionResource =
-          cfResources[naming.getEventBridgeLambdaPermissionLogicalId('foo', 4)];
+          cfResources[naming.getEventBridgeLambdaPermissionLogicalId('basic', 4)];
 
         expect(
           lambdaPermissionResource.Properties.SourceArn['Fn::Join'][1][5]['Fn::Join'][1]
@@ -489,4 +668,23 @@ describe('EventBridgeEvents', () => {
       });
     });
   });
+
+  it('should trigger deprecation when `useCloudFormation` is set without any `eventBridge` events', async () => {
+    await expect(
+      runServerless({
+        fixture: 'function',
+        command: 'package',
+        configExt: {
+          provider: {
+            eventBridge: {
+              useCloudFormation: true,
+            },
+          },
+        },
+      })
+    ).to.be.eventually.rejected.and.have.property(
+      'code',
+      'REJECTED_DEPRECATION_AWS_EVENT_BRIDGE_CUSTOM_RESOURCE_LEGACY_OPT_IN'
+    );
+  });
 });
diff --git a/test/unit/lib/plugins/aws/package/compile/events/httpApi.test.js b/test/unit/lib/plugins/aws/package/compile/events/http-api.test.js
similarity index 85%
rename from test/unit/lib/plugins/aws/package/compile/events/httpApi.test.js
rename to test/unit/lib/plugins/aws/package/compile/events/http-api.test.js
index b5e075045ed..7216143ebde 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/httpApi.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/http-api.test.js
@@ -27,7 +27,7 @@ describe('lib/plugins/aws/package/compile/events/httpApi.test.js', () => {
 
     before(() =>
       runServerless({
-        fixture: 'httpApi',
+        fixture: 'http-api',
         command: 'package',
         configExt: {
           functions: {
@@ -36,6 +36,25 @@ describe('lib/plugins/aws/package/compile/events/httpApi.test.js', () => {
               handler: 'index.handler',
               events: [{ httpApi: { method: '*', path: '/method-catch-all' } }],
             },
+            payload: {
+              handler: 'index.handler',
+              httpApi: { payload: '1.0' },
+              events: [{ httpApi: { method: 'options', path: '/payload' } }],
+            },
+            payloadCatchAll: {
+              handler: 'index.handler',
+              events: [{ httpApi: 'ANY /payload' }],
+            },
+            customTimeout: {
+              handler: 'index.handler',
+              events: [{ httpApi: 'ANY /custom-timeout' }],
+              timeout: 29,
+            },
+            maxTimeout: {
+              handler: 'index.handler',
+              events: [{ httpApi: 'ANY /max-timeout' }],
+              timeout: 30,
+            },
           },
         },
       }).then(({ awsNaming, cfTemplate }) => {
@@ -96,11 +115,35 @@ describe('lib/plugins/aws/package/compile/events/httpApi.test.js', () => {
       expect(resource.Properties.RouteKey).to.equal(routeKey);
     });
 
-    it('should ensure higher timeout than function', () => {
+    it('should configure endpoint with specific method and path', () => {
+      const routeKey = 'OPTIONS /payload';
+      const resource = cfResources[naming.getHttpApiRouteLogicalId(routeKey)];
+      expect(resource.Type).to.equal('AWS::ApiGatewayV2::Route');
+      expect(resource.Properties.RouteKey).to.equal(routeKey);
+    });
+
+    it('should configure method catch all endpoint with same path as a specific method endpoint', () => {
+      const routeKey = 'ANY /payload';
+      const resource = cfResources[naming.getHttpApiRouteLogicalId(routeKey)];
+      expect(resource.Type).to.equal('AWS::ApiGatewayV2::Route');
+      expect(resource.Properties.RouteKey).to.equal(routeKey);
+    });
+
+    it('should ensure higher timeout than function default value', () => {
       const resource = cfResources[naming.getHttpApiIntegrationLogicalId('foo')];
       expect(resource.Properties.TimeoutInMillis).to.equal(6500);
     });
 
+    it('should provide 0.5s time margin to custom function integration timeout', () => {
+      const resource = cfResources[naming.getHttpApiIntegrationLogicalId('customTimeout')];
+      expect(resource.Properties.TimeoutInMillis).to.equal(29500);
+    });
+
+    it('should limit function maximum integration timeout to 30s', () => {
+      const resource = cfResources[naming.getHttpApiIntegrationLogicalId('maxTimeout')];
+      expect(resource.Properties.TimeoutInMillis).to.equal(30000);
+    });
+
     it('should configure lambda permissions', () => {
       const resource = cfResources[naming.getLambdaHttpApiPermissionLogicalId('foo')];
       expect(resource.Type).to.equal('AWS::Lambda::Permission');
@@ -125,6 +168,11 @@ describe('lib/plugins/aws/package/compile/events/httpApi.test.js', () => {
       const apiResource = cfResources[naming.getHttpApiLogicalId()];
       expect(apiResource.Properties.DisableExecuteApiEndpoint).to.equal(undefined);
     });
+
+    it('should support payload format version per function', async () => {
+      const resource = cfResources[naming.getHttpApiIntegrationLogicalId('payload')];
+      expect(resource.Properties.PayloadFormatVersion).to.equal('1.0');
+    });
   });
 
   describe('Provider properties', () => {
@@ -137,7 +185,7 @@ describe('lib/plugins/aws/package/compile/events/httpApi.test.js', () => {
 
     before(() =>
       runServerless({
-        fixture: 'httpApi',
+        fixture: 'http-api',
         configExt: {
           provider: {
             httpApi: {
@@ -153,7 +201,6 @@ describe('lib/plugins/aws/package/compile/events/httpApi.test.js', () => {
                   audience: 'audiencexxx',
                 },
               },
-              useProviderTags: true,
             },
             logs: {
               httpApi: true,
@@ -206,6 +253,10 @@ describe('lib/plugins/aws/package/compile/events/httpApi.test.js', () => {
       const { Tags } = cfApi.Properties;
       expect(Tags).to.be.a('object');
       expect(Tags).to.deep.equal(expectedTags);
+
+      const { Tags: stageTags } = cfStage.Properties;
+      expect(stageTags).to.be.a('object');
+      expect(stageTags).to.deep.equal(expectedTags);
     });
 
     it('should set payload format version', () => {
@@ -256,7 +307,7 @@ describe('lib/plugins/aws/package/compile/events/httpApi.test.js', () => {
       describe('Object configuration #1', () => {
         before(() =>
           runServerless({
-            fixture: 'httpApi',
+            fixture: 'http-api',
             configExt: {
               provider: {
                 httpApi: {
@@ -296,7 +347,7 @@ describe('lib/plugins/aws/package/compile/events/httpApi.test.js', () => {
       describe('Object configuration #2', () => {
         before(() =>
           runServerless({
-            fixture: 'httpApi',
+            fixture: 'http-api',
             configExt: {
               provider: {
                 httpApi: {
@@ -329,7 +380,7 @@ describe('lib/plugins/aws/package/compile/events/httpApi.test.js', () => {
       describe('With a catch-all route', () => {
         before(() =>
           runServerless({
-            fixture: 'httpApiCatchAll',
+            fixture: 'http-api-catch-all',
             configExt: {
               provider: {
                 httpApi: {
@@ -357,7 +408,7 @@ describe('lib/plugins/aws/package/compile/events/httpApi.test.js', () => {
 
     before(async () => {
       const { awsNaming, cfTemplate } = await runServerless({
-        fixture: 'httpApi',
+        fixture: 'http-api',
         configExt: {
           provider: {
             httpApi: {
@@ -458,9 +509,8 @@ describe('lib/plugins/aws/package/compile/events/httpApi.test.js', () => {
     });
 
     it('should create permission resource when authorizer references function from service', () => {
-      const authorizerPermissionLogicalId = naming.getLambdaAuthorizerHttpApiPermissionLogicalId(
-        'someAuthorizer'
-      );
+      const authorizerPermissionLogicalId =
+        naming.getLambdaAuthorizerHttpApiPermissionLogicalId('someAuthorizer');
       expect(cfResources[authorizerPermissionLogicalId]).to.deep.equal({
         Type: 'AWS::Lambda::Permission',
         Properties: {
@@ -537,10 +587,86 @@ describe('lib/plugins/aws/package/compile/events/httpApi.test.js', () => {
       expect(cfResources[authorizerPermissionLogicalId]).to.be.undefined;
     });
 
+    it('should correctly set `DependsOn` property on permission resource for functions with provisioned concurrency', async () => {
+      const { awsNaming, cfTemplate } = await runServerless({
+        fixture: 'http-api',
+        configExt: {
+          provider: {
+            httpApi: {
+              authorizers: {
+                someAuthorizer: {
+                  type: 'request',
+                  identitySource: '$request.header.Authorization',
+                  functionName: 'other',
+                  resultTtlInSeconds: 300,
+                  enableSimpleResponses: true,
+                  payloadVersion: '2.0',
+                },
+              },
+            },
+          },
+          functions: {
+            other: {
+              provisionedConcurrency: 1,
+            },
+            foo: {
+              events: [
+                {
+                  httpApi: {
+                    authorizer: {
+                      name: 'someAuthorizer',
+                    },
+                  },
+                },
+              ],
+            },
+          },
+        },
+        command: 'package',
+      });
+      const authorizerPermissionLogicalId =
+        awsNaming.getLambdaAuthorizerHttpApiPermissionLogicalId('someAuthorizer');
+      expect(cfTemplate.Resources[authorizerPermissionLogicalId]).to.deep.equal({
+        Type: 'AWS::Lambda::Permission',
+        Properties: {
+          FunctionName: {
+            'Fn::Join': [
+              ':',
+              [
+                {
+                  'Fn::GetAtt': ['OtherLambdaFunction', 'Arn'],
+                },
+                'provisioned',
+              ],
+            ],
+          },
+          Action: 'lambda:InvokeFunction',
+          Principal: 'apigateway.amazonaws.com',
+          SourceArn: {
+            'Fn::Join': [
+              '',
+              [
+                'arn:',
+                { Ref: 'AWS::Partition' },
+                ':execute-api:',
+                { Ref: 'AWS::Region' },
+                ':',
+                { Ref: 'AWS::AccountId' },
+                ':',
+                { Ref: naming.getHttpApiLogicalId() },
+                '/*',
+              ],
+            ],
+          },
+        },
+        DependsOn: 'OtherProvConcLambdaAlias',
+      });
+    });
+
     it('should throw when request authorizer does not have "functionName" and "functionArn" defined', async () => {
       await expect(
         runServerless({
-          fixture: 'httpApi',
+          fixture: 'http-api',
           configExt: {
             provider: {
               httpApi: {
@@ -576,7 +702,7 @@ describe('lib/plugins/aws/package/compile/events/httpApi.test.js', () => {
     it('should throw when request authorizer have both "functionName" and "functionArn" defined', async () => {
       await expect(
         runServerless({
-          fixture: 'httpApi',
+          fixture: 'http-api',
           configExt: {
             provider: {
               httpApi: {
@@ -614,7 +740,7 @@ describe('lib/plugins/aws/package/compile/events/httpApi.test.js', () => {
     it('should throw when request authorizer have both references "functionName" not defined in service', async () => {
       await expect(
         runServerless({
-          fixture: 'httpApi',
+          fixture: 'http-api',
           configExt: {
             provider: {
               httpApi: {
@@ -651,7 +777,7 @@ describe('lib/plugins/aws/package/compile/events/httpApi.test.js', () => {
     it('should throw when request authorizer has caching enabled but does not have "identitySource" defined', async () => {
       await expect(
         runServerless({
-          fixture: 'httpApi',
+          fixture: 'http-api',
           configExt: {
             provider: {
               httpApi: {
@@ -689,7 +815,7 @@ describe('lib/plugins/aws/package/compile/events/httpApi.test.js', () => {
     it('should throw when authorizer with `request` type does not have name or id configured', async () => {
       await expect(
         runServerless({
-          fixture: 'httpApi',
+          fixture: 'http-api',
           configExt: {
             functions: {
               foo: {
@@ -719,7 +845,7 @@ describe('lib/plugins/aws/package/compile/events/httpApi.test.js', () => {
     let naming;
     before(() =>
       runServerless({
-        fixture: 'httpApi',
+        fixture: 'http-api',
         configExt: {
           provider: {
             httpApi: {
@@ -781,7 +907,7 @@ describe('lib/plugins/aws/package/compile/events/httpApi.test.js', () => {
     it('should throw when authorizer with `jwt` type does not have name or id configured', async () => {
       await expect(
         runServerless({
-          fixture: 'httpApi',
+          fixture: 'http-api',
           configExt: {
             functions: {
               foo: {
@@ -809,7 +935,7 @@ describe('lib/plugins/aws/package/compile/events/httpApi.test.js', () => {
   describe('Authorizers: AWS_IAM', () => {
     it('should setup correct properties on an endpoint', async () => {
       const { awsNaming, cfTemplate } = await runServerless({
-        fixture: 'httpApi',
+        fixture: 'http-api',
         configExt: {
           functions: {
             foo: {
@@ -836,7 +962,7 @@ describe('lib/plugins/aws/package/compile/events/httpApi.test.js', () => {
     it('should throw when authorizer with `aws_iam` type receives additional properties', async () => {
       await expect(
         runServerless({
-          fixture: 'httpApi',
+          fixture: 'http-api',
           configExt: {
             functions: {
               foo: {
@@ -869,7 +995,7 @@ describe('lib/plugins/aws/package/compile/events/httpApi.test.js', () => {
       let naming;
       before(async () => {
         const { awsNaming, cfTemplate } = await runServerless({
-          fixture: 'httpApi',
+          fixture: 'http-api',
           configExt: {
             provider: { httpApi: { id: apiId } },
             functions: {
@@ -926,7 +1052,7 @@ describe('lib/plugins/aws/package/compile/events/httpApi.test.js', () => {
       it('should not allow external authorizer without external httpApi', () => {
         return expect(
           runServerless({
-            fixture: 'httpApi',
+            fixture: 'http-api',
             configExt: {
               functions: {
                 foo: {
@@ -962,7 +1088,7 @@ describe('lib/plugins/aws/package/compile/events/httpApi.test.js', () => {
     describe('correct configuration', () => {
       before(() =>
         runServerless({
-          fixture: 'httpApi',
+          fixture: 'http-api',
           configExt: { provider: { httpApi: { id: apiId } } },
           command: 'package',
         }).then(({ awsNaming, cfTemplate }) => {
@@ -1004,7 +1130,7 @@ describe('lib/plugins/aws/package/compile/events/httpApi.test.js', () => {
       it('should not allow defined cors rules', () => {
         return expect(
           runServerless({
-            fixture: 'httpApi',
+            fixture: 'http-api',
             configExt: {
               provider: {
                 httpApi: {
@@ -1020,7 +1146,7 @@ describe('lib/plugins/aws/package/compile/events/httpApi.test.js', () => {
       it('should not allow defined authorizers', () => {
         return expect(
           runServerless({
-            fixture: 'httpApi',
+            fixture: 'http-api',
             configExt: {
               provider: {
                 httpApi: {
@@ -1045,7 +1171,7 @@ describe('lib/plugins/aws/package/compile/events/httpApi.test.js', () => {
       it('should not allow defined logs', () => {
         return expect(
           runServerless({
-            fixture: 'httpApi',
+            fixture: 'http-api',
             configExt: {
               provider: {
                 httpApi: {
@@ -1062,4 +1188,23 @@ describe('lib/plugins/aws/package/compile/events/httpApi.test.js', () => {
       });
     });
   });
+
+  it('should trigger a deprecation when `provider.httpApi.useProviderTags` is set', async () => {
+    await expect(
+      runServerless({
+        fixture: 'http-api',
+        configExt: {
+          provider: {
+            httpApi: {
+              useProviderTags: true,
+            },
+          },
+        },
+        command: 'package',
+      })
+    ).to.eventually.be.rejected.and.have.property(
+      'code',
+      'REJECTED_DEPRECATION_AWS_HTTP_API_USE_PROVIDER_TAGS_PROPERTY'
+    );
+  });
 });
diff --git a/test/unit/lib/plugins/aws/package/compile/events/iotFleetProvisioning/index.test.js b/test/unit/lib/plugins/aws/package/compile/events/iot-fleet-provisioning/index.test.js
similarity index 99%
rename from test/unit/lib/plugins/aws/package/compile/events/iotFleetProvisioning/index.test.js
rename to test/unit/lib/plugins/aws/package/compile/events/iot-fleet-provisioning/index.test.js
index f81d67876b0..a5e29337fc8 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/iotFleetProvisioning/index.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/iot-fleet-provisioning/index.test.js
@@ -2,7 +2,7 @@
 
 const chai = require('chai');
 const runServerless = require('../../../../../../../../utils/run-serverless');
-const templateBody = require('../../../../../../../../fixtures/programmatic/iotFleetProvisioning/template.json');
+const templateBody = require('../../../../../../../../fixtures/programmatic/iot-fleet-provisioning/template.json');
 
 chai.use(require('chai-as-promised'));
 
diff --git a/test/unit/lib/plugins/aws/package/compile/events/iot.test.js b/test/unit/lib/plugins/aws/package/compile/events/iot.test.js
index 6c71de0eeb0..1f65a8505b4 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/iot.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/iot.test.js
@@ -3,14 +3,14 @@
 const expect = require('chai').expect;
 const AwsProvider = require('../../../../../../../../lib/plugins/aws/provider');
 const AwsCompileIoTEvents = require('../../../../../../../../lib/plugins/aws/package/compile/events/iot');
-const Serverless = require('../../../../../../../../lib/Serverless');
+const Serverless = require('../../../../../../../../lib/serverless');
 
 describe('AwsCompileIoTEvents', () => {
   let serverless;
   let awsCompileIoTEvents;
 
   beforeEach(() => {
-    serverless = new Serverless();
+    serverless = new Serverless({ commands: [], options: {} });
     serverless.service.provider.compiledCloudFormationTemplate = { Resources: {} };
     serverless.setProvider('aws', new AwsProvider(serverless));
     awsCompileIoTEvents = new AwsCompileIoTEvents(serverless);
diff --git a/test/unit/lib/plugins/aws/package/compile/events/kafka.test.js b/test/unit/lib/plugins/aws/package/compile/events/kafka.test.js
index 16964878d7d..87b2019f8c7 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/kafka.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/kafka.test.js
@@ -3,17 +3,23 @@
 const chai = require('chai');
 const runServerless = require('../../../../../../../utils/run-serverless');
 
-const { expect } = chai;
-
 chai.use(require('chai-as-promised'));
 
+const { expect } = chai;
+
 describe('test/unit/lib/plugins/aws/package/compile/events/kafka.test.js', () => {
   const saslScram256AuthArn =
-    'arn:aws:secretsmanager:us-east-1:01234567890:secret:MyBrokerSecretName';
+    'arn:aws:secretsmanager:us-east-1:01234567890:secret:SaslScram256Auth';
+  const clientCertificateTlsAuthArn =
+    'arn:aws:secretsmanager:us-east-1:01234567890:secret:clientCertificateTlsAuth';
+  const serverRootCaCertificateArn =
+    'arn:aws:secretsmanager:us-east-1:01234567890:secret:ServerRootCaCertificate';
+
   const topic = 'TestingTopic';
   const enabled = false;
   const startingPosition = 'LATEST';
   const batchSize = 5000;
+  const maximumBatchingWindow = 20;
 
   describe('when there are kafka events defined', () => {
     let minimalEventSourceMappingResource;
@@ -26,7 +32,7 @@ describe('test/unit/lib/plugins/aws/package/compile/events/kafka.test.js', () =>
         fixture: 'function',
         configExt: {
           functions: {
-            foo: {
+            basic: {
               events: [
                 {
                   kafka: {
@@ -45,6 +51,7 @@ describe('test/unit/lib/plugins/aws/package/compile/events/kafka.test.js', () =>
                     bootstrapServers: ['abc.xyz:9092'],
                     accessConfigurations: { saslScram256Auth: saslScram256AuthArn },
                     batchSize,
+                    maximumBatchingWindow,
                     enabled,
                     startingPosition,
                   },
@@ -57,7 +64,7 @@ describe('test/unit/lib/plugins/aws/package/compile/events/kafka.test.js', () =>
       });
       naming = awsNaming;
       minimalEventSourceMappingResource =
-        cfTemplate.Resources[naming.getKafkaEventLogicalId('foo', 'TestingTopic')];
+        cfTemplate.Resources[naming.getKafkaEventLogicalId('basic', 'TestingTopic')];
       allParamsEventSourceMappingResource =
         cfTemplate.Resources[naming.getKafkaEventLogicalId('other', 'TestingTopic')];
       defaultIamRole = cfTemplate.Resources.IamRoleLambdaExecution;
@@ -79,7 +86,7 @@ describe('test/unit/lib/plugins/aws/package/compile/events/kafka.test.js', () =>
         StartingPosition: 'TRIM_HORIZON',
         Topics: [topic],
         FunctionName: {
-          'Fn::GetAtt': [naming.getLambdaLogicalId('foo'), 'Arn'],
+          'Fn::GetAtt': [naming.getLambdaLogicalId('basic'), 'Arn'],
         },
       });
     });
@@ -100,6 +107,7 @@ describe('test/unit/lib/plugins/aws/package/compile/events/kafka.test.js', () =>
     it('should correctly compile EventSourceMapping resource with all parameters', () => {
       expect(allParamsEventSourceMappingResource.Properties).to.deep.equal({
         BatchSize: batchSize,
+        MaximumBatchingWindowInSeconds: maximumBatchingWindow,
         Enabled: enabled,
         SelfManagedEventSource: {
           Endpoints: {
@@ -127,7 +135,7 @@ describe('test/unit/lib/plugins/aws/package/compile/events/kafka.test.js', () =>
         fixture: 'function',
         configExt: {
           functions: {
-            foo: {
+            basic: {
               events: [
                 {
                   kafka: eventConfig.event,
@@ -140,238 +148,380 @@ describe('test/unit/lib/plugins/aws/package/compile/events/kafka.test.js', () =>
       });
 
       const eventSourceMappingResource =
-        cfTemplate.Resources[awsNaming.getKafkaEventLogicalId('foo', 'TestingTopic')];
+        cfTemplate.Resources[awsNaming.getKafkaEventLogicalId('basic', 'TestingTopic')];
       expect(eventSourceMappingResource.Properties).to.deep.equal(eventConfig.resource(awsNaming));
     };
 
-    it('should correctly compile EventSourceMapping resource properties for VPC_SECURITY_GROUP', async () => {
-      const eventConfig = {
-        event: {
-          topic,
-          bootstrapServers: ['abc.xyz:9092'],
-          accessConfigurations: { vpcSecurityGroup: 'sg-abc4567890' },
-        },
-        resource: (awsNaming) => {
-          return {
-            SelfManagedEventSource: {
-              Endpoints: {
-                KafkaBootstrapServers: ['abc.xyz:9092'],
+    describe('accessConfigurations', () => {
+      it('should correctly compile EventSourceMapping resource properties for VPC_SECURITY_GROUP and VPC_SUBNET', async () => {
+        const vpcSecurityGroup = 'sg-abc4567890';
+        const vpcSubnet = 'subnet-abc4567890';
+
+        const eventConfig = {
+          event: {
+            topic,
+            bootstrapServers: ['abc.xyz:9092'],
+            accessConfigurations: { vpcSecurityGroup, vpcSubnet },
+          },
+          resource: (awsNaming) => {
+            return {
+              SelfManagedEventSource: {
+                Endpoints: {
+                  KafkaBootstrapServers: ['abc.xyz:9092'],
+                },
               },
-            },
-            SourceAccessConfigurations: [
-              {
-                Type: 'VPC_SECURITY_GROUP',
-                URI: 'security_group:sg-abc4567890',
+              SourceAccessConfigurations: [
+                {
+                  Type: 'VPC_SECURITY_GROUP',
+                  URI: `security_group:${vpcSecurityGroup}`,
+                },
+                {
+                  Type: 'VPC_SUBNET',
+                  URI: `subnet:${vpcSubnet}`,
+                },
+              ],
+              StartingPosition: 'TRIM_HORIZON',
+              Topics: [topic],
+              FunctionName: {
+                'Fn::GetAtt': [awsNaming.getLambdaLogicalId('basic'), 'Arn'],
               },
-            ],
-            StartingPosition: 'TRIM_HORIZON',
-            Topics: [topic],
-            FunctionName: {
-              'Fn::GetAtt': [awsNaming.getLambdaLogicalId('foo'), 'Arn'],
+            };
+          },
+        };
+        await runCompileEventSourceMappingTest(eventConfig);
+      });
+
+      it('should correctly compile EventSourceMapping resource properties for multiple VPC_SUBNETS', async () => {
+        const vpcSecurityGroup = 'sg-abc4567890';
+
+        const eventConfig = {
+          event: {
+            topic,
+            bootstrapServers: ['abc.xyz:9092'],
+            accessConfigurations: {
+              vpcSubnet: ['subnet-0011001100', 'subnet-0022002200'],
+              vpcSecurityGroup,
             },
-          };
-        },
-      };
-      await runCompileEventSourceMappingTest(eventConfig);
-    });
+          },
+          resource: (awsNaming) => {
+            return {
+              SelfManagedEventSource: {
+                Endpoints: {
+                  KafkaBootstrapServers: ['abc.xyz:9092'],
+                },
+              },
+              SourceAccessConfigurations: [
+                {
+                  Type: 'VPC_SUBNET',
+                  URI: 'subnet:subnet-0011001100',
+                },
+                {
+                  Type: 'VPC_SUBNET',
+                  URI: 'subnet:subnet-0022002200',
+                },
+                {
+                  Type: 'VPC_SECURITY_GROUP',
+                  URI: `security_group:${vpcSecurityGroup}`,
+                },
+              ],
+              StartingPosition: 'TRIM_HORIZON',
+              Topics: [topic],
+              FunctionName: {
+                'Fn::GetAtt': [awsNaming.getLambdaLogicalId('basic'), 'Arn'],
+              },
+            };
+          },
+        };
+        await runCompileEventSourceMappingTest(eventConfig);
+      });
 
-    it('should correctly compile EventSourceMapping resource properties for VPC_SUBNET', async () => {
-      const eventConfig = {
-        event: {
-          topic,
-          bootstrapServers: ['abc.xyz:9092'],
-          accessConfigurations: { vpcSubnet: 'subnet-abc4567890' },
-        },
-        resource: (awsNaming) => {
-          return {
-            SelfManagedEventSource: {
-              Endpoints: {
-                KafkaBootstrapServers: ['abc.xyz:9092'],
+      it('should fail to compile EventSourceMapping resource properties for VPC_SUBNET with no VPC_SECURITY GROUP', async () => {
+        await expect(
+          runServerless({
+            fixture: 'function',
+            configExt: {
+              functions: {
+                basic: {
+                  events: [
+                    {
+                      kafka: {
+                        topic,
+                        bootstrapServers: ['abc.xyz:9092'],
+                        accessConfigurations: { vpcSubnet: 'subnet-abc4567890' },
+                      },
+                    },
+                  ],
+                },
               },
             },
-            SourceAccessConfigurations: [
-              {
-                Type: 'VPC_SUBNET',
-                URI: 'subnet:subnet-abc4567890',
+            command: 'package',
+          })
+        ).to.be.rejected.and.eventually.contain({
+          code: 'FUNCTION_KAFKA_VPC_ACCESS_CONFIGURATION_INVALID',
+        });
+      });
+
+      it('should fail to compile EventSourceMapping resource properties for VPC_SECURITY GROUP with no VPC_SUBNET', async () => {
+        await expect(
+          runServerless({
+            fixture: 'function',
+            configExt: {
+              functions: {
+                basic: {
+                  events: [
+                    {
+                      kafka: {
+                        topic,
+                        bootstrapServers: ['abc.xyz:9092'],
+                        accessConfigurations: { vpcSecurityGroup: 'sg-abc4567890' },
+                      },
+                    },
+                  ],
+                },
               },
-            ],
-            StartingPosition: 'TRIM_HORIZON',
-            Topics: [topic],
-            FunctionName: {
-              'Fn::GetAtt': [awsNaming.getLambdaLogicalId('foo'), 'Arn'],
             },
-          };
-        },
-      };
-      await runCompileEventSourceMappingTest(eventConfig);
-    });
+            command: 'package',
+          })
+        ).to.be.rejected.and.eventually.contain({
+          code: 'FUNCTION_KAFKA_VPC_ACCESS_CONFIGURATION_INVALID',
+        });
+      });
 
-    it('should correctly compile EventSourceMapping resource properties for multiple VPC_SUBNETs', async () => {
-      const eventConfig = {
-        event: {
-          topic,
-          bootstrapServers: ['abc.xyz:9092'],
-          accessConfigurations: { vpcSubnet: ['subnet-0011001100', 'subnet-0022002200'] },
-        },
-        resource: (awsNaming) => {
-          return {
-            SelfManagedEventSource: {
-              Endpoints: {
-                KafkaBootstrapServers: ['abc.xyz:9092'],
-              },
+      it('should correctly compile EventSourceMapping resource properties for SASL_PLAIN_AUTH', async () => {
+        const eventConfig = {
+          event: {
+            topic,
+            bootstrapServers: ['abc.xyz:9092'],
+            accessConfigurations: {
+              saslPlainAuth:
+                'arn:aws:secretsmanager:us-east-1:01234567890:secret:SaslPlainSecretName',
             },
-            SourceAccessConfigurations: [
-              {
-                Type: 'VPC_SUBNET',
-                URI: 'subnet:subnet-0011001100',
+          },
+          resource: (awsNaming) => {
+            return {
+              SelfManagedEventSource: {
+                Endpoints: {
+                  KafkaBootstrapServers: ['abc.xyz:9092'],
+                },
               },
-              {
-                Type: 'VPC_SUBNET',
-                URI: 'subnet:subnet-0022002200',
+              SourceAccessConfigurations: [
+                {
+                  Type: 'BASIC_AUTH',
+                  URI: 'arn:aws:secretsmanager:us-east-1:01234567890:secret:SaslPlainSecretName',
+                },
+              ],
+              StartingPosition: 'TRIM_HORIZON',
+              Topics: [topic],
+              FunctionName: {
+                'Fn::GetAtt': [awsNaming.getLambdaLogicalId('basic'), 'Arn'],
               },
-            ],
-            StartingPosition: 'TRIM_HORIZON',
-            Topics: [topic],
-            FunctionName: {
-              'Fn::GetAtt': [awsNaming.getLambdaLogicalId('foo'), 'Arn'],
-            },
-          };
-        },
-      };
-      await runCompileEventSourceMappingTest(eventConfig);
-    });
+            };
+          },
+        };
+        await runCompileEventSourceMappingTest(eventConfig);
+      });
 
-    it('should correctly compile EventSourceMapping resource properties for SASL_SCRAM_256_AUTH', async () => {
-      const eventConfig = {
-        event: {
-          topic,
-          bootstrapServers: ['abc.xyz:9092'],
-          accessConfigurations: { saslScram256Auth: saslScram256AuthArn },
-        },
-        resource: (awsNaming) => {
-          return {
-            SelfManagedEventSource: {
-              Endpoints: {
-                KafkaBootstrapServers: ['abc.xyz:9092'],
+      it('should correctly compile EventSourceMapping resource properties for SASL_SCRAM_256_AUTH', async () => {
+        const eventConfig = {
+          event: {
+            topic,
+            bootstrapServers: ['abc.xyz:9092'],
+            accessConfigurations: { saslScram256Auth: saslScram256AuthArn },
+          },
+          resource: (awsNaming) => {
+            return {
+              SelfManagedEventSource: {
+                Endpoints: {
+                  KafkaBootstrapServers: ['abc.xyz:9092'],
+                },
               },
-            },
-            SourceAccessConfigurations: [
-              {
-                Type: 'SASL_SCRAM_256_AUTH',
-                URI: saslScram256AuthArn,
+              SourceAccessConfigurations: [
+                {
+                  Type: 'SASL_SCRAM_256_AUTH',
+                  URI: saslScram256AuthArn,
+                },
+              ],
+              StartingPosition: 'TRIM_HORIZON',
+              Topics: [topic],
+              FunctionName: {
+                'Fn::GetAtt': [awsNaming.getLambdaLogicalId('basic'), 'Arn'],
               },
-            ],
-            StartingPosition: 'TRIM_HORIZON',
-            Topics: [topic],
-            FunctionName: {
-              'Fn::GetAtt': [awsNaming.getLambdaLogicalId('foo'), 'Arn'],
-            },
-          };
-        },
-      };
-      await runCompileEventSourceMappingTest(eventConfig);
-    });
+            };
+          },
+        };
+        await runCompileEventSourceMappingTest(eventConfig);
+      });
 
-    it('should correctly compile EventSourceMapping resource properties for SASL_SCRAM_256_AUTH', async () => {
-      const eventConfig = {
-        event: {
-          topic,
-          bootstrapServers: ['abc.xyz:9092'],
-          accessConfigurations: {
-            saslScram256Auth:
-              'arn:aws:secretsmanager:us-east-1:01234567890:secret:SaslScram256SecretName',
+      it('should correctly compile EventSourceMapping resource properties for SASL_SCRAM_512_AUTH', async () => {
+        const eventConfig = {
+          event: {
+            topic,
+            bootstrapServers: ['abc.xyz:9092'],
+            accessConfigurations: {
+              saslScram512Auth:
+                'arn:aws:secretsmanager:us-east-1:01234567890:secret:SaslScram512SecretName',
+            },
           },
-        },
-        resource: (awsNaming) => {
-          return {
-            SelfManagedEventSource: {
-              Endpoints: {
-                KafkaBootstrapServers: ['abc.xyz:9092'],
+          resource: (awsNaming) => {
+            return {
+              SelfManagedEventSource: {
+                Endpoints: {
+                  KafkaBootstrapServers: ['abc.xyz:9092'],
+                },
               },
-            },
-            SourceAccessConfigurations: [
-              {
-                Type: 'SASL_SCRAM_256_AUTH',
-                URI: 'arn:aws:secretsmanager:us-east-1:01234567890:secret:SaslScram256SecretName',
+              SourceAccessConfigurations: [
+                {
+                  Type: 'SASL_SCRAM_512_AUTH',
+                  URI: 'arn:aws:secretsmanager:us-east-1:01234567890:secret:SaslScram512SecretName',
+                },
+              ],
+              StartingPosition: 'TRIM_HORIZON',
+              Topics: [topic],
+              FunctionName: {
+                'Fn::GetAtt': [awsNaming.getLambdaLogicalId('basic'), 'Arn'],
               },
-            ],
-            StartingPosition: 'TRIM_HORIZON',
-            Topics: [topic],
-            FunctionName: {
-              'Fn::GetAtt': [awsNaming.getLambdaLogicalId('foo'), 'Arn'],
-            },
-          };
-        },
-      };
-      await runCompileEventSourceMappingTest(eventConfig);
-    });
+            };
+          },
+        };
+        await runCompileEventSourceMappingTest(eventConfig);
+      });
 
-    it('should correctly compile EventSourceMapping resource properties for SASL_SCRAM_512_AUTH', async () => {
-      const eventConfig = {
-        event: {
-          topic,
-          bootstrapServers: ['abc.xyz:9092'],
-          accessConfigurations: {
-            saslScram512Auth:
-              'arn:aws:secretsmanager:us-east-1:01234567890:secret:SaslScram512SecretName',
+      it('should correctly compile EventSourceMapping resource properties for CLIENT_CERTIFICATE_TLS_AUTH', async () => {
+        const eventConfig = {
+          event: {
+            topic,
+            bootstrapServers: ['abc.xyz:9092'],
+            accessConfigurations: {
+              clientCertificateTlsAuth: clientCertificateTlsAuthArn,
+            },
           },
-        },
-        resource: (awsNaming) => {
-          return {
-            SelfManagedEventSource: {
-              Endpoints: {
-                KafkaBootstrapServers: ['abc.xyz:9092'],
+          resource: (awsNaming) => {
+            return {
+              SelfManagedEventSource: {
+                Endpoints: {
+                  KafkaBootstrapServers: ['abc.xyz:9092'],
+                },
               },
-            },
-            SourceAccessConfigurations: [
-              {
-                Type: 'SASL_SCRAM_512_AUTH',
-                URI: 'arn:aws:secretsmanager:us-east-1:01234567890:secret:SaslScram512SecretName',
+              SourceAccessConfigurations: [
+                {
+                  Type: 'CLIENT_CERTIFICATE_TLS_AUTH',
+                  URI: clientCertificateTlsAuthArn,
+                },
+              ],
+              StartingPosition: 'TRIM_HORIZON',
+              Topics: [topic],
+              FunctionName: {
+                'Fn::GetAtt': [awsNaming.getLambdaLogicalId('basic'), 'Arn'],
               },
-            ],
-            StartingPosition: 'TRIM_HORIZON',
-            Topics: [topic],
-            FunctionName: {
-              'Fn::GetAtt': [awsNaming.getLambdaLogicalId('foo'), 'Arn'],
-            },
-          };
-        },
-      };
-      await runCompileEventSourceMappingTest(eventConfig);
-    });
+            };
+          },
+        };
+        await runCompileEventSourceMappingTest(eventConfig);
+      });
 
-    it('should update default IAM role with EC2 statement', async () => {
-      const { cfTemplate } = await runServerless({
-        fixture: 'function',
-        configExt: {
-          functions: {
-            foo: {
-              events: [
+      it('should correctly compile EventSourceMapping resource properties for SERVER_ROOT_CA_CERTIFICATE', async () => {
+        const eventConfig = {
+          event: {
+            topic,
+            bootstrapServers: ['abc.xyz:9092'],
+            accessConfigurations: {
+              clientCertificateTlsAuth: clientCertificateTlsAuthArn,
+              serverRootCaCertificate: serverRootCaCertificateArn,
+            },
+          },
+          resource: (awsNaming) => {
+            return {
+              SelfManagedEventSource: {
+                Endpoints: {
+                  KafkaBootstrapServers: ['abc.xyz:9092'],
+                },
+              },
+              SourceAccessConfigurations: [
                 {
-                  kafka: {
-                    topic,
-                    bootstrapServers: ['abc.xyz:9092'],
-                    accessConfigurations: { vpcSecurityGroup: 'sg-abc4567890' },
-                  },
+                  Type: 'CLIENT_CERTIFICATE_TLS_AUTH',
+                  URI: clientCertificateTlsAuthArn,
+                },
+                {
+                  Type: 'SERVER_ROOT_CA_CERTIFICATE',
+                  URI: serverRootCaCertificateArn,
                 },
               ],
-            },
+              StartingPosition: 'TRIM_HORIZON',
+              Topics: [topic],
+              FunctionName: {
+                'Fn::GetAtt': [awsNaming.getLambdaLogicalId('basic'), 'Arn'],
+              },
+            };
           },
-        },
-        command: 'package',
+        };
+        await runCompileEventSourceMappingTest(eventConfig);
       });
-      const defaultIamRole = cfTemplate.Resources.IamRoleLambdaExecution;
-      expect(defaultIamRole.Properties.Policies[0].PolicyDocument.Statement).to.deep.include({
-        Effect: 'Allow',
-        Action: [
-          'ec2:CreateNetworkInterface',
-          'ec2:DescribeNetworkInterfaces',
-          'ec2:DescribeVpcs',
-          'ec2:DeleteNetworkInterface',
-          'ec2:DescribeSubnets',
-          'ec2:DescribeSecurityGroups',
-        ],
-        Resource: '*',
+
+      it('should fail to compile EventSourceMapping resource properties for SERVER_ROOT_CA_CERTIFICATE with no CLIENT_CERTIFICATE_TLS_AUTH', async () => {
+        await expect(
+          runServerless({
+            fixture: 'function',
+            configExt: {
+              functions: {
+                basic: {
+                  events: [
+                    {
+                      kafka: {
+                        topic,
+                        bootstrapServers: ['abc.xyz:9092'],
+                        accessConfigurations: {
+                          serverRootCaCertificate: serverRootCaCertificateArn,
+                        },
+                      },
+                    },
+                  ],
+                },
+              },
+            },
+            command: 'package',
+          })
+        ).to.be.rejected.and.eventually.have.property(
+          'code',
+          'FUNCTION_KAFKA_CLIENT_CERTIFICATE_TLS_AUTH_CONFIGURATION_MISSING'
+        );
+      });
+
+      it('should update default IAM role with EC2 statement when VPC accessConfiguration is provided', async () => {
+        const { cfTemplate } = await runServerless({
+          fixture: 'function',
+          configExt: {
+            functions: {
+              basic: {
+                events: [
+                  {
+                    kafka: {
+                      topic,
+                      bootstrapServers: ['abc.xyz:9092'],
+                      accessConfigurations: {
+                        vpcSecurityGroup: 'sg-abc4567890',
+                        vpcSubnet: 'subnet-abc4567890',
+                      },
+                    },
+                  },
+                ],
+              },
+            },
+          },
+          command: 'package',
+        });
+        const defaultIamRole = cfTemplate.Resources.IamRoleLambdaExecution;
+        expect(defaultIamRole.Properties.Policies[0].PolicyDocument.Statement).to.deep.include({
+          Effect: 'Allow',
+          Action: [
+            'ec2:CreateNetworkInterface',
+            'ec2:DescribeNetworkInterfaces',
+            'ec2:DescribeVpcs',
+            'ec2:DeleteNetworkInterface',
+            'ec2:DescribeSubnets',
+            'ec2:DescribeSecurityGroups',
+          ],
+          Resource: '*',
+        });
       });
     });
 
@@ -380,7 +530,7 @@ describe('test/unit/lib/plugins/aws/package/compile/events/kafka.test.js', () =>
         fixture: 'function',
         configExt: {
           functions: {
-            foo: {
+            basic: {
               role: { 'Fn::ImportValue': 'MyImportedRole' },
               events: [
                 {
@@ -398,7 +548,7 @@ describe('test/unit/lib/plugins/aws/package/compile/events/kafka.test.js', () =>
       });
 
       const eventSourceMappingResource =
-        cfTemplate.Resources[awsNaming.getKafkaEventLogicalId('foo', 'TestingTopic')];
+        cfTemplate.Resources[awsNaming.getKafkaEventLogicalId('basic', 'TestingTopic')];
       expect(eventSourceMappingResource.DependsOn).to.deep.equal([]);
     });
   });
diff --git a/test/unit/lib/plugins/aws/package/compile/events/lib/ensureApiGatewayCloudWatchRole.test.js b/test/unit/lib/plugins/aws/package/compile/events/lib/ensure-api-gateway-cloud-watch-role.test.js
similarity index 97%
rename from test/unit/lib/plugins/aws/package/compile/events/lib/ensureApiGatewayCloudWatchRole.test.js
rename to test/unit/lib/plugins/aws/package/compile/events/lib/ensure-api-gateway-cloud-watch-role.test.js
index cb8b4f3b383..0a57a4e3ca4 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/lib/ensureApiGatewayCloudWatchRole.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/lib/ensure-api-gateway-cloud-watch-role.test.js
@@ -18,9 +18,9 @@ describe('ensureApiGatewayCloudWatchRole', () => {
   beforeEach(() => {
     addCustomResourceToServiceStub = sinon.stub().resolves();
     ensureApiGatewayCloudWatchRole = proxyquire(
-      '../../../../../../../../../lib/plugins/aws/package/compile/events/lib/ensureApiGatewayCloudWatchRole',
+      '../../../../../../../../../lib/plugins/aws/package/compile/events/lib/ensure-api-gateway-cloud-watch-role',
       {
-        '../../../../customResources': {
+        '../../../../custom-resources': {
           addCustomResourceToService: addCustomResourceToServiceStub,
         },
       }
diff --git a/test/unit/lib/plugins/aws/package/compile/events/msk/getMskClusterNameToken.test.js b/test/unit/lib/plugins/aws/package/compile/events/msk/get-msk-cluster-name-token.test.js
similarity index 91%
rename from test/unit/lib/plugins/aws/package/compile/events/msk/getMskClusterNameToken.test.js
rename to test/unit/lib/plugins/aws/package/compile/events/msk/get-msk-cluster-name-token.test.js
index 92e7ec0bd10..af251f9aae4 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/msk/getMskClusterNameToken.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/msk/get-msk-cluster-name-token.test.js
@@ -1,7 +1,7 @@
 'use strict';
 
 const chai = require('chai');
-const getMskClusterNameToken = require('../../../../../../../../../lib/plugins/aws/package/compile/events/msk/getMskClusterNameToken');
+const getMskClusterNameToken = require('../../../../../../../../../lib/plugins/aws/package/compile/events/msk/get-msk-cluster-name-token');
 
 const { expect } = chai;
 
diff --git a/test/unit/lib/plugins/aws/package/compile/events/msk/index.test.js b/test/unit/lib/plugins/aws/package/compile/events/msk/index.test.js
index e95b9307466..0f560d04bd2 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/msk/index.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/msk/index.test.js
@@ -13,6 +13,7 @@ describe('AwsCompileMSKEvents', () => {
   const enabled = false;
   const startingPosition = 'LATEST';
   const batchSize = 5000;
+  const maximumBatchingWindow = 10;
 
   describe('when there are msk events defined', () => {
     let minimalEventSourceMappingResource;
@@ -25,7 +26,7 @@ describe('AwsCompileMSKEvents', () => {
         fixture: 'function',
         configExt: {
           functions: {
-            foo: {
+            basic: {
               events: [
                 {
                   msk: {
@@ -42,6 +43,7 @@ describe('AwsCompileMSKEvents', () => {
                     topic,
                     arn,
                     batchSize,
+                    maximumBatchingWindow,
                     enabled,
                     startingPosition,
                   },
@@ -54,7 +56,7 @@ describe('AwsCompileMSKEvents', () => {
       });
       naming = awsNaming;
       minimalEventSourceMappingResource =
-        cfTemplate.Resources[naming.getMSKEventLogicalId('foo', 'ClusterName', 'TestingTopic')];
+        cfTemplate.Resources[naming.getMSKEventLogicalId('basic', 'ClusterName', 'TestingTopic')];
       allParamsEventSourceMappingResource =
         cfTemplate.Resources[naming.getMSKEventLogicalId('other', 'ClusterName', 'TestingTopic')];
       defaultIamRole = cfTemplate.Resources.IamRoleLambdaExecution;
@@ -66,7 +68,7 @@ describe('AwsCompileMSKEvents', () => {
         StartingPosition: 'TRIM_HORIZON',
         Topics: [topic],
         FunctionName: {
-          'Fn::GetAtt': [naming.getLambdaLogicalId('foo'), 'Arn'],
+          'Fn::GetAtt': [naming.getLambdaLogicalId('basic'), 'Arn'],
         },
       });
     });
@@ -102,6 +104,7 @@ describe('AwsCompileMSKEvents', () => {
     it('should correctly complie EventSourceMapping resource with all parameters', () => {
       expect(allParamsEventSourceMappingResource.Properties).to.deep.equal({
         BatchSize: batchSize,
+        MaximumBatchingWindowInSeconds: maximumBatchingWindow,
         Enabled: enabled,
         EventSourceArn: arn,
         StartingPosition: startingPosition,
diff --git a/test/unit/lib/plugins/aws/package/compile/events/rabbitmq.test.js b/test/unit/lib/plugins/aws/package/compile/events/rabbitmq.test.js
new file mode 100644
index 00000000000..b650f8c77c9
--- /dev/null
+++ b/test/unit/lib/plugins/aws/package/compile/events/rabbitmq.test.js
@@ -0,0 +1,201 @@
+'use strict';
+
+const chai = require('chai');
+const runServerless = require('../../../../../../../utils/run-serverless');
+
+const { expect } = chai;
+
+chai.use(require('chai-as-promised'));
+
+describe('test/unit/lib/plugins/aws/package/compile/events/rabbitmq.test.js', () => {
+  const brokerArn = 'arn:aws:mq:us-east-1:0000:broker:ExampleMQBroker:b-xxx-xxx';
+  const basicAuthArn = 'arn:aws:secretsmanager:us-east-1:01234567890:secret:MyBrokerSecretName';
+  const queue = 'TestingQueue';
+  const enabled = false;
+  const batchSize = 5000;
+  const maximumBatchingWindow = 20;
+
+  describe('when there are rabbitmq events defined', () => {
+    let minimalEventSourceMappingResource;
+    let allParamsEventSourceMappingResource;
+    let defaultIamRole;
+    let naming;
+
+    before(async () => {
+      const { awsNaming, cfTemplate } = await runServerless({
+        fixture: 'function',
+        configExt: {
+          functions: {
+            basic: {
+              events: [
+                {
+                  rabbitmq: {
+                    queue,
+                    arn: brokerArn,
+                    basicAuthArn,
+                  },
+                },
+              ],
+            },
+            other: {
+              events: [
+                {
+                  rabbitmq: {
+                    queue,
+                    arn: brokerArn,
+                    basicAuthArn,
+                    batchSize,
+                    maximumBatchingWindow,
+                    enabled,
+                  },
+                },
+              ],
+            },
+          },
+        },
+        command: 'package',
+      });
+      naming = awsNaming;
+      minimalEventSourceMappingResource =
+        cfTemplate.Resources[naming.getRabbitMQEventLogicalId('basic', queue)];
+      allParamsEventSourceMappingResource =
+        cfTemplate.Resources[naming.getRabbitMQEventLogicalId('other', queue)];
+      defaultIamRole = cfTemplate.Resources.IamRoleLambdaExecution;
+    });
+
+    it('should correctly compile EventSourceMapping resource properties with minimal configuration', () => {
+      expect(minimalEventSourceMappingResource.Properties).to.deep.equal({
+        EventSourceArn: brokerArn,
+        SourceAccessConfigurations: [
+          {
+            Type: 'BASIC_AUTH',
+            URI: basicAuthArn,
+          },
+        ],
+        Queues: [queue],
+        FunctionName: {
+          'Fn::GetAtt': [naming.getLambdaLogicalId('basic'), 'Arn'],
+        },
+      });
+    });
+
+    it('should update default IAM role with DescribeBroker statement', () => {
+      expect(defaultIamRole.Properties.Policies[0].PolicyDocument.Statement).to.deep.include({
+        Effect: 'Allow',
+        Action: ['mq:DescribeBroker'],
+        Resource: [brokerArn],
+      });
+    });
+
+    it('should update default IAM role with SecretsManager statement', () => {
+      expect(defaultIamRole.Properties.Policies[0].PolicyDocument.Statement).to.deep.include({
+        Effect: 'Allow',
+        Action: ['secretsmanager:GetSecretValue'],
+        Resource: [basicAuthArn],
+      });
+    });
+
+    it('should correctly compile EventSourceMapping resource DependsOn ', () => {
+      expect(minimalEventSourceMappingResource.DependsOn).to.equal('IamRoleLambdaExecution');
+      expect(allParamsEventSourceMappingResource.DependsOn).to.equal('IamRoleLambdaExecution');
+    });
+
+    it('should correctly compile EventSourceMapping resource with all parameters', () => {
+      expect(allParamsEventSourceMappingResource.Properties).to.deep.equal({
+        EventSourceArn: brokerArn,
+        BatchSize: batchSize,
+        MaximumBatchingWindowInSeconds: maximumBatchingWindow,
+        Enabled: enabled,
+        SourceAccessConfigurations: [
+          {
+            Type: 'BASIC_AUTH',
+            URI: basicAuthArn,
+          },
+        ],
+        Queues: [queue],
+        FunctionName: {
+          'Fn::GetAtt': [naming.getLambdaLogicalId('other'), 'Arn'],
+        },
+      });
+    });
+
+    it('should update default IAM role with EC2 statement', async () => {
+      expect(defaultIamRole.Properties.Policies[0].PolicyDocument.Statement).to.deep.include({
+        Effect: 'Allow',
+        Action: [
+          'ec2:CreateNetworkInterface',
+          'ec2:DescribeNetworkInterfaces',
+          'ec2:DescribeVpcs',
+          'ec2:DeleteNetworkInterface',
+          'ec2:DescribeSubnets',
+          'ec2:DescribeSecurityGroups',
+        ],
+        Resource: '*',
+      });
+    });
+  });
+
+  describe('configuring rabbitmq events', () => {
+    it('should not add dependsOn for imported role', async () => {
+      const { awsNaming, cfTemplate } = await runServerless({
+        fixture: 'function',
+        configExt: {
+          functions: {
+            basic: {
+              role: { 'Fn::ImportValue': 'MyImportedRole' },
+              events: [
+                {
+                  rabbitmq: {
+                    queue,
+                    arn: brokerArn,
+                    basicAuthArn,
+                  },
+                },
+              ],
+            },
+          },
+        },
+        command: 'package',
+      });
+
+      const eventSourceMappingResource =
+        cfTemplate.Resources[awsNaming.getRabbitMQEventLogicalId('basic', queue)];
+      expect(eventSourceMappingResource.DependsOn).to.deep.equal([]);
+    });
+  });
+
+  describe('when no rabbitmq events are defined', () => {
+    it('should not modify the default IAM role', async () => {
+      const { cfTemplate } = await runServerless({
+        fixture: 'function',
+        command: 'package',
+      });
+
+      const defaultIamRole = cfTemplate.Resources.IamRoleLambdaExecution;
+      expect(defaultIamRole.Properties.Policies[0].PolicyDocument.Statement).not.to.deep.include({
+        Effect: 'Allow',
+        Action: ['mq:DescribeBroker'],
+        Resource: [brokerArn],
+      });
+
+      expect(defaultIamRole.Properties.Policies[0].PolicyDocument.Statement).not.to.deep.include({
+        Effect: 'Allow',
+        Action: ['secretsmanager:GetSecretValue'],
+        Resource: [basicAuthArn],
+      });
+
+      expect(defaultIamRole.Properties.Policies[0].PolicyDocument.Statement).not.to.deep.include({
+        Effect: 'Allow',
+        Action: [
+          'ec2:CreateNetworkInterface',
+          'ec2:DescribeNetworkInterfaces',
+          'ec2:DescribeVpcs',
+          'ec2:DeleteNetworkInterface',
+          'ec2:DescribeSubnets',
+          'ec2:DescribeSecurityGroups',
+        ],
+        Resource: '*',
+      });
+    });
+  });
+});
diff --git a/test/unit/lib/plugins/aws/package/compile/events/s3/index.test.js b/test/unit/lib/plugins/aws/package/compile/events/s3/index.test.js
index a032d87385b..fdbc4763b4a 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/s3/index.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/s3/index.test.js
@@ -6,7 +6,7 @@ const sinon = require('sinon');
 const chai = require('chai');
 const proxyquire = require('proxyquire').noCallThru();
 const AwsProvider = require('../../../../../../../../../lib/plugins/aws/provider');
-const Serverless = require('../../../../../../../../../lib/Serverless');
+const Serverless = require('../../../../../../../../../lib/serverless');
 const runServerless = require('../../../../../../../../utils/run-serverless');
 
 const { expect } = chai;
@@ -23,12 +23,12 @@ describe('AwsCompileS3Events', () => {
     const AwsCompileS3Events = proxyquire(
       '../../../../../../../../../lib/plugins/aws/package/compile/events/s3/index',
       {
-        '../../../../customResources': {
+        '../../../../custom-resources': {
           addCustomResourceToService: addCustomResourceToServiceStub,
         },
       }
     );
-    serverless = new Serverless();
+    serverless = new Serverless({ commands: [], options: {} });
     serverless.service.provider.compiledCloudFormationTemplate = { Resources: {} };
     serverless.setProvider('aws', new AwsProvider(serverless));
     awsCompileS3Events = new AwsCompileS3Events(serverless);
@@ -373,9 +373,8 @@ describe('AwsCompileS3Events', () => {
       };
 
       return expect(awsCompileS3Events.existingS3Buckets()).to.be.fulfilled.then(() => {
-        const {
-          Resources,
-        } = awsCompileS3Events.serverless.service.provider.compiledCloudFormationTemplate;
+        const { Resources } =
+          awsCompileS3Events.serverless.service.provider.compiledCloudFormationTemplate;
 
         expect(addCustomResourceToServiceStub).to.have.been.calledOnce;
         expect(addCustomResourceToServiceStub.args[0][1]).to.equal('s3');
@@ -458,9 +457,8 @@ describe('AwsCompileS3Events', () => {
       };
 
       return expect(awsCompileS3Events.existingS3Buckets()).to.be.fulfilled.then(() => {
-        const {
-          Resources,
-        } = awsCompileS3Events.serverless.service.provider.compiledCloudFormationTemplate;
+        const { Resources } =
+          awsCompileS3Events.serverless.service.provider.compiledCloudFormationTemplate;
 
         expect(addCustomResourceToServiceStub).to.have.been.calledOnce;
         expect(addCustomResourceToServiceStub.args[0][1]).to.equal('s3');
@@ -564,9 +562,8 @@ describe('AwsCompileS3Events', () => {
       };
 
       return expect(awsCompileS3Events.existingS3Buckets()).to.be.fulfilled.then(() => {
-        const {
-          Resources,
-        } = awsCompileS3Events.serverless.service.provider.compiledCloudFormationTemplate;
+        const { Resources } =
+          awsCompileS3Events.serverless.service.provider.compiledCloudFormationTemplate;
 
         expect(addCustomResourceToServiceStub).to.have.been.calledOnce;
         expect(addCustomResourceToServiceStub.args[0][1]).to.equal('s3');
@@ -745,9 +742,8 @@ describe('AwsCompileS3Events', () => {
       };
 
       return expect(awsCompileS3Events.existingS3Buckets()).to.be.fulfilled.then(() => {
-        const {
-          Resources,
-        } = awsCompileS3Events.serverless.service.provider.compiledCloudFormationTemplate;
+        const { Resources } =
+          awsCompileS3Events.serverless.service.provider.compiledCloudFormationTemplate;
 
         expect(Object.keys(Resources)).to.have.length(2);
         expect(Resources.FirstCustomS31).to.deep.equal({
@@ -834,17 +830,149 @@ describe('AwsCompileS3Events', () => {
 
       return expect(() => awsCompileS3Events.existingS3Buckets()).to.throw('Only one S3 Bucket');
     });
+  });
+});
+
+describe('test/unit/lib/plugins/aws/package/compile/events/s3/index.test.js', () => {
+  let cfResources;
+  let naming;
+  let serverlessInstance;
+
+  before(async () => {
+    const { cfTemplate, awsNaming, serverless } = await runServerless({
+      fixture: 'function',
+      configExt: {
+        functions: {
+          basic: {
+            events: [
+              {
+                s3: {
+                  bucket: 'foo',
+                  event: 's3:ObjectCreated:*',
+                  existing: true,
+                },
+              },
+            ],
+          },
+          other: {
+            events: [
+              {
+                s3: {
+                  bucket: { Ref: 'SomeBucket' },
+                  event: 's3:ObjectCreated:*',
+                  existing: true,
+                },
+              },
+            ],
+          },
+          withIf: {
+            handler: 'basic.handler',
+            events: [
+              {
+                s3: {
+                  bucket: {
+                    'Fn::If': [
+                      'isFirstBucketEmtpy',
+                      { Ref: 'FirstBucket' },
+                      { Ref: 'SecondBucket' },
+                    ],
+                  },
+                  event: 's3:ObjectCreated:*',
+                  existing: true,
+                },
+              },
+            ],
+          },
+        },
+      },
+      command: 'package',
+    });
+    cfResources = cfTemplate.Resources;
+    naming = awsNaming;
+    serverlessInstance = serverless;
+  });
+
+  it('should create lambda permissions policy with wild card', async () => {
+    const expectedResource = [
+      'arn',
+      {
+        Ref: 'AWS::Partition',
+      },
+      'lambda',
+      {
+        Ref: 'AWS::Region',
+      },
+      {
+        Ref: 'AWS::AccountId',
+      },
+      'function',
+      '*',
+    ];
+
+    const lambdaPermissionsPolicies =
+      cfResources.IamRoleCustomResourcesLambdaExecution.Properties.Policies[
+        '0'
+      ].PolicyDocument.Statement.filter((x) => x.Action[0].includes('AddPermission'));
+
+    expect(lambdaPermissionsPolicies).to.have.length(1);
+
+    const actualResource = lambdaPermissionsPolicies[0].Resource['Fn::Join'][1];
+
+    expect(actualResource).to.deep.equal(expectedResource);
+  });
+
+  it('should support `bucket` provided as CF function', () => {
+    expect(cfResources[naming.getCustomResourceS3ResourceLogicalId('other')]).to.deep.equal({
+      Type: 'Custom::S3',
+      Version: 1,
+      DependsOn: ['OtherLambdaFunction', 'CustomDashresourceDashexistingDashs3LambdaFunction'],
+      Properties: {
+        ServiceToken: {
+          'Fn::GetAtt': ['CustomDashresourceDashexistingDashs3LambdaFunction', 'Arn'],
+        },
+        FunctionName: `${serverlessInstance.service.service}-dev-other`,
+        BucketName: { Ref: 'SomeBucket' },
+        BucketConfigs: [{ Event: 's3:ObjectCreated:*', Rules: [] }],
+      },
+    });
+  });
+
+  it('should support `bucket` provided as CF If function', () => {
+    expect(cfResources[naming.getCustomResourceS3ResourceLogicalId('withIf')]).to.deep.equal({
+      Type: 'Custom::S3',
+      Version: 1,
+      DependsOn: ['WithIfLambdaFunction', 'CustomDashresourceDashexistingDashs3LambdaFunction'],
+      Properties: {
+        ServiceToken: {
+          'Fn::GetAtt': ['CustomDashresourceDashexistingDashs3LambdaFunction', 'Arn'],
+        },
+        FunctionName: `${serverlessInstance.service.service}-dev-withIf`,
+        BucketName: {
+          'Fn::If': ['isFirstBucketEmtpy', { Ref: 'FirstBucket' }, { Ref: 'SecondBucket' }],
+        },
+        BucketConfigs: [{ Event: 's3:ObjectCreated:*', Rules: [] }],
+      },
+    });
+  });
 
-    it('should create lambda permissions policy with wild card', async () => {
-      const { cfTemplate } = await runServerless({
+  it('should disallow referencing multiple buckets in context of single function with CF references', async () => {
+    await expect(
+      runServerless({
         fixture: 'function',
         configExt: {
           functions: {
-            foo: {
+            basic: {
               events: [
                 {
                   s3: {
-                    bucket: 'foo',
+                    bucket: { Ref: 'SomeBucket' },
+                    event: 's3:ObjectCreated:*',
+                    existing: true,
+                  },
+                },
+                {
+                  s3: {
+                    bucket: { Ref: 'AnotherBucket' },
                     event: 's3:ObjectCreated:*',
                     existing: true,
                   },
@@ -854,33 +982,30 @@ describe('AwsCompileS3Events', () => {
           },
         },
         command: 'package',
-      });
+      })
+    ).to.be.eventually.rejected.and.have.property('code', 'S3_MULTIPLE_BUCKETS_PER_FUNCTION');
+  });
 
-      const expectedResource = [
-        'arn',
-        {
-          Ref: 'AWS::Partition',
-        },
-        'lambda',
-        {
-          Ref: 'AWS::Region',
-        },
-        {
-          Ref: 'AWS::AccountId',
+  it('should throw when `bucket` is specified as CF function but without setting `existing: true`', async () => {
+    await expect(
+      runServerless({
+        fixture: 'function',
+        configExt: {
+          functions: {
+            basic: {
+              events: [
+                {
+                  s3: {
+                    bucket: { Ref: 'SomeBucket' },
+                    event: 's3:ObjectCreated:*',
+                  },
+                },
+              ],
+            },
+          },
         },
-        'function',
-        '*',
-      ];
-
-      const lambdaPermissionsPolicies = cfTemplate.Resources.IamRoleCustomResourcesLambdaExecution.Properties.Policies[
-        '0'
-      ].PolicyDocument.Statement.filter((x) => x.Action[0].includes('AddPermission'));
-
-      expect(lambdaPermissionsPolicies).to.have.length(1);
-
-      const actualResource = lambdaPermissionsPolicies[0].Resource['Fn::Join'][1];
-
-      expect(actualResource).to.deep.equal(expectedResource);
-    });
+        command: 'package',
+      })
+    ).to.be.eventually.rejected.and.have.property('code', 'S3_INVALID_NEW_BUCKET_FORMAT');
   });
 });
diff --git a/test/unit/lib/plugins/aws/package/compile/events/schedule.test.js b/test/unit/lib/plugins/aws/package/compile/events/schedule.test.js
index 7b9a9ab949f..a15fe1aab6b 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/schedule.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/schedule.test.js
@@ -1,295 +1,226 @@
 'use strict';
 
-const expect = require('chai').expect;
-const AwsProvider = require('../../../../../../../../lib/plugins/aws/provider');
-const AwsCompileScheduledEvents = require('../../../../../../../../lib/plugins/aws/package/compile/events/schedule');
-const Serverless = require('../../../../../../../../lib/Serverless');
-
-describe('AwsCompileScheduledEvents', () => {
-  let serverless;
-  let awsCompileScheduledEvents;
-
-  beforeEach(() => {
-    serverless = new Serverless();
-    serverless.service.provider.compiledCloudFormationTemplate = { Resources: {} };
-    serverless.setProvider('aws', new AwsProvider(serverless));
-    awsCompileScheduledEvents = new AwsCompileScheduledEvents(serverless);
-    awsCompileScheduledEvents.serverless.service.service = 'new-service';
-  });
-
-  describe('#constructor()', () => {
-    it('should set the provider variable to an instance of AwsProvider', () =>
-      expect(awsCompileScheduledEvents.provider).to.be.instanceof(AwsProvider));
-  });
-
-  describe('#compileScheduledEvents()', () => {
-    it('should create corresponding resources when schedule events are given', () => {
-      awsCompileScheduledEvents.serverless.service.functions = {
-        first: {
-          events: [
-            {
-              schedule: {
-                rate: 'rate(10 minutes)',
-                enabled: false,
-              },
-            },
-            {
-              schedule: {
-                rate: 'rate(10 minutes)',
-                enabled: true,
-              },
-            },
-            {
-              schedule: 'rate(10 minutes)',
-            },
-            {
-              schedule: 'cron(5,35 12 ? * 6l 2002-2005)',
-            },
-          ],
+const runServerless = require('../../../../../../../utils/run-serverless');
+const ServerlessError = require('../../../../../../../../lib/serverless-error');
+const { use: chaiUse, expect } = require('chai');
+const chaiAsPromised = require('chai-as-promised');
+
+chaiUse(chaiAsPromised);
+
+async function run(events) {
+  const params = {
+    fixture: 'function',
+    command: 'package',
+    configExt: {
+      functions: {
+        test: {
+          handler: 'index.handler',
+          events,
         },
-      };
-
-      awsCompileScheduledEvents.compileScheduledEvents();
-
-      expect(
-        awsCompileScheduledEvents.serverless.service.provider.compiledCloudFormationTemplate
-          .Resources.FirstEventsRuleSchedule1.Type
-      ).to.equal('AWS::Events::Rule');
-      expect(
-        awsCompileScheduledEvents.serverless.service.provider.compiledCloudFormationTemplate
-          .Resources.FirstEventsRuleSchedule2.Type
-      ).to.equal('AWS::Events::Rule');
-      expect(
-        awsCompileScheduledEvents.serverless.service.provider.compiledCloudFormationTemplate
-          .Resources.FirstEventsRuleSchedule3.Type
-      ).to.equal('AWS::Events::Rule');
-      expect(
-        awsCompileScheduledEvents.serverless.service.provider.compiledCloudFormationTemplate
-          .Resources.FirstLambdaPermissionEventsRuleSchedule1.Type
-      ).to.equal('AWS::Lambda::Permission');
-      expect(
-        awsCompileScheduledEvents.serverless.service.provider.compiledCloudFormationTemplate
-          .Resources.FirstLambdaPermissionEventsRuleSchedule2.Type
-      ).to.equal('AWS::Lambda::Permission');
-      expect(
-        awsCompileScheduledEvents.serverless.service.provider.compiledCloudFormationTemplate
-          .Resources.FirstLambdaPermissionEventsRuleSchedule3.Type
-      ).to.equal('AWS::Lambda::Permission');
-      expect(
-        awsCompileScheduledEvents.serverless.service.provider.compiledCloudFormationTemplate
-          .Resources.FirstLambdaPermissionEventsRuleSchedule4.Type
-      ).to.equal('AWS::Lambda::Permission');
-    });
-
-    it('should respect enabled variable, defaulting to true', () => {
-      awsCompileScheduledEvents.serverless.service.functions = {
-        first: {
-          events: [
-            {
-              schedule: {
-                rate: 'rate(10 minutes)',
-                enabled: false,
-              },
-            },
-            {
-              schedule: {
-                rate: 'rate(10 minutes)',
-                enabled: true,
-              },
-            },
-            {
-              schedule: {
-                rate: 'rate(10 minutes)',
-              },
-            },
-            {
-              schedule: 'rate(10 minutes)',
-            },
-          ],
+      },
+    },
+  };
+  const { awsNaming, cfTemplate } = await runServerless(params);
+  const cfResources = cfTemplate.Resources;
+
+  const scheduleCfResources = [];
+
+  for (const event of events) {
+    const schedule = event.schedule;
+    let scheduleEvents;
+
+    if (typeof schedule === 'string') {
+      scheduleEvents = [schedule];
+    } else {
+      scheduleEvents = Array.isArray(schedule.rate) ? schedule.rate : [schedule.rate];
+    }
+
+    for (let i = 0; i < scheduleEvents.length; i++) {
+      const index = scheduleCfResources.length + 1;
+
+      const scheduleLogicalId = awsNaming.getScheduleLogicalId('test', index);
+      const scheduleCfResource = cfResources[scheduleLogicalId];
+
+      scheduleCfResources.push(scheduleCfResource);
+    }
+  }
+
+  return scheduleCfResources;
+}
+
+describe('test/unit/lib/plugins/aws/package/compile/events/schedule.test.js', () => {
+  let scheduleCfResources;
+
+  before(async () => {
+    const events = [
+      {
+        schedule: {
+          rate: 'rate(10 minutes)',
+          enabled: false,
+          name: 'your-scheduled-event-name',
+          description: 'your scheduled event description',
         },
-      };
-
-      awsCompileScheduledEvents.compileScheduledEvents();
-
-      expect(
-        awsCompileScheduledEvents.serverless.service.provider.compiledCloudFormationTemplate
-          .Resources.FirstEventsRuleSchedule1.Properties.State
-      ).to.equal('DISABLED');
-      expect(
-        awsCompileScheduledEvents.serverless.service.provider.compiledCloudFormationTemplate
-          .Resources.FirstEventsRuleSchedule2.Properties.State
-      ).to.equal('ENABLED');
-      expect(
-        awsCompileScheduledEvents.serverless.service.provider.compiledCloudFormationTemplate
-          .Resources.FirstEventsRuleSchedule3.Properties.State
-      ).to.equal('ENABLED');
-      expect(
-        awsCompileScheduledEvents.serverless.service.provider.compiledCloudFormationTemplate
-          .Resources.FirstEventsRuleSchedule4.Properties.State
-      ).to.equal('ENABLED');
-    });
-
-    it('should respect name variable', () => {
-      awsCompileScheduledEvents.serverless.service.functions = {
-        first: {
-          events: [
-            {
-              schedule: {
-                rate: 'rate(10 minutes)',
-                enabled: false,
-                name: 'your-scheduled-event-name',
-              },
-            },
-          ],
+      },
+      {
+        schedule: {
+          rate: ['rate(1 hour)'],
+          name: 'your-scheduled-event-name-array',
+          inputPath: '$.stageVariables',
         },
-      };
-
-      awsCompileScheduledEvents.compileScheduledEvents();
-
-      expect(
-        awsCompileScheduledEvents.serverless.service.provider.compiledCloudFormationTemplate
-          .Resources.FirstEventsRuleSchedule1.Properties.Name
-      ).to.equal('your-scheduled-event-name');
-    });
-
-    it('should respect description variable', () => {
-      awsCompileScheduledEvents.serverless.service.functions = {
-        first: {
-          events: [
-            {
-              schedule: {
-                rate: 'rate(10 minutes)',
-                enabled: false,
-                description: 'your scheduled event description',
-              },
-            },
-          ],
+      },
+      {
+        schedule: {
+          rate: 'rate(10 minutes)',
+          enabled: true,
+          input: '{"key":"array"}',
         },
-      };
-
-      awsCompileScheduledEvents.compileScheduledEvents();
-
-      expect(
-        awsCompileScheduledEvents.serverless.service.provider.compiledCloudFormationTemplate
-          .Resources.FirstEventsRuleSchedule1.Properties.Description
-      ).to.equal('your scheduled event description');
-    });
-
-    it('should respect inputPath variable', () => {
-      awsCompileScheduledEvents.serverless.service.functions = {
-        first: {
-          events: [
-            {
-              schedule: {
-                rate: 'rate(10 minutes)',
-                enabled: false,
-                inputPath: '$.stageVariables',
-              },
-            },
-          ],
+      },
+      {
+        schedule: 'rate(10 minutes)',
+      },
+      {
+        schedule: 'cron(5,35 12 ? * 6l 2002-2005)',
+      },
+      {
+        schedule: {
+          rate: ['cron(0 0/4 ? * MON-FRI *)', 'rate(1 hour)'],
+          enabled: false,
+          description: 'your scheduled event description (array)',
+          input: {
+            key: 'array',
+          },
         },
-      };
-
-      awsCompileScheduledEvents.compileScheduledEvents();
-
-      expect(
-        awsCompileScheduledEvents.serverless.service.provider.compiledCloudFormationTemplate
-          .Resources.FirstEventsRuleSchedule1.Properties.Targets[0].InputPath
-      ).to.equal('$.stageVariables');
-    });
-
-    it('should respect input variable', () => {
-      awsCompileScheduledEvents.serverless.service.functions = {
-        first: {
-          events: [
-            {
-              schedule: {
-                rate: 'rate(10 minutes)',
-                enabled: false,
-                input: '{"key":"value"}',
-              },
+      },
+      {
+        schedule: {
+          rate: 'rate(1 hour)',
+          inputTransformer: {
+            inputPathsMap: {
+              eventTime: '$.time',
             },
-          ],
+            inputTemplate: '{"time": <eventTime>, "key": "value"}',
+          },
         },
-      };
+      },
+    ];
 
-      awsCompileScheduledEvents.compileScheduledEvents();
+    scheduleCfResources = await run(events);
+  });
 
-      expect(
-        awsCompileScheduledEvents.serverless.service.provider.compiledCloudFormationTemplate
-          .Resources.FirstEventsRuleSchedule1.Properties.Targets[0].Input
-      ).to.equal('{"key":"value"}');
-    });
+  it('should create the corresponding schedule resources when schedule events are given', () => {
+    for (const scheduleCfResource of scheduleCfResources) {
+      expect(scheduleCfResource.Type).to.equal('AWS::Events::Rule');
+    }
+  });
 
-    it('should respect input variable as an object', () => {
-      awsCompileScheduledEvents.serverless.service.functions = {
-        first: {
-          events: [
-            {
-              schedule: {
-                rate: 'rate(10 minutes)',
-                enabled: false,
-                input: {
-                  key: 'value',
-                },
-              },
-            },
-          ],
-        },
-      };
+  it('should respect the given rate expressions', () => {
+    expect(scheduleCfResources[0].Properties.ScheduleExpression).to.equal('rate(10 minutes)');
+    expect(scheduleCfResources[1].Properties.ScheduleExpression).to.equal('rate(1 hour)');
+    expect(scheduleCfResources[2].Properties.ScheduleExpression).to.equal('rate(10 minutes)');
+    expect(scheduleCfResources[3].Properties.ScheduleExpression).to.equal('rate(10 minutes)');
+    expect(scheduleCfResources[4].Properties.ScheduleExpression).to.equal(
+      'cron(5,35 12 ? * 6l 2002-2005)'
+    );
+    expect(scheduleCfResources[5].Properties.ScheduleExpression).to.equal(
+      'cron(0 0/4 ? * MON-FRI *)'
+    );
+    expect(scheduleCfResources[6].Properties.ScheduleExpression).to.equal('rate(1 hour)');
+    expect(scheduleCfResources[7].Properties.ScheduleExpression).to.equal('rate(1 hour)');
+  });
 
-      awsCompileScheduledEvents.compileScheduledEvents();
+  it('should respect the "enabled" variable, defaulting to true', () => {
+    expect(scheduleCfResources[0].Properties.State).to.equal('DISABLED');
+    expect(scheduleCfResources[1].Properties.State).to.equal('ENABLED');
+    expect(scheduleCfResources[2].Properties.State).to.equal('ENABLED');
+    expect(scheduleCfResources[3].Properties.State).to.equal('ENABLED');
+    expect(scheduleCfResources[4].Properties.State).to.equal('ENABLED');
+    expect(scheduleCfResources[5].Properties.State).to.equal('DISABLED');
+    expect(scheduleCfResources[6].Properties.State).to.equal('DISABLED');
+    expect(scheduleCfResources[7].Properties.State).to.equal('ENABLED');
+  });
 
-      expect(
-        awsCompileScheduledEvents.serverless.service.provider.compiledCloudFormationTemplate
-          .Resources.FirstEventsRuleSchedule1.Properties.Targets[0].Input
-      ).to.equal('{"key":"value"}');
-    });
+  it('should respect the "name" variable', () => {
+    expect(scheduleCfResources[0].Properties.Name).to.equal('your-scheduled-event-name');
+    expect(scheduleCfResources[1].Properties.Name).to.equal('your-scheduled-event-name-array');
+    expect(scheduleCfResources[2].Properties.Name).to.be.undefined;
+    expect(scheduleCfResources[3].Properties.Name).to.be.undefined;
+    expect(scheduleCfResources[4].Properties.Name).to.be.undefined;
+    expect(scheduleCfResources[5].Properties.Name).to.be.undefined;
+    expect(scheduleCfResources[6].Properties.Name).to.be.undefined;
+    expect(scheduleCfResources[7].Properties.Name).to.be.undefined;
+  });
 
-    it('should respect inputTransformer variable', () => {
-      awsCompileScheduledEvents.serverless.service.functions = {
-        first: {
-          events: [
-            {
-              schedule: {
-                rate: 'rate(10 minutes)',
-                enabled: false,
-                inputTransformer: {
-                  inputPathsMap: {
-                    eventTime: '$.time',
-                  },
-                  inputTemplate: '{"time": <eventTime>, "key1": "value1"}',
-                },
-              },
-            },
-          ],
+  it('should throw an error if a "name" variable is specified when defining more than one rate expression', async () => {
+    const events = [
+      {
+        schedule: {
+          rate: ['cron(0 0/4 ? * MON-FRI *)', 'rate(1 hour)'],
+          enabled: false,
+          name: 'your-scheduled-event-name',
         },
-      };
+      },
+    ];
 
-      awsCompileScheduledEvents.compileScheduledEvents();
+    await expect(run(events)).to.be.eventually.rejectedWith(
+      ServerlessError,
+      'You cannot specify a name when defining more than one rate expression'
+    );
+  });
 
-      expect(
-        awsCompileScheduledEvents.serverless.service.provider.compiledCloudFormationTemplate
-          .Resources.FirstEventsRuleSchedule1.Properties.Targets[0].InputTransformer
-      ).to.eql({
-        InputTemplate: '{"time": <eventTime>, "key1": "value1"}',
-        InputPathsMap: { eventTime: '$.time' },
-      });
-    });
+  it('should respect the "description" variable', () => {
+    expect(scheduleCfResources[0].Properties.Description).to.equal(
+      'your scheduled event description'
+    );
+    expect(scheduleCfResources[1].Properties.Description).to.be.undefined;
+    expect(scheduleCfResources[2].Properties.Description).to.be.undefined;
+    expect(scheduleCfResources[3].Properties.Description).to.be.undefined;
+    expect(scheduleCfResources[4].Properties.Description).to.be.undefined;
+    expect(scheduleCfResources[5].Properties.Description).to.equal(
+      'your scheduled event description (array)'
+    );
+    expect(scheduleCfResources[6].Properties.Description).to.equal(
+      'your scheduled event description (array)'
+    );
+    expect(scheduleCfResources[7].Properties.Description).to.be.undefined;
+  });
 
-    it('should not create corresponding resources when scheduled events are not given', () => {
-      awsCompileScheduledEvents.serverless.service.functions = {
-        first: {
-          events: [],
-        },
-      };
+  it('should respect the "inputPath" variable', () => {
+    expect(scheduleCfResources[0].Properties.Targets[0].InputPath).to.be.undefined;
+    expect(scheduleCfResources[1].Properties.Targets[0].InputPath).to.equal('$.stageVariables');
+    expect(scheduleCfResources[2].Properties.Targets[0].InputPath).to.be.undefined;
+    expect(scheduleCfResources[3].Properties.Targets[0].InputPath).to.be.undefined;
+    expect(scheduleCfResources[4].Properties.Targets[0].InputPath).to.be.undefined;
+    expect(scheduleCfResources[5].Properties.Targets[0].InputPath).to.be.undefined;
+    expect(scheduleCfResources[6].Properties.Targets[0].InputPath).to.be.undefined;
+    expect(scheduleCfResources[7].Properties.Targets[0].InputPath).to.be.undefined;
+  });
 
-      awsCompileScheduledEvents.compileScheduledEvents();
+  it('should respect the "input" variable', () => {
+    expect(scheduleCfResources[0].Properties.Targets[0].Input).to.be.undefined;
+    expect(scheduleCfResources[1].Properties.Targets[0].Input).to.be.undefined;
+    expect(scheduleCfResources[2].Properties.Targets[0].Input).to.equal('{"key":"array"}');
+    expect(scheduleCfResources[3].Properties.Targets[0].Input).to.be.undefined;
+    expect(scheduleCfResources[4].Properties.Targets[0].Input).to.be.undefined;
+    expect(scheduleCfResources[5].Properties.Targets[0].Input).to.equal('{"key":"array"}');
+    expect(scheduleCfResources[6].Properties.Targets[0].Input).to.equal('{"key":"array"}');
+    expect(scheduleCfResources[7].Properties.Targets[0].Input).to.be.undefined;
+  });
 
-      expect(
-        awsCompileScheduledEvents.serverless.service.provider.compiledCloudFormationTemplate
-          .Resources
-      ).to.deep.equal({});
+  it('should respect the "inputTransformer" variable', () => {
+    expect(scheduleCfResources[0].Properties.Targets[0].InputTransformer).to.be.undefined;
+    expect(scheduleCfResources[1].Properties.Targets[0].InputTransformer).to.be.undefined;
+    expect(scheduleCfResources[2].Properties.Targets[0].InputTransformer).to.be.undefined;
+    expect(scheduleCfResources[3].Properties.Targets[0].InputTransformer).to.be.undefined;
+    expect(scheduleCfResources[4].Properties.Targets[0].InputTransformer).to.be.undefined;
+    expect(scheduleCfResources[5].Properties.Targets[0].InputTransformer).to.be.undefined;
+    expect(scheduleCfResources[6].Properties.Targets[0].InputTransformer).to.be.undefined;
+    expect(scheduleCfResources[7].Properties.Targets[0].InputTransformer).to.deep.equal({
+      InputTemplate: '{"time": <eventTime>, "key": "value"}',
+      InputPathsMap: { eventTime: '$.time' },
     });
   });
+
+  it('should not create schedule resources when no scheduled event is given', async () => {
+    expect(await run([])).to.be.empty;
+  });
 });
diff --git a/test/unit/lib/plugins/aws/package/compile/events/sns.test.js b/test/unit/lib/plugins/aws/package/compile/events/sns.test.js
index ac5f7ff6820..3527d95df4d 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/sns.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/sns.test.js
@@ -3,14 +3,14 @@
 const expect = require('chai').expect;
 const AwsProvider = require('../../../../../../../../lib/plugins/aws/provider');
 const AwsCompileSNSEvents = require('../../../../../../../../lib/plugins/aws/package/compile/events/sns');
-const Serverless = require('../../../../../../../../lib/Serverless');
+const Serverless = require('../../../../../../../../lib/serverless');
 
 describe('AwsCompileSNSEvents', () => {
   let serverless;
   let awsCompileSNSEvents;
 
   beforeEach(() => {
-    serverless = new Serverless();
+    serverless = new Serverless({ commands: [], options: {} });
     const options = {
       region: 'some-region',
     };
diff --git a/test/unit/lib/plugins/aws/package/compile/events/sqs.test.js b/test/unit/lib/plugins/aws/package/compile/events/sqs.test.js
index 3124cc0302c..89b1030f5bc 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/sqs.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/sqs.test.js
@@ -1,455 +1,179 @@
 'use strict';
 
 const expect = require('chai').expect;
-const AwsProvider = require('../../../../../../../../lib/plugins/aws/provider');
-const AwsCompileSQSEvents = require('../../../../../../../../lib/plugins/aws/package/compile/events/sqs');
-const Serverless = require('../../../../../../../../lib/Serverless');
 const runServerless = require('../../../../../../../utils/run-serverless');
 
-describe('AwsCompileSQSEvents', () => {
-  let serverless;
-  let awsCompileSQSEvents;
+describe('test/unit/lib/plugins/aws/package/compile/events/sqs.test.js', () => {
+  describe('regular configuration', () => {
+    let directArnEventSourceMappingResource;
+    let basicEventSourceMappingResource;
+    let arnCfGetAttEventSourceMappingResource;
+    let arnCfImportEventSourceMappingResource;
+    let arnCfJoinEventSourceMappingResource;
+    let iamRoleLambdaExecution;
 
-  beforeEach(() => {
-    serverless = new Serverless();
-    serverless.service.provider.compiledCloudFormationTemplate = {
-      Resources: {
-        IamRoleLambdaExecution: {
-          Properties: {
-            Policies: [
-              {
-                PolicyDocument: {
-                  Statement: [],
+    before(async () => {
+      const { awsNaming, cfTemplate } = await runServerless({
+        fixture: 'function',
+        configExt: {
+          functions: {
+            basic: {
+              events: [
+                {
+                  sqs: {
+                    arn: 'arn:aws:sqs:region:account:some-queue-name',
+                    batchSize: 10,
+                    maximumBatchingWindow: 100,
+                    functionResponseType: 'ReportBatchItemFailures',
+                  },
                 },
-              },
-            ],
-          },
-        },
-      },
-    };
-    serverless.setProvider('aws', new AwsProvider(serverless));
-    awsCompileSQSEvents = new AwsCompileSQSEvents(serverless);
-    awsCompileSQSEvents.serverless.service.service = 'new-service';
-  });
-
-  describe('#constructor()', () => {
-    it('should set the provider variable to be an instance of AwsProvider', () =>
-      expect(awsCompileSQSEvents.provider).to.be.instanceof(AwsProvider));
-  });
-
-  describe('#compileSQSEvents()', () => {
-    it('should not throw error or merge role statements if default policy is not present', () => {
-      awsCompileSQSEvents.serverless.service.functions = {
-        first: {
-          events: [
-            {
-              sqs: 'arn:aws:sqs:region:account:queueName',
+              ],
             },
-          ],
-        },
-      };
-
-      // pretend that the default IamRoleLambdaExecution is not in place
-      awsCompileSQSEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources.IamRoleLambdaExecution = null;
-
-      expect(() => {
-        awsCompileSQSEvents.compileSQSEvents();
-      }).to.not.throw(Error);
-      expect(
-        awsCompileSQSEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources
-          .IamRoleLambdaExecution
-      ).to.equal(null);
-    });
-
-    it('should not throw error if custom IAM role is set in function', () => {
-      awsCompileSQSEvents.serverless.service.functions = {
-        first: {
-          role: 'arn:aws:iam::account:role/foo',
-          events: [
-            {
-              sqs: 'arn:aws:sqs:region:account:MyQueue',
+            directArn: {
+              handler: 'basic.handler',
+              events: [{ sqs: 'arn:aws:sqs:region:account:MyQueue' }],
             },
-          ],
-        },
-      };
-
-      // pretend that the default IamRoleLambdaExecution is not in place
-      awsCompileSQSEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources.IamRoleLambdaExecution = null;
-
-      expect(() => {
-        awsCompileSQSEvents.compileSQSEvents();
-      }).to.not.throw(Error);
-      expect(
-        awsCompileSQSEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources
-          .FirstEventSourceMappingSQSMyQueue.DependsOn
-      ).to.be.instanceof(Array);
-      expect(
-        awsCompileSQSEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources
-          .FirstEventSourceMappingSQSMyQueue.DependsOn.length
-      ).to.equal(0);
-      expect(
-        awsCompileSQSEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources
-          .IamRoleLambdaExecution
-      ).to.equal(null);
-    });
-
-    it('should not throw error if custom IAM role name reference is set in function', () => {
-      const roleLogicalId = 'RoleLogicalId';
-      awsCompileSQSEvents.serverless.service.functions = {
-        first: {
-          role: roleLogicalId,
-          events: [
-            {
-              sqs: 'arn:aws:sqs:region:account:MyQueue',
+            arnCfGetAtt: {
+              handler: 'basic.handler',
+              events: [{ sqs: { arn: { 'Fn::GetAtt': ['SomeQueue', 'Arn'] } } }],
             },
-          ],
+            arnCfImport: {
+              handler: 'basic.handler',
+              events: [{ sqs: { arn: { 'Fn::ImportValue': 'ForeignQueue' } } }],
+            },
+            arnCfJoin: {
+              handler: 'basic.handler',
+              events: [
+                {
+                  sqs: {
+                    arn: {
+                      'Fn::Join': [
+                        ':',
+                        [
+                          'arn',
+                          'aws',
+                          'sqs',
+                          {
+                            Ref: 'AWS::Region',
+                          },
+                          {
+                            Ref: 'AWS::AccountId',
+                          },
+                          'MyQueue',
+                        ],
+                      ],
+                    },
+                  },
+                },
+              ],
+            },
+          },
         },
-      };
+        command: 'package',
+      });
+      const directArnFunctionLogicalId = awsNaming.getQueueLogicalId('directArn', 'MyQueue');
+      directArnEventSourceMappingResource = cfTemplate.Resources[directArnFunctionLogicalId];
 
-      // pretend that the default IamRoleLambdaExecution is not in place
-      awsCompileSQSEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources.IamRoleLambdaExecution = null;
+      const basicFunctionLogicalId = awsNaming.getQueueLogicalId('basic', 'some-queue-name');
+      basicEventSourceMappingResource = cfTemplate.Resources[basicFunctionLogicalId];
 
-      expect(() => {
-        awsCompileSQSEvents.compileSQSEvents();
-      }).to.not.throw(Error);
-      expect(
-        awsCompileSQSEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources
-          .FirstEventSourceMappingSQSMyQueue.DependsOn
-      ).to.include(roleLogicalId);
-      expect(
-        awsCompileSQSEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources
-          .FirstEventSourceMappingSQSMyQueue.DependsOn
-      ).to.have.lengthOf(1);
-      expect(
-        awsCompileSQSEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources
-          .IamRoleLambdaExecution
-      ).to.equal(null);
-    });
+      const arnCfGetAttLogicalId = awsNaming.getQueueLogicalId('arnCfGetAtt', 'SomeQueue');
+      arnCfGetAttEventSourceMappingResource = cfTemplate.Resources[arnCfGetAttLogicalId];
 
-    it('should not throw error if custom IAM role reference is set in function', () => {
-      const roleLogicalId = 'RoleLogicalId';
-      awsCompileSQSEvents.serverless.service.functions = {
-        first: {
-          role: { 'Fn::GetAtt': [roleLogicalId, 'Arn'] },
-          events: [
-            {
-              sqs: 'arn:aws:sqs:region:account:MyQueue',
-            },
-          ],
-        },
-      };
+      const arnCfImportLogicalId = awsNaming.getQueueLogicalId('arnCfImport', 'ForeignQueue');
+      arnCfImportEventSourceMappingResource = cfTemplate.Resources[arnCfImportLogicalId];
 
-      // pretend that the default IamRoleLambdaExecution is not in place
-      awsCompileSQSEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources.IamRoleLambdaExecution = null;
+      const arnCfJoinLogicalId = awsNaming.getQueueLogicalId('arnCfJoin', 'MyQueue');
+      arnCfJoinEventSourceMappingResource = cfTemplate.Resources[arnCfJoinLogicalId];
 
-      expect(() => {
-        awsCompileSQSEvents.compileSQSEvents();
-      }).to.not.throw(Error);
-      expect(
-        awsCompileSQSEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources
-          .FirstEventSourceMappingSQSMyQueue.DependsOn
-      ).to.include(roleLogicalId);
-      expect(
-        awsCompileSQSEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources
-          .FirstEventSourceMappingSQSMyQueue.DependsOn
-      ).to.have.lengthOf(1);
-      expect(
-        awsCompileSQSEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources
-          .IamRoleLambdaExecution
-      ).to.equal(null);
+      iamRoleLambdaExecution = cfTemplate.Resources.IamRoleLambdaExecution;
     });
 
-    it('should not throw error if custom IAM role is set in provider', () => {
-      awsCompileSQSEvents.serverless.service.functions = {
-        first: {
-          events: [
-            {
-              sqs: 'arn:aws:sqs:region:account:MyQueue',
-            },
-          ],
-        },
-      };
-
-      // pretend that the default IamRoleLambdaExecution is not in place
-      awsCompileSQSEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources.IamRoleLambdaExecution = null;
+    it('should suport direct ARN string', () => {
+      const directSqsArn = 'arn:aws:sqs:region:account:MyQueue';
+      expect(directArnEventSourceMappingResource.Properties.EventSourceArn).to.equal(directSqsArn);
+    });
 
-      awsCompileSQSEvents.serverless.service.provider.role = 'arn:aws:iam::account:role/foo';
+    it('should support `arn` (string)', () => {
+      const basicSqsArn = 'arn:aws:sqs:region:account:some-queue-name';
+      expect(basicEventSourceMappingResource.Properties.EventSourceArn).to.equal(basicSqsArn);
+    });
 
-      expect(() => {
-        awsCompileSQSEvents.compileSQSEvents();
-      }).to.not.throw(Error);
+    it('should suport `arn` (CF Fn::GetAtt)', () => {
+      const getAttSqsArn = { 'Fn::GetAtt': ['SomeQueue', 'Arn'] };
       expect(
-        awsCompileSQSEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources
-          .FirstEventSourceMappingSQSMyQueue.DependsOn
-      ).to.be.instanceof(Array);
-      expect(
-        awsCompileSQSEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources
-          .FirstEventSourceMappingSQSMyQueue.DependsOn.length
-      ).to.equal(0);
-      expect(
-        awsCompileSQSEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources
-          .IamRoleLambdaExecution
-      ).to.equal(null);
+        arnCfGetAttEventSourceMappingResource.Properties.EventSourceArn['Fn::GetAtt']
+      ).to.deep.equal(getAttSqsArn['Fn::GetAtt']);
     });
 
-    it('should not throw error if IAM role is imported', () => {
-      awsCompileSQSEvents.serverless.service.functions = {
-        first: {
-          role: { 'Fn::ImportValue': 'ExportedRoleId' },
-          events: [
-            {
-              sqs: 'arn:aws:sqs:region:account:MyQueue',
-            },
-          ],
-        },
-      };
-
-      // pretend that the default IamRoleLambdaExecution is not in place
-      awsCompileSQSEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources.IamRoleLambdaExecution = null;
-
-      expect(() => {
-        awsCompileSQSEvents.compileSQSEvents();
-      }).to.not.throw(Error);
-      expect(
-        awsCompileSQSEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources
-          .FirstEventSourceMappingSQSMyQueue.DependsOn.length
-      ).to.equal(0);
+    it('should suport `arn` (CF Fn::ImportValue)', () => {
+      const cfImportArn = { 'Fn::ImportValue': 'ForeignQueue' };
       expect(
-        awsCompileSQSEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources
-          .IamRoleLambdaExecution
-      ).to.equal(null);
+        arnCfImportEventSourceMappingResource.Properties.EventSourceArn['Fn::ImportValue']
+      ).to.deep.equal(cfImportArn['Fn::ImportValue']);
     });
 
-    it('should not throw error if custom IAM role reference is set in provider', () => {
-      const roleLogicalId = 'RoleLogicalId';
-      awsCompileSQSEvents.serverless.service.functions = {
-        first: {
-          events: [
+    it('should suport `arn` (CF Fn::Join)', () => {
+      const cfJoinArn = {
+        'Fn::Join': [
+          ':',
+          [
+            'arn',
+            'aws',
+            'sqs',
             {
-              sqs: 'arn:aws:sqs:region:account:MyQueue',
+              Ref: 'AWS::Region',
             },
-          ],
-        },
-      };
-
-      // pretend that the default IamRoleLambdaExecution is not in place
-      awsCompileSQSEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources.IamRoleLambdaExecution = null;
-
-      awsCompileSQSEvents.serverless.service.provider.role = {
-        'Fn::GetAtt': [roleLogicalId, 'Arn'],
-      };
-
-      expect(() => {
-        awsCompileSQSEvents.compileSQSEvents();
-      }).to.not.throw(Error);
-      expect(
-        awsCompileSQSEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources
-          .FirstEventSourceMappingSQSMyQueue.DependsOn
-      ).to.include(roleLogicalId);
-      expect(
-        awsCompileSQSEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources
-          .FirstEventSourceMappingSQSMyQueue.DependsOn
-      ).to.have.lengthOf(1);
-      expect(
-        awsCompileSQSEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources
-          .IamRoleLambdaExecution
-      ).to.equal(null);
-    });
-
-    it('should not throw error if custom IAM role name reference is set in provider', () => {
-      const roleLogicalId = 'RoleLogicalId';
-      awsCompileSQSEvents.serverless.service.functions = {
-        first: {
-          events: [
             {
-              sqs: 'arn:aws:sqs:region:account:MyQueue',
+              Ref: 'AWS::AccountId',
             },
+            'MyQueue',
           ],
-        },
+        ],
       };
-
-      // pretend that the default IamRoleLambdaExecution is not in place
-      awsCompileSQSEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources.IamRoleLambdaExecution = null;
-
-      awsCompileSQSEvents.serverless.service.provider.role = roleLogicalId;
-
-      expect(() => {
-        awsCompileSQSEvents.compileSQSEvents();
-      }).to.not.throw(Error);
-      expect(
-        awsCompileSQSEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources
-          .FirstEventSourceMappingSQSMyQueue.DependsOn
-      ).to.include(roleLogicalId);
-      expect(
-        awsCompileSQSEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources
-          .FirstEventSourceMappingSQSMyQueue.DependsOn
-      ).to.have.lengthOf(1);
       expect(
-        awsCompileSQSEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources
-          .IamRoleLambdaExecution
-      ).to.equal(null);
+        arnCfJoinEventSourceMappingResource.Properties.EventSourceArn['Fn::Join']
+      ).to.deep.equal(cfJoinArn['Fn::Join']);
     });
 
-    describe('when a queue ARN is given', () => {
-      it('should create event source mappings when a queue ARN is given', () => {
-        awsCompileSQSEvents.serverless.service.functions = {
-          first: {
-            events: [
-              {
-                sqs: {
-                  arn: 'arn:aws:sqs:region:account:MyFirstQueue',
-                  batchSize: 1,
-                  enabled: false,
-                },
-              },
-              {
-                sqs: {
-                  arn: 'arn:aws:sqs:region:account:MySecondQueue',
-                },
-              },
-              {
-                sqs: 'arn:aws:sqs:region:account:MyThirdQueue',
-              },
-            ],
-          },
-        };
-
-        awsCompileSQSEvents.compileSQSEvents();
-
-        // event 1
-        expect(
-          awsCompileSQSEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources
-            .FirstEventSourceMappingSQSMyFirstQueue.Type
-        ).to.equal('AWS::Lambda::EventSourceMapping');
-        expect(
-          awsCompileSQSEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources
-            .FirstEventSourceMappingSQSMyFirstQueue.DependsOn
-        ).to.include('IamRoleLambdaExecution');
-        expect(
-          awsCompileSQSEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources
-            .FirstEventSourceMappingSQSMyFirstQueue.DependsOn
-        ).to.have.lengthOf(1);
-        expect(
-          awsCompileSQSEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources
-            .FirstEventSourceMappingSQSMyFirstQueue.Properties.EventSourceArn
-        ).to.equal(awsCompileSQSEvents.serverless.service.functions.first.events[0].sqs.arn);
-        expect(
-          awsCompileSQSEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources
-            .FirstEventSourceMappingSQSMyFirstQueue.Properties.BatchSize
-        ).to.equal(awsCompileSQSEvents.serverless.service.functions.first.events[0].sqs.batchSize);
-        expect(
-          awsCompileSQSEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources
-            .FirstEventSourceMappingSQSMyFirstQueue.Properties.Enabled
-        ).to.equal(false);
-
-        // event 2
-        expect(
-          awsCompileSQSEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources
-            .FirstEventSourceMappingSQSMySecondQueue.Type
-        ).to.equal('AWS::Lambda::EventSourceMapping');
-        expect(
-          awsCompileSQSEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources
-            .FirstEventSourceMappingSQSMySecondQueue.DependsOn
-        ).to.include('IamRoleLambdaExecution');
-        expect(
-          awsCompileSQSEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources
-            .FirstEventSourceMappingSQSMySecondQueue.DependsOn
-        ).to.have.lengthOf(1);
-        expect(
-          awsCompileSQSEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources
-            .FirstEventSourceMappingSQSMySecondQueue.Properties.EventSourceArn
-        ).to.equal(awsCompileSQSEvents.serverless.service.functions.first.events[1].sqs.arn);
-        expect(
-          awsCompileSQSEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources
-            .FirstEventSourceMappingSQSMySecondQueue.Properties.BatchSize
-        ).to.equal(10);
-
-        expect(
-          awsCompileSQSEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources
-            .FirstEventSourceMappingSQSMySecondQueue.Properties.Enabled
-        ).to.equal(true);
-
-        // event 3
-        expect(
-          awsCompileSQSEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources
-            .FirstEventSourceMappingSQSMyThirdQueue.Type
-        ).to.equal('AWS::Lambda::EventSourceMapping');
-        expect(
-          awsCompileSQSEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources
-            .FirstEventSourceMappingSQSMyThirdQueue.DependsOn
-        ).to.include('IamRoleLambdaExecution');
-        expect(
-          awsCompileSQSEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources
-            .FirstEventSourceMappingSQSMyThirdQueue.DependsOn
-        ).to.have.lengthOf(1);
-        expect(
-          awsCompileSQSEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources
-            .FirstEventSourceMappingSQSMyThirdQueue.Properties.EventSourceArn
-        ).to.equal(awsCompileSQSEvents.serverless.service.functions.first.events[2].sqs);
-        expect(
-          awsCompileSQSEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources
-            .FirstEventSourceMappingSQSMyThirdQueue.Properties.BatchSize
-        ).to.equal(10);
-        expect(
-          awsCompileSQSEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources
-            .FirstEventSourceMappingSQSMyThirdQueue.Properties.Enabled
-        ).to.equal(true);
-      });
-
-      it('should allow specifying SQS Queues as CFN reference types', () => {
-        awsCompileSQSEvents.serverless.service.functions = {
-          first: {
-            events: [
-              {
-                sqs: {
-                  arn: { 'Fn::GetAtt': ['SomeQueue', 'Arn'] },
-                },
-              },
-              {
-                sqs: {
-                  arn: { 'Fn::ImportValue': 'ForeignQueue' },
-                },
-              },
-              {
-                sqs: {
-                  arn: {
-                    'Fn::Join': [
-                      ':',
-                      [
-                        'arn',
-                        'aws',
-                        'sqs',
-                        {
-                          Ref: 'AWS::Region',
-                        },
-                        {
-                          Ref: 'AWS::AccountId',
-                        },
-                        'MyQueue',
-                      ],
-                    ],
-                  },
-                },
-              },
-            ],
-          },
-        };
+    it('should suport `batchSize`', () => {
+      const requestedBatchSize = 10;
+      expect(basicEventSourceMappingResource.Properties.BatchSize).to.equal(requestedBatchSize);
+    });
 
-        awsCompileSQSEvents.compileSQSEvents();
+    it('should suport `functionResponseType`', () => {
+      const requestedFunctionResponseType = 'ReportBatchItemFailures';
+      expect(basicEventSourceMappingResource.Properties.FunctionResponseTypes).to.include.members([
+        requestedFunctionResponseType,
+      ]);
+    });
 
-        expect(
-          awsCompileSQSEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources
-            .IamRoleLambdaExecution.Properties.Policies[0].PolicyDocument.Statement[0]
-        ).to.deep.equal({
+    it('should ensure necessary IAM statememnts', () => {
+      const iamRoleStatments = [
+        {
+          Effect: 'Allow',
+          Action: ['sqs:ReceiveMessage', 'sqs:DeleteMessage', 'sqs:GetQueueAttributes'],
+          Resource: ['arn:aws:sqs:region:account:some-queue-name'],
+        },
+        {
+          Effect: 'Allow',
+          Action: ['sqs:ReceiveMessage', 'sqs:DeleteMessage', 'sqs:GetQueueAttributes'],
+          Resource: ['arn:aws:sqs:region:account:MyQueue'],
+        },
+        {
+          Effect: 'Allow',
           Action: ['sqs:ReceiveMessage', 'sqs:DeleteMessage', 'sqs:GetQueueAttributes'],
+          Resource: [{ 'Fn::GetAtt': ['SomeQueue', 'Arn'] }],
+        },
+        {
+          Effect: 'Allow',
+          Action: ['sqs:ReceiveMessage', 'sqs:DeleteMessage', 'sqs:GetQueueAttributes'],
+          Resource: [{ 'Fn::ImportValue': 'ForeignQueue' }],
+        },
+        {
           Effect: 'Allow',
+          Action: ['sqs:ReceiveMessage', 'sqs:DeleteMessage', 'sqs:GetQueueAttributes'],
           Resource: [
-            {
-              'Fn::GetAtt': ['SomeQueue', 'Arn'],
-            },
-            {
-              'Fn::ImportValue': 'ForeignQueue',
-            },
             {
               'Fn::Join': [
                 ':',
@@ -468,124 +192,14 @@ describe('AwsCompileSQSEvents', () => {
               ],
             },
           ],
-        });
-        expect(
-          awsCompileSQSEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources
-            .FirstEventSourceMappingSQSSomeQueue.Properties.EventSourceArn
-        ).to.deep.equal({ 'Fn::GetAtt': ['SomeQueue', 'Arn'] });
-        expect(
-          awsCompileSQSEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources
-            .FirstEventSourceMappingSQSForeignQueue.Properties.EventSourceArn
-        ).to.deep.equal({ 'Fn::ImportValue': 'ForeignQueue' });
-        expect(
-          awsCompileSQSEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources
-            .FirstEventSourceMappingSQSMyQueue.Properties.EventSourceArn
-        ).to.deep.equal({
-          'Fn::Join': [
-            ':',
-            [
-              'arn',
-              'aws',
-              'sqs',
-              {
-                Ref: 'AWS::Region',
-              },
-              {
-                Ref: 'AWS::AccountId',
-              },
-              'MyQueue',
-            ],
-          ],
-        });
-      });
-
-      it('should add the necessary IAM role statements', () => {
-        awsCompileSQSEvents.serverless.service.functions = {
-          first: {
-            events: [
-              {
-                sqs: 'arn:aws:sqs:region:account:MyFirstQueue',
-              },
-              {
-                sqs: 'arn:aws:sqs:region:account:MySecondQueue',
-              },
-            ],
-          },
-        };
-
-        const iamRoleStatements = [
-          {
-            Effect: 'Allow',
-            Action: ['sqs:ReceiveMessage', 'sqs:DeleteMessage', 'sqs:GetQueueAttributes'],
-            Resource: [
-              'arn:aws:sqs:region:account:MyFirstQueue',
-              'arn:aws:sqs:region:account:MySecondQueue',
-            ],
-          },
-        ];
-
-        awsCompileSQSEvents.compileSQSEvents();
-
-        expect(
-          awsCompileSQSEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources
-            .IamRoleLambdaExecution.Properties.Policies[0].PolicyDocument.Statement
-        ).to.deep.equal(iamRoleStatements);
-      });
-    });
-
-    it('should not create event source mapping when sqs events are not given', () => {
-      awsCompileSQSEvents.serverless.service.functions = {
-        first: {
-          events: [],
-        },
-      };
-
-      awsCompileSQSEvents.compileSQSEvents();
-
-      // should be 1 because we've mocked the IamRoleLambdaExecution above
-      expect(
-        Object.keys(
-          awsCompileSQSEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources
-        ).length
-      ).to.equal(1);
-    });
-
-    it('should not add the IAM role statements when sqs events are not given', () => {
-      awsCompileSQSEvents.serverless.service.functions = {
-        first: {
-          events: [],
-        },
-      };
-
-      awsCompileSQSEvents.compileSQSEvents();
-
-      expect(
-        awsCompileSQSEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources
-          .IamRoleLambdaExecution.Properties.Policies[0].PolicyDocument.Statement.length
-      ).to.equal(0);
-    });
-
-    it('should remove all non-alphanumerics from queue names for the resource logical ids', () => {
-      awsCompileSQSEvents.serverless.service.functions = {
-        first: {
-          events: [
-            {
-              sqs: 'arn:aws:sqs:region:account:some-queue-name',
-            },
-          ],
         },
-      };
-
-      awsCompileSQSEvents.compileSQSEvents();
-
+      ];
       expect(
-        awsCompileSQSEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources
-      ).to.have.any.keys('FirstEventSourceMappingSQSSomequeuename');
+        iamRoleLambdaExecution.Properties.Policies[0].PolicyDocument.Statement
+      ).to.deep.include.members(iamRoleStatments);
     });
   });
-});
 
-describe('AwsCompileSQSEvents #2', () => {
   describe('with provisioned concurrency', () => {
     let naming;
     let eventSourceMappingResource;
@@ -595,7 +209,7 @@ describe('AwsCompileSQSEvents #2', () => {
         fixture: 'function',
         configExt: {
           functions: {
-            foo: {
+            basic: {
               provisionedConcurrency: 1,
               events: [
                 {
@@ -603,6 +217,7 @@ describe('AwsCompileSQSEvents #2', () => {
                     arn: 'arn:aws:sqs:region:account:MyQueue',
                     batchSize: 10,
                     maximumBatchingWindow: 100,
+                    filterPatterns: [{ a: [1, 2] }, { b: [3, 4] }],
                   },
                 },
               ],
@@ -612,7 +227,7 @@ describe('AwsCompileSQSEvents #2', () => {
         command: 'package',
       });
       naming = awsNaming;
-      const queueLogicalId = awsNaming.getQueueLogicalId('foo', 'MyQueue');
+      const queueLogicalId = awsNaming.getQueueLogicalId('basic', 'MyQueue');
       eventSourceMappingResource = cfTemplate.Resources[queueLogicalId];
     });
 
@@ -623,7 +238,7 @@ describe('AwsCompileSQSEvents #2', () => {
     });
 
     it('should depend on provisioned alias', () => {
-      const aliasLogicalId = naming.getLambdaProvisionedConcurrencyAliasLogicalId('foo');
+      const aliasLogicalId = naming.getLambdaProvisionedConcurrencyAliasLogicalId('basic');
       expect(eventSourceMappingResource.DependsOn).to.include(aliasLogicalId);
     });
 
@@ -634,5 +249,50 @@ describe('AwsCompileSQSEvents #2', () => {
     it('should have correct batching window size', () => {
       expect(eventSourceMappingResource.Properties.MaximumBatchingWindowInSeconds).to.equal(100);
     });
+
+    it('should have correct filtering patterns', () => {
+      expect(eventSourceMappingResource.Properties.FilterCriteria).to.deep.equal({
+        Filters: [
+          {
+            Pattern: JSON.stringify({ a: [1, 2] }),
+          },
+          {
+            Pattern: JSON.stringify({ b: [3, 4] }),
+          },
+        ],
+      });
+    });
+  });
+
+  it('should not depend on default IAM role when custom role defined', async () => {
+    const { awsNaming, cfTemplate } = await runServerless({
+      fixture: 'function',
+      configExt: {
+        provider: {
+          iam: {
+            role: {
+              'Fn::Sub': 'arn:aws:iam::${AWS::AccountId}:role/iam-role-name',
+            },
+          },
+        },
+        functions: {
+          basic: {
+            events: [
+              {
+                sqs: {
+                  arn: 'arn:aws:sqs:region:account:MyQueue',
+                },
+              },
+            ],
+          },
+        },
+      },
+      command: 'package',
+    });
+
+    const queueLogicalId = awsNaming.getQueueLogicalId('basic', 'MyQueue');
+    const eventSourceMappingResource = cfTemplate.Resources[queueLogicalId];
+
+    expect(eventSourceMappingResource.DependsOn).to.deep.equal([]);
   });
 });
diff --git a/test/unit/lib/plugins/aws/package/compile/events/stream.test.js b/test/unit/lib/plugins/aws/package/compile/events/stream.test.js
index af2404dd754..0cad1d43c34 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/stream.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/stream.test.js
@@ -3,7 +3,7 @@
 const expect = require('chai').expect;
 const AwsProvider = require('../../../../../../../../lib/plugins/aws/provider');
 const AwsCompileStreamEvents = require('../../../../../../../../lib/plugins/aws/package/compile/events/stream');
-const Serverless = require('../../../../../../../../lib/Serverless');
+const Serverless = require('../../../../../../../../lib/serverless');
 const runServerless = require('../../../../../../../utils/run-serverless');
 
 describe('AwsCompileStreamEvents', () => {
@@ -11,7 +11,7 @@ describe('AwsCompileStreamEvents', () => {
   let awsCompileStreamEvents;
 
   beforeEach(() => {
-    serverless = new Serverless();
+    serverless = new Serverless({ commands: [], options: {} });
     serverless.service.provider.compiledCloudFormationTemplate = {
       Resources: {
         IamRoleLambdaExecution: {
@@ -32,58 +32,7 @@ describe('AwsCompileStreamEvents', () => {
     awsCompileStreamEvents.serverless.service.service = 'new-service';
   });
 
-  describe('#constructor()', () => {
-    it('should set the provider variable to be an instance of AwsProvider', () =>
-      expect(awsCompileStreamEvents.provider).to.be.instanceof(AwsProvider));
-  });
-
   describe('#compileStreamEvents()', () => {
-    it('should throw an error if the "consumer" property is not a string, object, or boolean', () => {
-      awsCompileStreamEvents.serverless.service.functions = {
-        first: {
-          events: [
-            {
-              stream: {
-                type: 'kinesis',
-                arn: 'arn:aws:kinesis:us-east-1:123456789012:stream/myStream',
-                consumer: 42,
-              },
-            },
-          ],
-        },
-      };
-    });
-
-    it('should throw an error if stream event type is not a string or an object', () => {
-      awsCompileStreamEvents.serverless.service.functions = {
-        first: {
-          events: [
-            {
-              stream: 42,
-            },
-          ],
-        },
-      };
-
-      expect(() => awsCompileStreamEvents.compileStreamEvents()).to.throw(Error);
-    });
-
-    it('should throw an error if the "arn" property is not given', () => {
-      awsCompileStreamEvents.serverless.service.functions = {
-        first: {
-          events: [
-            {
-              stream: {
-                arn: null,
-              },
-            },
-          ],
-        },
-      };
-
-      expect(() => awsCompileStreamEvents.compileStreamEvents()).to.throw(Error);
-    });
-
     it('should not throw error or merge role statements if default policy is not present', () => {
       awsCompileStreamEvents.serverless.service.functions = {
         first: {
@@ -97,7 +46,8 @@ describe('AwsCompileStreamEvents', () => {
       };
 
       // pretend that the default IamRoleLambdaExecution is not in place
-      awsCompileStreamEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources.IamRoleLambdaExecution = null;
+      awsCompileStreamEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources.IamRoleLambdaExecution =
+        null;
 
       expect(() => {
         awsCompileStreamEvents.compileStreamEvents();
@@ -122,7 +72,8 @@ describe('AwsCompileStreamEvents', () => {
       };
 
       // pretend that the default IamRoleLambdaExecution is not in place
-      awsCompileStreamEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources.IamRoleLambdaExecution = null;
+      awsCompileStreamEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources.IamRoleLambdaExecution =
+        null;
 
       expect(() => {
         awsCompileStreamEvents.compileStreamEvents();
@@ -156,7 +107,8 @@ describe('AwsCompileStreamEvents', () => {
       };
 
       // pretend that the default IamRoleLambdaExecution is not in place
-      awsCompileStreamEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources.IamRoleLambdaExecution = null;
+      awsCompileStreamEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources.IamRoleLambdaExecution =
+        null;
 
       expect(() => {
         awsCompileStreamEvents.compileStreamEvents();
@@ -186,7 +138,8 @@ describe('AwsCompileStreamEvents', () => {
       };
 
       // pretend that the default IamRoleLambdaExecution is not in place
-      awsCompileStreamEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources.IamRoleLambdaExecution = null;
+      awsCompileStreamEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources.IamRoleLambdaExecution =
+        null;
 
       expect(() => {
         awsCompileStreamEvents.compileStreamEvents();
@@ -214,7 +167,8 @@ describe('AwsCompileStreamEvents', () => {
       };
 
       // pretend that the default IamRoleLambdaExecution is not in place
-      awsCompileStreamEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources.IamRoleLambdaExecution = null;
+      awsCompileStreamEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources.IamRoleLambdaExecution =
+        null;
 
       awsCompileStreamEvents.serverless.service.provider.role = 'arn:aws:iam::account:role/foo';
 
@@ -249,7 +203,8 @@ describe('AwsCompileStreamEvents', () => {
       };
 
       // pretend that the default IamRoleLambdaExecution is not in place
-      awsCompileStreamEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources.IamRoleLambdaExecution = null;
+      awsCompileStreamEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources.IamRoleLambdaExecution =
+        null;
 
       expect(() => {
         awsCompileStreamEvents.compileStreamEvents();
@@ -278,7 +233,8 @@ describe('AwsCompileStreamEvents', () => {
       };
 
       // pretend that the default IamRoleLambdaExecution is not in place
-      awsCompileStreamEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources.IamRoleLambdaExecution = null;
+      awsCompileStreamEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources.IamRoleLambdaExecution =
+        null;
 
       expect(() => {
         awsCompileStreamEvents.compileStreamEvents();
@@ -307,7 +263,8 @@ describe('AwsCompileStreamEvents', () => {
       };
 
       // pretend that the default IamRoleLambdaExecution is not in place
-      awsCompileStreamEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources.IamRoleLambdaExecution = null;
+      awsCompileStreamEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources.IamRoleLambdaExecution =
+        null;
 
       awsCompileStreamEvents.serverless.service.provider.role = {
         'Fn::GetAtt': [roleLogicalId, 'Arn'],
@@ -340,7 +297,8 @@ describe('AwsCompileStreamEvents', () => {
       };
 
       // pretend that the default IamRoleLambdaExecution is not in place
-      awsCompileStreamEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources.IamRoleLambdaExecution = null;
+      awsCompileStreamEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources.IamRoleLambdaExecution =
+        null;
 
       awsCompileStreamEvents.serverless.service.provider.role = roleLogicalId;
 
@@ -980,70 +938,6 @@ describe('AwsCompileStreamEvents', () => {
         expect(() => awsCompileStreamEvents.compileStreamEvents()).to.throw(Error);
       });
 
-      it('fails if onFailure ARN is given as a variable type other than string or object', () => {
-        awsCompileStreamEvents.serverless.service.functions = {
-          first: {
-            events: [
-              {
-                stream: {
-                  arn: 'arn:aws:dynamodb:region:account:table/foo/stream/1',
-                  destinations: {
-                    onFailure: 3,
-                  },
-                },
-              },
-            ],
-          },
-        };
-
-        expect(() => awsCompileStreamEvents.compileStreamEvents()).to.throw(Error);
-      });
-
-      it('fails if no arn key is given for a dynamic onFailure ARN', () => {
-        awsCompileStreamEvents.serverless.service.functions = {
-          first: {
-            events: [
-              {
-                stream: {
-                  arn: 'arn:aws:dynamodb:region:account:table/foo/stream/1',
-                  destinations: {
-                    onFailure: {
-                      notarn: ['SomeSNS', 'Arn'],
-                    },
-                  },
-                },
-              },
-            ],
-          },
-        };
-
-        expect(() => awsCompileStreamEvents.compileStreamEvents()).to.throw(Error);
-      });
-
-      it('fails if destinations structure is wrong', () => {
-        awsCompileStreamEvents.serverless.service.functions = {
-          first: {
-            events: [
-              {
-                stream: {
-                  arn: 'arn:aws:dynamodb:region:account:table/foo/stream/1',
-                  destinations: {
-                    notOnFailure: {
-                      arn: {
-                        'Fn::GetAtt': ['SomeSNS', 'Arn'],
-                        'batchSize': 1,
-                      },
-                    },
-                  },
-                },
-              },
-            ],
-          },
-        };
-
-        expect(() => awsCompileStreamEvents.compileStreamEvents()).to.throw(Error);
-      });
-
       it('should add the necessary IAM role statements', () => {
         awsCompileStreamEvents.serverless.service.functions = {
           first: {
@@ -1529,39 +1423,6 @@ describe('AwsCompileStreamEvents', () => {
       });
     });
 
-    it('should not create event source mapping when stream events are not given', () => {
-      awsCompileStreamEvents.serverless.service.functions = {
-        first: {
-          events: [],
-        },
-      };
-
-      awsCompileStreamEvents.compileStreamEvents();
-
-      // should be 1 because we've mocked the IamRoleLambdaExecution above
-      expect(
-        Object.keys(
-          awsCompileStreamEvents.serverless.service.provider.compiledCloudFormationTemplate
-            .Resources
-        ).length
-      ).to.equal(1);
-    });
-
-    it('should not add the IAM role statements when stream events are not given', () => {
-      awsCompileStreamEvents.serverless.service.functions = {
-        first: {
-          events: [],
-        },
-      };
-
-      awsCompileStreamEvents.compileStreamEvents();
-
-      expect(
-        awsCompileStreamEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources
-          .IamRoleLambdaExecution.Properties.Policies[0].PolicyDocument.Statement.length
-      ).to.equal(0);
-    });
-
     it('should remove all non-alphanumerics from stream names for the resource logical ids', () => {
       awsCompileStreamEvents.serverless.service.functions = {
         first: {
@@ -1582,9 +1443,8 @@ describe('AwsCompileStreamEvents', () => {
   });
 });
 
-describe('AwsCompileStreamEvents #2', () => {
-  describe('with provisioned concurrency', () => {
-    let naming;
+describe('test/unit/lib/plugins/aws/package/compile/events/stream.test.js', () => {
+  describe('regular', () => {
     let eventSourceMappingResource;
 
     before(async () => {
@@ -1592,39 +1452,427 @@ describe('AwsCompileStreamEvents #2', () => {
         fixture: 'function',
         configExt: {
           functions: {
-            foo: {
-              provisionedConcurrency: 1,
-              events: [{ stream: 'arn:aws:kinesis:us-east-1:123456789012:stream/myStream' }],
+            basic: {
+              events: [
+                {
+                  stream: {
+                    arn: 'arn:aws:kinesis:us-east-1:123456789012:stream/some-long-name',
+                    functionResponseType: 'ReportBatchItemFailures',
+                    tumblingWindowInSeconds: 30,
+                    filterPatterns: [{ eventName: ['INSERT'] }, { eventName: ['MODIFY'] }],
+                    parallelizationFactor: 10,
+                    bisectBatchOnFunctionError: true,
+                    consumer: true,
+                  },
+                },
+              ],
+            },
+            dynamo: {
+              handler: 'basic.handler',
+              events: [
+                {
+                  stream: {
+                    arn: 'arn:aws:dynamodb:region:account:table/foo/stream/1',
+                    batchSize: 1,
+                    startingPosition: 'LATEST',
+                    enabled: false,
+                    batchWindow: 15,
+                    maximumRetryAttempts: 4,
+                    maximumRecordAgeInSeconds: 120,
+                    destinations: {
+                      onFailure: 'arn:aws:sns:region:account:snstopic',
+                    },
+                  },
+                },
+              ],
+            },
+            kinesisImportCustomIam: {
+              handler: 'basic.handler',
+              role: {
+                'Fn::Sub': 'arn:aws:iam::${AWS::AccountId}:role/iam-role-name',
+              },
+              events: [
+                {
+                  stream: {
+                    arn: { 'Fn::ImportValue': 'ForeignKinesis' },
+                    type: 'kinesis',
+                    consumer:
+                      'arn:aws:kinesis:region:account:stream/xyz/consumer/foobar:1558544531',
+                  },
+                },
+              ],
+            },
+            arnVariants: {
+              handler: 'basic.handler',
+              events: [
+                {
+                  stream: {
+                    arn: { 'Fn::GetAtt': ['SomeDdbTable', 'StreamArn'] },
+                    type: 'dynamodb',
+                    destinations: {
+                      onFailure: {
+                        arn: { 'Fn::ImportValue': 'ForeignSQS' },
+                        type: 'sqs',
+                      },
+                    },
+                  },
+                },
+                {
+                  stream: {
+                    arn: {
+                      'Fn::Join': [
+                        ':',
+                        [
+                          'arn',
+                          'aws',
+                          'kinesis',
+                          {
+                            Ref: 'AWS::Region',
+                          },
+                          {
+                            Ref: 'AWS::AccountId',
+                          },
+                          'stream/MyStream',
+                        ],
+                      ],
+                    },
+                    type: 'kinesis',
+                  },
+                },
+                {
+                  stream: {
+                    arn: { Ref: 'SomeDdbTableStreamArn' },
+                    type: 'dynamodb',
+                    destinations: {
+                      onFailure: {
+                        arn: { 'Fn::ImportValue': 'ForeignSQS' },
+                        type: 'sqs',
+                      },
+                    },
+                  },
+                },
+                {
+                  stream: {
+                    arn: { Ref: 'ForeignKinesisStreamArn' },
+                    type: 'kinesis',
+                  },
+                },
+              ],
+            },
+            destinationVariants: {
+              handler: 'basic.handler',
+              events: [
+                {
+                  stream: {
+                    arn: 'arn:aws:dynamodb:region:account:table/foo/stream/1',
+                    destinations: {
+                      onFailure: {
+                        arn: { 'Fn::GetAtt': ['SomeSNS', 'Arn'] },
+                        type: 'sns',
+                      },
+                    },
+                  },
+                },
+                {
+                  stream: {
+                    arn: 'arn:aws:dynamodb:region:account:table/foo/stream/1',
+                    destinations: {
+                      onFailure: {
+                        arn: {
+                          'Fn::Join': [
+                            ':',
+                            [
+                              'arn',
+                              'aws',
+                              'sqs',
+                              {
+                                Ref: 'AWS::Region',
+                              },
+                              {
+                                Ref: 'AWS::AccountId',
+                              },
+                              'MyQueue',
+                            ],
+                          ],
+                        },
+                        type: 'sqs',
+                      },
+                    },
+                  },
+                },
+                {
+                  stream: {
+                    arn: 'arn:aws:dynamodb:region:account:table/buzz/stream/1',
+                    destinations: {
+                      onFailure: {
+                        arn: { Ref: 'SomeSNSArn' },
+                        type: 'sns',
+                      },
+                    },
+                  },
+                },
+                {
+                  stream: {
+                    arn: 'arn:aws:dynamodb:region:account:table/fizz/stream/1',
+                    destinations: {
+                      onFailure: {
+                        arn: { Ref: 'ForeignSQSArn' },
+                        type: 'sqs',
+                      },
+                    },
+                  },
+                },
+              ],
             },
           },
         },
         command: 'package',
       });
-      naming = awsNaming;
-      const streamLogicalId = awsNaming.getStreamLogicalId('foo', 'kinesis', 'myStream');
+      const streamLogicalId = awsNaming.getStreamLogicalId('basic', 'kinesis', 'some-long-name');
       eventSourceMappingResource = cfTemplate.Resources[streamLogicalId];
     });
 
-    it('should reference provisioned alias', () => {
-      expect(eventSourceMappingResource.Properties.FunctionName).to.deep.equal({
-        'Fn::Join': [
-          ':',
-          [
-            {
-              'Fn::GetAtt': ['FooLambdaFunction', 'Arn'],
-            },
-            'provisioned',
-          ],
+    it.skip('TODO: should support ARN String for `arn`', () => {
+      // Replaces
+      // https://github.com/serverless/serverless/blob/f64f7c68abb1d6837ecaa6173f4b605cf3975acf/test/unit/lib/plugins/aws/package/compile/events/stream.test.js#L1106-L1453 (partially)
+      // https://github.com/serverless/serverless/blob/f64f7c68abb1d6837ecaa6173f4b605cf3975acf/test/unit/lib/plugins/aws/package/compile/events/stream.test.js#L1574-L1591
+      //
+      // Confirm effect of:
+      // - `functions.basic.events[0].stream.arn`
+      // - `functions.dynamodb.events[0].stream.arn`
+    });
+
+    it.skip('TODO: should support Fn::GetAtt for `arn`', () => {
+      // Replaces partially
+      // https://github.com/serverless/serverless/blob/f64f7c68abb1d6837ecaa6173f4b605cf3975acf/test/unit/lib/plugins/aws/package/compile/events/stream.test.js#L586-L741
+      //
+      // Confirm effect of `functions.arnVariants.events[0].stream.arn`
+    });
+
+    it.skip('TODO: should support Fn::ImportValue for `arn`', () => {
+      // Replaces partially
+      // https://github.com/serverless/serverless/blob/f64f7c68abb1d6837ecaa6173f4b605cf3975acf/test/unit/lib/plugins/aws/package/compile/events/stream.test.js#L586-L741
+      //
+      // Confirm effect of `functions.kinesisImportCustomIam.events[0].stream.arn`
+    });
+
+    it.skip('TODO: should support Fn::Join for `arn`', () => {
+      // Replaces partially
+      // https://github.com/serverless/serverless/blob/f64f7c68abb1d6837ecaa6173f4b605cf3975acf/test/unit/lib/plugins/aws/package/compile/events/stream.test.js#L586-L741
+      //
+      // Confirm effect of `functions.arnVariants.events[1].stream.arn`
+    });
+
+    it.skip('TODO: should support Ref for `arn`', () => {
+      // Replaces partially
+      // https://github.com/serverless/serverless/blob/f64f7c68abb1d6837ecaa6173f4b605cf3975acf/test/unit/lib/plugins/aws/package/compile/events/stream.test.js#L586-L741
+      //
+      // Confirm effect of:
+      // - `functions.arnVariants.events[2].stream.arn`
+      // - `functions.arnVariants.events[3].stream.arn`
+    });
+
+    it.skip('TODO: should support `batchSize`', () => {
+      // Replaces partially
+      // https://github.com/serverless/serverless/blob/f64f7c68abb1d6837ecaa6173f4b605cf3975acf/test/unit/lib/plugins/aws/package/compile/events/stream.test.js#L370-L584
+      // https://github.com/serverless/serverless/blob/f64f7c68abb1d6837ecaa6173f4b605cf3975acf/test/unit/lib/plugins/aws/package/compile/events/stream.test.js#L1106-L1453
+      //
+      // Confirm effect of `functions.dynamo.events[0].stream.batchSize`
+    });
+
+    it.skip('TODO: should support `startingPosition`', () => {
+      // Replaces partially
+      // https://github.com/serverless/serverless/blob/f64f7c68abb1d6837ecaa6173f4b605cf3975acf/test/unit/lib/plugins/aws/package/compile/events/stream.test.js#L370-L584
+      // https://github.com/serverless/serverless/blob/f64f7c68abb1d6837ecaa6173f4b605cf3975acf/test/unit/lib/plugins/aws/package/compile/events/stream.test.js#L1106-L1453
+      //
+      // Confirm effect of `functions.dynamo.events[0].stream.startingPosition`
+    });
+
+    it.skip('TODO: should support `enabled`', () => {
+      // Replaces partially
+      // https://github.com/serverless/serverless/blob/f64f7c68abb1d6837ecaa6173f4b605cf3975acf/test/unit/lib/plugins/aws/package/compile/events/stream.test.js#L370-L584
+      // https://github.com/serverless/serverless/blob/f64f7c68abb1d6837ecaa6173f4b605cf3975acf/test/unit/lib/plugins/aws/package/compile/events/stream.test.js#L1106-L1453
+      //
+      // Confirm effect of `functions.dynamo.events[0].stream.enabled`
+    });
+
+    it.skip('TODO: should support `batchWindow`', () => {
+      // Replaces partially
+      // https://github.com/serverless/serverless/blob/f64f7c68abb1d6837ecaa6173f4b605cf3975acf/test/unit/lib/plugins/aws/package/compile/events/stream.test.js#L370-L584
+      // https://github.com/serverless/serverless/blob/f64f7c68abb1d6837ecaa6173f4b605cf3975acf/test/unit/lib/plugins/aws/package/compile/events/stream.test.js#L1106-L1453
+      //
+      // Confirm effect of `functions.dynamo.events[0].stream.batchWindow`
+    });
+
+    it.skip('TODO: should support `maximumRetryAttempts`', () => {
+      // Replaces partially
+      // https://github.com/serverless/serverless/blob/f64f7c68abb1d6837ecaa6173f4b605cf3975acf/test/unit/lib/plugins/aws/package/compile/events/stream.test.js#L370-L584
+      // https://github.com/serverless/serverless/blob/f64f7c68abb1d6837ecaa6173f4b605cf3975acf/test/unit/lib/plugins/aws/package/compile/events/stream.test.js#L1106-L1453
+      //
+      // Confirm effect of `functions.dynamo.events[0].stream.maximumRetryAttempts`
+    });
+
+    it.skip('TODO: should support `maximumRecordAgeInSeconds`', () => {
+      // Replaces partially
+      // https://github.com/serverless/serverless/blob/f64f7c68abb1d6837ecaa6173f4b605cf3975acf/test/unit/lib/plugins/aws/package/compile/events/stream.test.js#L370-L584
+      // https://github.com/serverless/serverless/blob/f64f7c68abb1d6837ecaa6173f4b605cf3975acf/test/unit/lib/plugins/aws/package/compile/events/stream.test.js#L1106-L1453
+      //
+      // Confirm effect of `functions.dynamo.events[0].stream.maximumRecordAgeInSeconds`
+    });
+
+    it.skip('TODO: should support `parallelizationFactor`', () => {
+      // Replaces partially
+      // https://github.com/serverless/serverless/blob/f64f7c68abb1d6837ecaa6173f4b605cf3975acf/test/unit/lib/plugins/aws/package/compile/events/stream.test.js#L1106-L1453
+      //
+      // Confirm effect of `functions.basic.events[0].stream.parallelizationFactor`
+    });
+
+    it.skip('TODO: should support `bisectBatchOnFunctionError`', () => {
+      // Replaces partially
+      // https://github.com/serverless/serverless/blob/f64f7c68abb1d6837ecaa6173f4b605cf3975acf/test/unit/lib/plugins/aws/package/compile/events/stream.test.js#L1106-L1453
+      //
+      // Confirm effect of `functions.basic.events[0].stream.bisectBatchOnFunctionError`
+    });
+
+    it.skip('TODO: should support `consumer`', () => {
+      // Replaces
+      // https://github.com/serverless/serverless/blob/f64f7c68abb1d6837ecaa6173f4b605cf3975acf/test/unit/lib/plugins/aws/package/compile/events/stream.test.js#L1437-L1465
+      // https://github.com/serverless/serverless/blob/f64f7c68abb1d6837ecaa6173f4b605cf3975acf/test/unit/lib/plugins/aws/package/compile/events/stream.test.js#L1467-L1539 (partially)
+      //
+      // Confirm effect of:
+      // - `functions.basic.events[0].stream.consumer`
+      // - `functions.kinesisImportCustomIam.events[0].stream.consumer`
+    });
+
+    it.skip('TODO: should support ARN string for `destinations.onFailure`', () => {
+      // Replaces partially
+      // https://github.com/serverless/serverless/blob/f64f7c68abb1d6837ecaa6173f4b605cf3975acf/test/unit/lib/plugins/aws/package/compile/events/stream.test.js#L370-L584
+      //
+      // Confirm effect of: `functions.dynamo.events[0].stream.destinations`
+    });
+
+    it.skip('TODO: should support Fn::GetAtt for `destinations.onFailure`', () => {
+      // Replaces partially
+      // https://github.com/serverless/serverless/blob/f64f7c68abb1d6837ecaa6173f4b605cf3975acf/test/unit/lib/plugins/aws/package/compile/events/stream.test.js#L743-L916
+      //
+      // Confirm effect of: `functions.destinationVariants.events[0].stream.destinations`
+    });
+
+    it.skip('TODO: should support Fn::ImportValue for `destinations.onFailure`', () => {
+      // Replaces partially
+      // https://github.com/serverless/serverless/blob/f64f7c68abb1d6837ecaa6173f4b605cf3975acf/test/unit/lib/plugins/aws/package/compile/events/stream.test.js#L743-L916
+      //
+      // Confirm effect of: `functions.arnVariants.events[2].stream.destinations`
+    });
+
+    it.skip('TODO: should support Fn::Join for `destinations.onFailure`', () => {
+      // Replaces partially
+      // https://github.com/serverless/serverless/blob/f64f7c68abb1d6837ecaa6173f4b605cf3975acf/test/unit/lib/plugins/aws/package/compile/events/stream.test.js#L743-L916
+      //
+      // Confirm effect of: `functions.destinationVariants.events[1].stream.destinations`
+    });
+
+    it.skip('TODO: should support Ref for `destinations.onFailure`', () => {
+      // Replaces partially
+      // https://github.com/serverless/serverless/blob/f64f7c68abb1d6837ecaa6173f4b605cf3975acf/test/unit/lib/plugins/aws/package/compile/events/stream.test.js#L743-L916
+      //
+      // Confirm effect of:
+      // - `functions.destinationVariants.events[2].stream.destinations`
+      // - `functions.destinationVariants.events[3].stream.destinations`
+    });
+
+    it('should support `functionResponseType`', () => {
+      expect(eventSourceMappingResource.Properties.FunctionResponseTypes).to.include.members([
+        'ReportBatchItemFailures',
+      ]);
+    });
+
+    it('should support `tumblingWindowInSeconds`', () => {
+      expect(eventSourceMappingResource.Properties.TumblingWindowInSeconds).to.equal(30);
+    });
+
+    it('should support `filterPatterns`', () => {
+      expect(eventSourceMappingResource.Properties.FilterCriteria).to.deep.equal({
+        Filters: [
+          {
+            Pattern: JSON.stringify({ eventName: ['INSERT'] }),
+          },
+          {
+            Pattern: JSON.stringify({ eventName: ['MODIFY'] }),
+          },
         ],
       });
     });
 
-    it('should depend on provisioned alias', () => {
-      const aliasLogicalId = naming.getLambdaProvisionedConcurrencyAliasLogicalId('foo');
-      expect(eventSourceMappingResource.DependsOn).to.include(aliasLogicalId);
+    it.skip('TODO: should ensure necessary IAM statememnts', () => {
+      // Replaces
+      // https://github.com/serverless/serverless/blob/f64f7c68abb1d6837ecaa6173f4b605cf3975acf/test/unit/lib/plugins/aws/package/compile/events/stream.test.js#L87-L366
+      // https://github.com/serverless/serverless/blob/f64f7c68abb1d6837ecaa6173f4b605cf3975acf/test/unit/lib/plugins/aws/package/compile/events/stream.test.js#L1056-L1103
+      // https://github.com/serverless/serverless/blob/f64f7c68abb1d6837ecaa6173f4b605cf3975acf/test/unit/lib/plugins/aws/package/compile/events/stream.test.js#L1467-L1539 (partially)
+      //
+      // Confirm expected IAM statements on final role
     });
   });
-  describe('with custom checkpoint enabled', () => {
+
+  describe.skip('TODO: failures', () => {
+    it("should fail if stream `type` is not set and couldn't be assumed", async () => {
+      // Replaces
+      // https://github.com/serverless/serverless/blob/f64f7c68abb1d6837ecaa6173f4b605cf3975acf/test/unit/lib/plugins/aws/package/compile/events/stream.test.js#L918-L932
+      // https://github.com/serverless/serverless/blob/f64f7c68abb1d6837ecaa6173f4b605cf3975acf/test/unit/lib/plugins/aws/package/compile/events/stream.test.js#L955-L969
+      await expect(
+        runServerless({
+          fixture: 'function',
+          command: 'package',
+          configExt: {
+            functions: {
+              basic: {
+                events: [
+                  {
+                    stream: {
+                      arn: { Ref: 'SomeDdbTableStreamArn' },
+                    },
+                  },
+                ],
+              },
+            },
+          },
+        })
+      ).to.be.eventually.rejected.and.have.property('code', 'TODO');
+    });
+
+    it("should fail if destination `type` is not set and couldn't be assumed", async () => {
+      // Replaces
+      // https://github.com/serverless/serverless/blob/f64f7c68abb1d6837ecaa6173f4b605cf3975acf/test/unit/lib/plugins/aws/package/compile/events/stream.test.js#L934-L953
+      // https://github.com/serverless/serverless/blob/f64f7c68abb1d6837ecaa6173f4b605cf3975acf/test/unit/lib/plugins/aws/package/compile/events/stream.test.js#L971-L990
+      await expect(
+        runServerless({
+          fixture: 'function',
+          command: 'package',
+          configExt: {
+            functions: {
+              basic: {
+                events: [
+                  {
+                    stream: {
+                      arn: 'arn:aws:dynamodb:region:account:table/fizz/stream/1',
+                      destinations: {
+                        onFailure: {
+                          arn: { Ref: 'ForeignSQSArn' },
+                        },
+                      },
+                    },
+                  },
+                ],
+              },
+            },
+          },
+        })
+      ).to.be.eventually.rejected.and.have.property('code', 'TODO');
+    });
+  });
+
+  describe('with provisioned concurrency', () => {
+    let naming;
     let eventSourceMappingResource;
 
     before(async () => {
@@ -1632,28 +1880,36 @@ describe('AwsCompileStreamEvents #2', () => {
         fixture: 'function',
         configExt: {
           functions: {
-            foo: {
-              events: [
-                {
-                  stream: {
-                    arn: 'arn:aws:kinesis:us-east-1:123456789012:stream/myStream',
-                    functionResponseType: 'ReportBatchItemFailures',
-                  },
-                },
-              ],
+            basic: {
+              provisionedConcurrency: 1,
+              events: [{ stream: 'arn:aws:kinesis:us-east-1:123456789012:stream/myStream' }],
             },
           },
         },
         command: 'package',
       });
-      const streamLogicalId = awsNaming.getStreamLogicalId('foo', 'kinesis', 'myStream');
+      naming = awsNaming;
+      const streamLogicalId = awsNaming.getStreamLogicalId('basic', 'kinesis', 'myStream');
       eventSourceMappingResource = cfTemplate.Resources[streamLogicalId];
     });
 
-    it('should use functionResponseTypes', () => {
-      expect(eventSourceMappingResource.Properties.FunctionResponseTypes).to.include.members([
-        'ReportBatchItemFailures',
-      ]);
+    it('should reference provisioned alias', () => {
+      expect(eventSourceMappingResource.Properties.FunctionName).to.deep.equal({
+        'Fn::Join': [
+          ':',
+          [
+            {
+              'Fn::GetAtt': ['BasicLambdaFunction', 'Arn'],
+            },
+            'provisioned',
+          ],
+        ],
+      });
+    });
+
+    it('should depend on provisioned alias', () => {
+      const aliasLogicalId = naming.getLambdaProvisionedConcurrencyAliasLogicalId('basic');
+      expect(eventSourceMappingResource.DependsOn).to.include(aliasLogicalId);
     });
   });
 });
diff --git a/test/unit/lib/plugins/aws/package/compile/events/websockets/index.test.js b/test/unit/lib/plugins/aws/package/compile/events/websockets/index.test.js
index 37854a19d65..c02e3cf7a7b 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/websockets/index.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/websockets/index.test.js
@@ -4,13 +4,14 @@ const expect = require('chai').expect;
 const sinon = require('sinon');
 const AwsProvider = require('../../../../../../../../../lib/plugins/aws/provider');
 const AwsCompileWebsocketsEvents = require('../../../../../../../../../lib/plugins/aws/package/compile/events/websockets/index');
-const Serverless = require('../../../../../../../../../lib/Serverless');
+const Serverless = require('../../../../../../../../../lib/serverless');
+const runServerless = require('../../../../../../../../utils/run-serverless');
 
 describe('AwsCompileWebsocketsEvents', () => {
   let awsCompileWebsocketsEvents;
 
   beforeEach(() => {
-    const serverless = new Serverless();
+    const serverless = new Serverless({ commands: [], options: {} });
     serverless.service.environment = {
       vars: {},
       stages: {
@@ -111,3 +112,92 @@ describe('AwsCompileWebsocketsEvents', () => {
     });
   });
 });
+
+describe('test/unit/lib/plugins/aws/package/compile/events/websockets/index.test.js', () => {
+  describe('regular configuration', () => {
+    let cfTemplate;
+    let awsNaming;
+    before(async () => {
+      ({ cfTemplate, awsNaming } = await runServerless({
+        fixture: 'function',
+        command: 'package',
+
+        configExt: {
+          functions: {
+            basic: {
+              events: [
+                {
+                  websocket: '$connect',
+                },
+              ],
+            },
+          },
+        },
+      }));
+    });
+
+    it('should create a websocket api resource', () => {
+      const websocketsApiName = awsNaming.getWebsocketsApiName();
+      expect(cfTemplate.Resources.WebsocketsApi).to.deep.equal({
+        Type: 'AWS::ApiGatewayV2::Api',
+        Properties: {
+          Name: websocketsApiName,
+          RouteSelectionExpression: '$request.body.action',
+          Description: 'Serverless Websockets',
+          ProtocolType: 'WEBSOCKET',
+        },
+      });
+    });
+
+    it('should configure expected IAM', () => {
+      const id = awsNaming.getRoleLogicalId();
+      expect(
+        cfTemplate.Resources[id].Properties.Policies[0].PolicyDocument.Statement
+      ).to.deep.include({
+        Effect: 'Allow',
+        Action: ['execute-api:ManageConnections'],
+        Resource: [{ 'Fn::Sub': 'arn:${AWS::Partition}:execute-api:*:*:*/@connections/*' }],
+      });
+    });
+  });
+
+  describe('external websocket API', () => {
+    let cfTemplate;
+    let awsNaming;
+    before(async () => {
+      ({ cfTemplate, awsNaming } = await runServerless({
+        fixture: 'function',
+        command: 'package',
+
+        configExt: {
+          provider: {
+            apiGateway: {
+              websocketApiId: '5ezys3sght',
+            },
+            iam: {
+              role: 'arn:aws:iam::123456789012:role/fromProvider',
+            },
+          },
+          functions: {
+            basic: {
+              events: [
+                {
+                  websocket: '$connect',
+                },
+              ],
+            },
+          },
+        },
+      }));
+    });
+
+    it('should not create a websocket api resource', () => {
+      expect(cfTemplate.Resources.WebsocketsApi).to.equal(undefined);
+    });
+
+    it('should not configure IAM policies with custom roles', () => {
+      const id = awsNaming.getRoleLogicalId();
+      expect(cfTemplate.Resources[id]).to.equal(undefined);
+    });
+  });
+});
diff --git a/test/unit/lib/plugins/aws/package/compile/events/websockets/lib/api.test.js b/test/unit/lib/plugins/aws/package/compile/events/websockets/lib/api.test.js
deleted file mode 100644
index ea87b825839..00000000000
--- a/test/unit/lib/plugins/aws/package/compile/events/websockets/lib/api.test.js
+++ /dev/null
@@ -1,102 +0,0 @@
-'use strict';
-
-const expect = require('chai').expect;
-const AwsCompileWebsocketsEvents = require('../../../../../../../../../../lib/plugins/aws/package/compile/events/websockets/index');
-const Serverless = require('../../../../../../../../../../lib/Serverless');
-const AwsProvider = require('../../../../../../../../../../lib/plugins/aws/provider');
-
-describe('#compileApi()', () => {
-  let awsCompileWebsocketsEvents;
-  let roleLogicalId;
-
-  beforeEach(() => {
-    const serverless = new Serverless();
-    serverless.setProvider('aws', new AwsProvider(serverless));
-    serverless.service.service = 'my-service';
-    serverless.service.provider.compiledCloudFormationTemplate = { Resources: {} };
-
-    awsCompileWebsocketsEvents = new AwsCompileWebsocketsEvents(serverless);
-
-    roleLogicalId = awsCompileWebsocketsEvents.provider.naming.getRoleLogicalId();
-    awsCompileWebsocketsEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources = {
-      [roleLogicalId]: {
-        Properties: {
-          Policies: [
-            {
-              PolicyDocument: {
-                Statement: [],
-              },
-            },
-          ],
-        },
-      },
-    };
-  });
-
-  it('should create a websocket api resource', () => {
-    awsCompileWebsocketsEvents.compileApi();
-    const resources =
-      awsCompileWebsocketsEvents.serverless.service.provider.compiledCloudFormationTemplate
-        .Resources;
-
-    expect(resources.WebsocketsApi).to.deep.equal({
-      Type: 'AWS::ApiGatewayV2::Api',
-      Properties: {
-        Name: 'dev-my-service-websockets',
-        RouteSelectionExpression: '$request.body.action',
-        Description: 'Serverless Websockets',
-        ProtocolType: 'WEBSOCKET',
-      },
-    });
-  });
-
-  it('should ignore API resource creation if there is predefined websocketApi config', () => {
-    awsCompileWebsocketsEvents.serverless.service.provider.apiGateway = {
-      websocketApiId: '5ezys3sght',
-    };
-    awsCompileWebsocketsEvents.compileApi();
-    const resources =
-      awsCompileWebsocketsEvents.serverless.service.provider.compiledCloudFormationTemplate
-        .Resources;
-
-    expect(resources).to.not.have.property('WebsocketsApi');
-  });
-
-  it('should add the websockets policy', () => {
-    awsCompileWebsocketsEvents.compileApi();
-    const resources =
-      awsCompileWebsocketsEvents.serverless.service.provider.compiledCloudFormationTemplate
-        .Resources;
-
-    expect(resources[roleLogicalId]).to.deep.equal({
-      Properties: {
-        Policies: [
-          {
-            PolicyDocument: {
-              Statement: [
-                {
-                  Action: ['execute-api:ManageConnections'],
-                  Effect: 'Allow',
-                  Resource: [
-                    { 'Fn::Sub': 'arn:${AWS::Partition}:execute-api:*:*:*/@connections/*' },
-                  ],
-                },
-              ],
-            },
-          },
-        ],
-      },
-    });
-  });
-
-  it('should NOT add the websockets policy if role resource does not exist', () => {
-    awsCompileWebsocketsEvents.serverless.service.provider.compiledCloudFormationTemplate.Resources = {};
-
-    awsCompileWebsocketsEvents.compileApi();
-    const resources =
-      awsCompileWebsocketsEvents.serverless.service.provider.compiledCloudFormationTemplate
-        .Resources;
-
-    expect(resources[roleLogicalId]).to.deep.equal(undefined);
-  });
-});
diff --git a/test/unit/lib/plugins/aws/package/compile/events/websockets/lib/authorizers.test.js b/test/unit/lib/plugins/aws/package/compile/events/websockets/lib/authorizers.test.js
index 9cf51b2bfdf..f112641be0e 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/websockets/lib/authorizers.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/websockets/lib/authorizers.test.js
@@ -2,7 +2,7 @@
 
 const expect = require('chai').expect;
 const AwsCompileWebsocketsEvents = require('../../../../../../../../../../lib/plugins/aws/package/compile/events/websockets/index');
-const Serverless = require('../../../../../../../../../../lib/Serverless');
+const Serverless = require('../../../../../../../../../../lib/serverless');
 const AwsProvider = require('../../../../../../../../../../lib/plugins/aws/provider');
 
 describe('#compileAuthorizers()', () => {
@@ -10,13 +10,14 @@ describe('#compileAuthorizers()', () => {
 
   describe('for routes with authorizer definition', () => {
     beforeEach(() => {
-      const serverless = new Serverless();
+      const serverless = new Serverless({ commands: [], options: {} });
       serverless.setProvider('aws', new AwsProvider(serverless));
       serverless.service.provider.compiledCloudFormationTemplate = { Resources: {} };
 
       awsCompileWebsocketsEvents = new AwsCompileWebsocketsEvents(serverless);
 
-      awsCompileWebsocketsEvents.websocketsApiLogicalId = awsCompileWebsocketsEvents.provider.naming.getWebsocketsApiLogicalId();
+      awsCompileWebsocketsEvents.websocketsApiLogicalId =
+        awsCompileWebsocketsEvents.provider.naming.getWebsocketsApiLogicalId();
 
       awsCompileWebsocketsEvents.validated = {
         events: [
@@ -105,13 +106,14 @@ describe('#compileAuthorizers()', () => {
 
   describe('for routes without authorizer definition', () => {
     beforeEach(() => {
-      const serverless = new Serverless();
+      const serverless = new Serverless({ commands: [], options: {} });
       serverless.setProvider('aws', new AwsProvider(serverless));
       serverless.service.provider.compiledCloudFormationTemplate = { Resources: {} };
 
       awsCompileWebsocketsEvents = new AwsCompileWebsocketsEvents(serverless);
 
-      awsCompileWebsocketsEvents.websocketsApiLogicalId = awsCompileWebsocketsEvents.provider.naming.getWebsocketsApiLogicalId();
+      awsCompileWebsocketsEvents.websocketsApiLogicalId =
+        awsCompileWebsocketsEvents.provider.naming.getWebsocketsApiLogicalId();
 
       awsCompileWebsocketsEvents.validated = {
         events: [
diff --git a/test/unit/lib/plugins/aws/package/compile/events/websockets/lib/deployment.test.js b/test/unit/lib/plugins/aws/package/compile/events/websockets/lib/deployment.test.js
index b1cb4c04041..bee52bbcf7c 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/websockets/lib/deployment.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/websockets/lib/deployment.test.js
@@ -2,7 +2,7 @@
 
 const expect = require('chai').expect;
 const AwsCompileWebsocketsEvents = require('../../../../../../../../../../lib/plugins/aws/package/compile/events/websockets/index');
-const Serverless = require('../../../../../../../../../../lib/Serverless');
+const Serverless = require('../../../../../../../../../../lib/serverless');
 const AwsProvider = require('../../../../../../../../../../lib/plugins/aws/provider');
 
 describe('#compileDeployment()', () => {
@@ -13,7 +13,7 @@ describe('#compileDeployment()', () => {
       stage: 'dev',
       region: 'us-east-1',
     };
-    const serverless = new Serverless();
+    const serverless = new Serverless({ commands: [], options: {} });
     serverless.setProvider('aws', new AwsProvider(serverless));
     serverless.service.provider.compiledCloudFormationTemplate = {
       Resources: {},
@@ -22,7 +22,8 @@ describe('#compileDeployment()', () => {
 
     awsCompileWebsocketsEvents = new AwsCompileWebsocketsEvents(serverless, options);
 
-    awsCompileWebsocketsEvents.websocketsApiLogicalId = awsCompileWebsocketsEvents.provider.naming.getWebsocketsApiLogicalId();
+    awsCompileWebsocketsEvents.websocketsApiLogicalId =
+      awsCompileWebsocketsEvents.provider.naming.getWebsocketsApiLogicalId();
   });
 
   it('should create a deployment resource and output', () => {
diff --git a/test/unit/lib/plugins/aws/package/compile/events/websockets/lib/integrations.test.js b/test/unit/lib/plugins/aws/package/compile/events/websockets/lib/integrations.test.js
index de54f104be9..53e44a4d0b8 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/websockets/lib/integrations.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/websockets/lib/integrations.test.js
@@ -2,20 +2,21 @@
 
 const expect = require('chai').expect;
 const AwsCompileWebsocketsEvents = require('../../../../../../../../../../lib/plugins/aws/package/compile/events/websockets/index');
-const Serverless = require('../../../../../../../../../../lib/Serverless');
+const Serverless = require('../../../../../../../../../../lib/serverless');
 const AwsProvider = require('../../../../../../../../../../lib/plugins/aws/provider');
 
 describe('#compileIntegrations()', () => {
   let awsCompileWebsocketsEvents;
 
   beforeEach(() => {
-    const serverless = new Serverless();
+    const serverless = new Serverless({ commands: [], options: {} });
     serverless.setProvider('aws', new AwsProvider(serverless));
     serverless.service.provider.compiledCloudFormationTemplate = { Resources: {} };
 
     awsCompileWebsocketsEvents = new AwsCompileWebsocketsEvents(serverless);
 
-    awsCompileWebsocketsEvents.websocketsApiLogicalId = awsCompileWebsocketsEvents.provider.naming.getWebsocketsApiLogicalId();
+    awsCompileWebsocketsEvents.websocketsApiLogicalId =
+      awsCompileWebsocketsEvents.provider.naming.getWebsocketsApiLogicalId();
   });
 
   it('should create an integration resource for every event', () => {
diff --git a/test/unit/lib/plugins/aws/package/compile/events/websockets/lib/permissions.test.js b/test/unit/lib/plugins/aws/package/compile/events/websockets/lib/permissions.test.js
index 93100ee5902..a795ebc5d3e 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/websockets/lib/permissions.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/websockets/lib/permissions.test.js
@@ -2,20 +2,21 @@
 
 const expect = require('chai').expect;
 const AwsCompileWebsocketsEvents = require('../../../../../../../../../../lib/plugins/aws/package/compile/events/websockets/index');
-const Serverless = require('../../../../../../../../../../lib/Serverless');
+const Serverless = require('../../../../../../../../../../lib/serverless');
 const AwsProvider = require('../../../../../../../../../../lib/plugins/aws/provider');
 
 describe('#compilePermissions()', () => {
   let awsCompileWebsocketsEvents;
 
   beforeEach(() => {
-    const serverless = new Serverless();
+    const serverless = new Serverless({ commands: [], options: {} });
     serverless.setProvider('aws', new AwsProvider(serverless));
     serverless.service.provider.compiledCloudFormationTemplate = { Resources: {} };
 
     awsCompileWebsocketsEvents = new AwsCompileWebsocketsEvents(serverless);
 
-    awsCompileWebsocketsEvents.websocketsApiLogicalId = awsCompileWebsocketsEvents.provider.naming.getWebsocketsApiLogicalId();
+    awsCompileWebsocketsEvents.websocketsApiLogicalId =
+      awsCompileWebsocketsEvents.provider.naming.getWebsocketsApiLogicalId();
   });
 
   it('should create a permission resource for every event', () => {
diff --git a/test/unit/lib/plugins/aws/package/compile/events/websockets/lib/pickWebsocketsTemplatePart.test.js b/test/unit/lib/plugins/aws/package/compile/events/websockets/lib/pick-websockets-template-part.test.js
similarity index 98%
rename from test/unit/lib/plugins/aws/package/compile/events/websockets/lib/pickWebsocketsTemplatePart.test.js
rename to test/unit/lib/plugins/aws/package/compile/events/websockets/lib/pick-websockets-template-part.test.js
index 23cf74cb564..551393ffc9b 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/websockets/lib/pickWebsocketsTemplatePart.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/websockets/lib/pick-websockets-template-part.test.js
@@ -1,7 +1,7 @@
 'use strict';
 
 const expect = require('chai').expect;
-const pickWebsocketsTemplatePart = require('../../../../../../../../../../lib/plugins/aws/package/compile/events/websockets/lib/pickWebsocketsTemplatePart');
+const pickWebsocketsTemplatePart = require('../../../../../../../../../../lib/plugins/aws/package/compile/events/websockets/lib/pick-websockets-template-part');
 
 describe('#pickWebsocketsTemplatePart', () => {
   it('picks resources from a CloudFormation template related to WebsocketsApi', () => {
diff --git a/test/unit/lib/plugins/aws/package/compile/events/websockets/lib/routeResponses.test.js b/test/unit/lib/plugins/aws/package/compile/events/websockets/lib/route-responses.test.js
similarity index 88%
rename from test/unit/lib/plugins/aws/package/compile/events/websockets/lib/routeResponses.test.js
rename to test/unit/lib/plugins/aws/package/compile/events/websockets/lib/route-responses.test.js
index 1c6cf48209d..8c591aaf491 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/websockets/lib/routeResponses.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/websockets/lib/route-responses.test.js
@@ -2,20 +2,21 @@
 
 const expect = require('chai').expect;
 const AwsCompileWebsocketsEvents = require('../../../../../../../../../../lib/plugins/aws/package/compile/events/websockets/index');
-const Serverless = require('../../../../../../../../../../lib/Serverless');
+const Serverless = require('../../../../../../../../../../lib/serverless');
 const AwsProvider = require('../../../../../../../../../../lib/plugins/aws/provider');
 
 describe('#compileRouteResponses()', () => {
   let awsCompileWebsocketsEvents;
 
   beforeEach(() => {
-    const serverless = new Serverless();
+    const serverless = new Serverless({ commands: [], options: {} });
     serverless.setProvider('aws', new AwsProvider(serverless));
     serverless.service.provider.compiledCloudFormationTemplate = { Resources: {} };
 
     awsCompileWebsocketsEvents = new AwsCompileWebsocketsEvents(serverless);
 
-    awsCompileWebsocketsEvents.websocketsApiLogicalId = awsCompileWebsocketsEvents.provider.naming.getWebsocketsApiLogicalId();
+    awsCompileWebsocketsEvents.websocketsApiLogicalId =
+      awsCompileWebsocketsEvents.provider.naming.getWebsocketsApiLogicalId();
   });
 
   it('should create a RouteResponse resource for events with selection expression', () => {
diff --git a/test/unit/lib/plugins/aws/package/compile/events/websockets/lib/routes.test.js b/test/unit/lib/plugins/aws/package/compile/events/websockets/lib/routes.test.js
index 23d99e82039..69b2b094552 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/websockets/lib/routes.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/websockets/lib/routes.test.js
@@ -2,20 +2,21 @@
 
 const expect = require('chai').expect;
 const AwsCompileWebsocketsEvents = require('../../../../../../../../../../lib/plugins/aws/package/compile/events/websockets/index');
-const Serverless = require('../../../../../../../../../../lib/Serverless');
+const Serverless = require('../../../../../../../../../../lib/serverless');
 const AwsProvider = require('../../../../../../../../../../lib/plugins/aws/provider');
 
 describe('#compileRoutes()', () => {
   let awsCompileWebsocketsEvents;
 
   beforeEach(() => {
-    const serverless = new Serverless();
+    const serverless = new Serverless({ commands: [], options: {} });
     serverless.setProvider('aws', new AwsProvider(serverless));
     serverless.service.provider.compiledCloudFormationTemplate = { Resources: {} };
 
     awsCompileWebsocketsEvents = new AwsCompileWebsocketsEvents(serverless);
 
-    awsCompileWebsocketsEvents.websocketsApiLogicalId = awsCompileWebsocketsEvents.provider.naming.getWebsocketsApiLogicalId();
+    awsCompileWebsocketsEvents.websocketsApiLogicalId =
+      awsCompileWebsocketsEvents.provider.naming.getWebsocketsApiLogicalId();
   });
 
   it('should create a route resource for every event', () => {
diff --git a/test/unit/lib/plugins/aws/package/compile/events/websockets/lib/stage.test.js b/test/unit/lib/plugins/aws/package/compile/events/websockets/lib/stage.test.js
index 2b07e6df576..5fdd6c37dbc 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/websockets/lib/stage.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/websockets/lib/stage.test.js
@@ -8,7 +8,7 @@ const BbPromise = require('bluebird');
 const _ = require('lodash');
 const childProcess = BbPromise.promisifyAll(require('child_process'));
 const AwsCompileWebsocketsEvents = require('../../../../../../../../../../lib/plugins/aws/package/compile/events/websockets/index');
-const Serverless = require('../../../../../../../../../../lib/Serverless');
+const Serverless = require('../../../../../../../../../../lib/serverless');
 const AwsProvider = require('../../../../../../../../../../lib/plugins/aws/provider');
 const { createTmpDir } = require('../../../../../../../../../utils/fs');
 
@@ -24,7 +24,7 @@ describe('#compileStage()', () => {
       stage: 'dev',
       region: 'us-east-1',
     };
-    const serverless = new Serverless();
+    const serverless = new Serverless({ commands: [], options: {} });
     serverless.setProvider('aws', new AwsProvider(serverless));
     serverless.service.service = 'my-service';
     serverless.service.provider.compiledCloudFormationTemplate = { Resources: {} };
@@ -34,7 +34,8 @@ describe('#compileStage()', () => {
     awsCompileWebsocketsEvents = new AwsCompileWebsocketsEvents(serverless, options);
     stageLogicalId = awsCompileWebsocketsEvents.provider.naming.getWebsocketsStageLogicalId();
     logGroupLogicalId = awsCompileWebsocketsEvents.provider.naming.getWebsocketsLogGroupLogicalId();
-    awsCompileWebsocketsEvents.websocketsApiLogicalId = awsCompileWebsocketsEvents.provider.naming.getWebsocketsApiLogicalId();
+    awsCompileWebsocketsEvents.websocketsApiLogicalId =
+      awsCompileWebsocketsEvents.provider.naming.getWebsocketsApiLogicalId();
   });
 
   it('should create a stage resource if no websocketApiId specified', () =>
diff --git a/test/unit/lib/plugins/aws/package/compile/events/websockets/lib/validate.test.js b/test/unit/lib/plugins/aws/package/compile/events/websockets/lib/validate.test.js
index 07af507669f..48d5cd9c6c4 100644
--- a/test/unit/lib/plugins/aws/package/compile/events/websockets/lib/validate.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/events/websockets/lib/validate.test.js
@@ -2,7 +2,7 @@
 
 const expect = require('chai').expect;
 const AwsCompileWebsocketsEvents = require('../../../../../../../../../../lib/plugins/aws/package/compile/events/websockets/index');
-const Serverless = require('../../../../../../../../../../lib/Serverless');
+const Serverless = require('../../../../../../../../../../lib/serverless');
 const AwsProvider = require('../../../../../../../../../../lib/plugins/aws/provider');
 const runServerless = require('../../../../../../../../../utils/run-serverless');
 
@@ -15,7 +15,7 @@ describe('#validate()', () => {
       stage: 'dev',
       region: 'us-east-1',
     };
-    serverless = new Serverless();
+    serverless = new Serverless({ commands: [], options: {} });
     serverless.setProvider('aws', new AwsProvider(serverless, options));
     awsCompileWebsocketsEvents = new AwsCompileWebsocketsEvents(serverless, options);
   });
diff --git a/test/unit/lib/plugins/aws/package/compile/functions.test.js b/test/unit/lib/plugins/aws/package/compile/functions.test.js
index 638b566035e..1377df9c659 100644
--- a/test/unit/lib/plugins/aws/package/compile/functions.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/functions.test.js
@@ -2,16 +2,17 @@
 
 const AWS = require('aws-sdk');
 const fse = require('fs-extra');
+const fsp = require('fs').promises;
 const _ = require('lodash');
 const path = require('path');
 const chai = require('chai');
 const sinon = require('sinon');
 const AwsProvider = require('../../../../../../../lib/plugins/aws/provider');
 const AwsCompileFunctions = require('../../../../../../../lib/plugins/aws/package/compile/functions');
-const Serverless = require('../../../../../../../lib/Serverless');
+const Serverless = require('../../../../../../../lib/serverless');
 const runServerless = require('../../../../../../utils/run-serverless');
 const fixtures = require('../../../../../../fixtures/programmatic');
-const getHashForFilePath = require('../../../../../../../lib/plugins/aws/package/lib/getHashForFilePath');
+const getHashForFilePath = require('../../../../../../../lib/plugins/aws/package/lib/get-hash-for-file-path');
 
 const { getTmpDirPath, createTmpFile } = require('../../../../../../utils/fs');
 
@@ -31,6 +32,8 @@ describe('AwsCompileFunctions', () => {
     const options = {
       stage: 'dev',
       region: 'us-east-1',
+      commands: [],
+      options: {},
     };
     serverless = new Serverless(options);
     awsProvider = new AwsProvider(serverless, options);
@@ -162,54 +165,6 @@ describe('AwsCompileFunctions', () => {
       });
     });
 
-    it('should add a logical role name provider role', () => {
-      awsCompileFunctions.serverless.service.provider.name = 'aws';
-      awsCompileFunctions.serverless.service.provider.role = 'LogicalNameRole';
-      awsCompileFunctions.serverless.service.functions = {
-        func: {
-          handler: 'func.function.handler',
-          name: 'new-service-dev-func',
-        },
-      };
-
-      return expect(awsCompileFunctions.compileFunctions()).to.be.fulfilled.then(() => {
-        expect(
-          awsCompileFunctions.serverless.service.provider.compiledCloudFormationTemplate.Resources
-            .FuncLambdaFunction.DependsOn
-        ).to.deep.equal(['FuncLogGroup', 'LogicalNameRole']);
-        expect(
-          awsCompileFunctions.serverless.service.provider.compiledCloudFormationTemplate.Resources
-            .FuncLambdaFunction.Properties.Role
-        ).to.deep.equal({
-          'Fn::GetAtt': [awsCompileFunctions.serverless.service.provider.role, 'Arn'],
-        });
-      });
-    });
-
-    it('should add a "Fn::GetAtt" Object provider role', () => {
-      awsCompileFunctions.serverless.service.provider.name = 'aws';
-      awsCompileFunctions.serverless.service.provider.role = {
-        'Fn::GetAtt': ['LogicalRoleName', 'Arn'],
-      };
-      awsCompileFunctions.serverless.service.functions = {
-        func: {
-          handler: 'func.function.handler',
-          name: 'new-service-dev-func',
-        },
-      };
-
-      return expect(awsCompileFunctions.compileFunctions()).to.be.fulfilled.then(() => {
-        expect(
-          awsCompileFunctions.serverless.service.provider.compiledCloudFormationTemplate.Resources
-            .FuncLambdaFunction.DependsOn
-        ).to.deep.equal(['FuncLogGroup', 'LogicalRoleName']);
-        expect(
-          awsCompileFunctions.serverless.service.provider.compiledCloudFormationTemplate.Resources
-            .FuncLambdaFunction.Properties.Role
-        ).to.deep.equal(awsCompileFunctions.serverless.service.provider.role);
-      });
-    });
-
     it('should add an ARN function role', () => {
       awsCompileFunctions.serverless.service.provider.name = 'aws';
       awsCompileFunctions.serverless.service.functions = {
@@ -236,6 +191,7 @@ describe('AwsCompileFunctions', () => {
       const { cfTemplate } = await runServerless({
         fixture: 'function',
         configExt: {
+          disabledDeprecations: ['PROVIDER_IAM_SETTINGS_V3'],
           provider: {
             role: 'role-a',
             iam: { role: 'role-b' },
@@ -244,7 +200,7 @@ describe('AwsCompileFunctions', () => {
         command: 'package',
       });
 
-      expect(cfTemplate.Resources.FooLambdaFunction.Properties.Role).to.eql({
+      expect(cfTemplate.Resources.BasicLambdaFunction.Properties.Role).to.eql({
         'Fn::GetAtt': ['role-b', 'Arn'],
       });
     });
@@ -380,7 +336,7 @@ describe('AwsCompileFunctions', () => {
           Handler: 'func.function.handler',
           MemorySize: 1024,
           Role: { 'Fn::GetAtt': ['IamRoleLambdaExecution', 'Arn'] },
-          Runtime: 'nodejs12.x',
+          Runtime: 'nodejs14.x',
           Timeout: 6,
         },
       };
@@ -393,51 +349,6 @@ describe('AwsCompileFunctions', () => {
       });
     });
 
-    it('should create a function resource with function level tags', () => {
-      const s3Folder = awsCompileFunctions.serverless.service.package.artifactDirectoryName;
-      const s3FileName = awsCompileFunctions.serverless.service.package.artifact
-        .split(path.sep)
-        .pop();
-      awsCompileFunctions.serverless.service.functions = {
-        func: {
-          handler: 'func.function.handler',
-          name: 'new-service-dev-func',
-          tags: {
-            foo: 'bar',
-            baz: 'qux',
-          },
-        },
-      };
-
-      const compiledFunction = {
-        Type: 'AWS::Lambda::Function',
-        DependsOn: ['FuncLogGroup'],
-        Properties: {
-          Code: {
-            S3Key: `${s3Folder}/${s3FileName}`,
-            S3Bucket: { Ref: 'ServerlessDeploymentBucket' },
-          },
-          FunctionName: 'new-service-dev-func',
-          Handler: 'func.function.handler',
-          MemorySize: 1024,
-          Role: { 'Fn::GetAtt': ['IamRoleLambdaExecution', 'Arn'] },
-          Runtime: 'nodejs12.x',
-          Timeout: 6,
-          Tags: [
-            { Key: 'foo', Value: 'bar' },
-            { Key: 'baz', Value: 'qux' },
-          ],
-        },
-      };
-
-      return expect(awsCompileFunctions.compileFunctions()).to.be.fulfilled.then(() => {
-        expect(
-          awsCompileFunctions.serverless.service.provider.compiledCloudFormationTemplate.Resources
-            .FuncLambdaFunction
-        ).to.deep.equal(compiledFunction);
-      });
-    });
-
     describe('when using onError config', () => {
       let s3Folder;
       let s3FileName;
@@ -450,17 +361,18 @@ describe('AwsCompileFunctions', () => {
       describe('when IamRoleLambdaExecution is used', () => {
         beforeEach(() => {
           // pretend that the IamRoleLambdaExecution is used
-          awsCompileFunctions.serverless.service.provider.compiledCloudFormationTemplate.Resources.IamRoleLambdaExecution = {
-            Properties: {
-              Policies: [
-                {
-                  PolicyDocument: {
-                    Statement: [],
+          awsCompileFunctions.serverless.service.provider.compiledCloudFormationTemplate.Resources.IamRoleLambdaExecution =
+            {
+              Properties: {
+                Policies: [
+                  {
+                    PolicyDocument: {
+                      Statement: [],
+                    },
                   },
-                },
-              ],
-            },
-          };
+                ],
+              },
+            };
         });
 
         it('should create necessary resources if a SNS arn is provided', () => {
@@ -484,7 +396,7 @@ describe('AwsCompileFunctions', () => {
               Handler: 'func.function.handler',
               MemorySize: 1024,
               Role: { 'Fn::GetAtt': ['IamRoleLambdaExecution', 'Arn'] },
-              Runtime: 'nodejs12.x',
+              Runtime: 'nodejs14.x',
               Timeout: 6,
               DeadLetterConfig: {
                 TargetArn: 'arn:aws:sns:region:accountid:foo',
@@ -535,7 +447,7 @@ describe('AwsCompileFunctions', () => {
               Handler: 'func.function.handler',
               MemorySize: 1024,
               Role: { 'Fn::GetAtt': ['IamRoleLambdaExecution', 'Arn'] },
-              Runtime: 'nodejs12.x',
+              Runtime: 'nodejs14.x',
               Timeout: 6,
               DeadLetterConfig: {
                 TargetArn: {
@@ -577,7 +489,7 @@ describe('AwsCompileFunctions', () => {
               Handler: 'func.function.handler',
               MemorySize: 1024,
               Role: { 'Fn::GetAtt': ['IamRoleLambdaExecution', 'Arn'] },
-              Runtime: 'nodejs12.x',
+              Runtime: 'nodejs14.x',
               Timeout: 6,
               DeadLetterConfig: {
                 TargetArn: {
@@ -619,7 +531,7 @@ describe('AwsCompileFunctions', () => {
               Handler: 'func.function.handler',
               MemorySize: 1024,
               Role: { 'Fn::GetAtt': ['IamRoleLambdaExecution', 'Arn'] },
-              Runtime: 'nodejs12.x',
+              Runtime: 'nodejs14.x',
               Timeout: 6,
               DeadLetterConfig: {
                 TargetArn: {
@@ -661,7 +573,7 @@ describe('AwsCompileFunctions', () => {
               Handler: 'func.function.handler',
               MemorySize: 1024,
               Role: { 'Fn::GetAtt': ['IamRoleLambdaExecution', 'Arn'] },
-              Runtime: 'nodejs12.x',
+              Runtime: 'nodejs14.x',
               Timeout: 6,
               DeadLetterConfig: {
                 TargetArn: 'arn:aws:sns:region:accountid:foo',
@@ -681,191 +593,6 @@ describe('AwsCompileFunctions', () => {
       });
     });
 
-    describe('when using awsKmsKeyArn config', () => {
-      let s3Folder;
-      let s3FileName;
-
-      beforeEach(() => {
-        s3Folder = awsCompileFunctions.serverless.service.package.artifactDirectoryName;
-        s3FileName = awsCompileFunctions.serverless.service.package.artifact.split(path.sep).pop();
-      });
-
-      it('should allow if config is provided as a Fn::GetAtt', () => {
-        awsCompileFunctions.serverless.service.functions = {
-          func: {
-            handler: 'func.function.handler',
-            name: 'new-service-dev-func',
-            awsKmsKeyArn: {
-              'Fn::GetAtt': ['MyKms', 'Arn'],
-            },
-          },
-        };
-
-        const compiledFunction = {
-          Type: 'AWS::Lambda::Function',
-          Properties: {
-            Code: {
-              S3Bucket: { Ref: 'ServerlessDeploymentBucket' },
-              S3Key: 'somedir/new-service.zip',
-            },
-            FunctionName: 'new-service-dev-func',
-            Handler: 'func.function.handler',
-            MemorySize: 1024,
-            Role: { 'Fn::GetAtt': ['IamRoleLambdaExecution', 'Arn'] },
-            Runtime: 'nodejs12.x',
-            Timeout: 6,
-            KmsKeyArn: { 'Fn::GetAtt': ['MyKms', 'Arn'] },
-          },
-          DependsOn: ['FuncLogGroup'],
-        };
-
-        return expect(awsCompileFunctions.compileFunctions()).to.be.fulfilled.then(() => {
-          const compiledCfTemplate =
-            awsCompileFunctions.serverless.service.provider.compiledCloudFormationTemplate;
-          const functionResource = compiledCfTemplate.Resources.FuncLambdaFunction;
-          expect(functionResource).to.deep.equal(compiledFunction);
-        });
-      });
-
-      it('should allow if config is provided as a Ref', () => {
-        awsCompileFunctions.serverless.service.functions = {
-          func: {
-            handler: 'func.function.handler',
-            name: 'new-service-dev-func',
-            awsKmsKeyArn: {
-              Ref: 'foobar',
-            },
-          },
-        };
-
-        const compiledFunction = {
-          Type: 'AWS::Lambda::Function',
-          Properties: {
-            Code: {
-              S3Bucket: { Ref: 'ServerlessDeploymentBucket' },
-              S3Key: 'somedir/new-service.zip',
-            },
-            FunctionName: 'new-service-dev-func',
-            Handler: 'func.function.handler',
-            MemorySize: 1024,
-            Role: { 'Fn::GetAtt': ['IamRoleLambdaExecution', 'Arn'] },
-            Runtime: 'nodejs12.x',
-            Timeout: 6,
-            KmsKeyArn: { Ref: 'foobar' },
-          },
-          DependsOn: ['FuncLogGroup'],
-        };
-
-        return expect(awsCompileFunctions.compileFunctions()).to.be.fulfilled.then(() => {
-          const compiledCfTemplate =
-            awsCompileFunctions.serverless.service.provider.compiledCloudFormationTemplate;
-          const functionResource = compiledCfTemplate.Resources.FuncLambdaFunction;
-          expect(functionResource).to.deep.equal(compiledFunction);
-        });
-      });
-
-      it('should allow if config is provided as a Fn::ImportValue', () => {
-        awsCompileFunctions.serverless.service.functions = {
-          func: {
-            handler: 'func.function.handler',
-            name: 'new-service-dev-func',
-            awsKmsKeyArn: {
-              'Fn::ImportValue': 'KmsKey',
-            },
-          },
-        };
-
-        const compiledFunction = {
-          Type: 'AWS::Lambda::Function',
-          Properties: {
-            Code: {
-              S3Bucket: { Ref: 'ServerlessDeploymentBucket' },
-              S3Key: 'somedir/new-service.zip',
-            },
-            FunctionName: 'new-service-dev-func',
-            Handler: 'func.function.handler',
-            MemorySize: 1024,
-            Role: { 'Fn::GetAtt': ['IamRoleLambdaExecution', 'Arn'] },
-            Runtime: 'nodejs12.x',
-            Timeout: 6,
-            KmsKeyArn: { 'Fn::ImportValue': 'KmsKey' },
-          },
-          DependsOn: ['FuncLogGroup'],
-        };
-
-        return expect(awsCompileFunctions.compileFunctions()).to.be.fulfilled.then(() => {
-          const compiledCfTemplate =
-            awsCompileFunctions.serverless.service.provider.compiledCloudFormationTemplate;
-          const functionResource = compiledCfTemplate.Resources.FuncLambdaFunction;
-          expect(functionResource).to.deep.equal(compiledFunction);
-        });
-      });
-
-      describe('when IamRoleLambdaExecution is used', () => {
-        beforeEach(() => {
-          // pretend that the IamRoleLambdaExecution is used
-          awsCompileFunctions.serverless.service.provider.compiledCloudFormationTemplate.Resources.IamRoleLambdaExecution = {
-            Properties: {
-              Policies: [
-                {
-                  PolicyDocument: {
-                    Statement: [],
-                  },
-                },
-              ],
-            },
-          };
-        });
-
-        it('should create necessary resources if a KMS key arn is provided', () => {
-          awsCompileFunctions.serverless.service.functions = {
-            func: {
-              handler: 'func.function.handler',
-              name: 'new-service-dev-func',
-              awsKmsKeyArn: 'arn:aws:kms:region:accountid:foo/bar',
-            },
-          };
-
-          const compiledFunction = {
-            Type: 'AWS::Lambda::Function',
-            DependsOn: ['FuncLogGroup'],
-            Properties: {
-              Code: {
-                S3Key: `${s3Folder}/${s3FileName}`,
-                S3Bucket: { Ref: 'ServerlessDeploymentBucket' },
-              },
-              FunctionName: 'new-service-dev-func',
-              Handler: 'func.function.handler',
-              MemorySize: 1024,
-              Role: { 'Fn::GetAtt': ['IamRoleLambdaExecution', 'Arn'] },
-              Runtime: 'nodejs12.x',
-              Timeout: 6,
-              KmsKeyArn: 'arn:aws:kms:region:accountid:foo/bar',
-            },
-          };
-
-          const compiledKmsStatement = {
-            Effect: 'Allow',
-            Action: ['kms:Decrypt'],
-            Resource: ['arn:aws:kms:region:accountid:foo/bar'],
-          };
-
-          return expect(awsCompileFunctions.compileFunctions()).to.be.fulfilled.then(() => {
-            const compiledCfTemplate =
-              awsCompileFunctions.serverless.service.provider.compiledCloudFormationTemplate;
-
-            const functionResource = compiledCfTemplate.Resources.FuncLambdaFunction;
-            const dlqStatement =
-              compiledCfTemplate.Resources.IamRoleLambdaExecution.Properties.Policies[0]
-                .PolicyDocument.Statement[0];
-
-            expect(functionResource).to.deep.equal(compiledFunction);
-            expect(dlqStatement).to.deep.equal(compiledKmsStatement);
-          });
-        });
-      });
-    });
-
     describe('when using tracing config', () => {
       let s3Folder;
       let s3FileName;
@@ -878,17 +605,18 @@ describe('AwsCompileFunctions', () => {
       describe('when IamRoleLambdaExecution is used', () => {
         beforeEach(() => {
           // pretend that the IamRoleLambdaExecution is used
-          awsCompileFunctions.serverless.service.provider.compiledCloudFormationTemplate.Resources.IamRoleLambdaExecution = {
-            Properties: {
-              Policies: [
-                {
-                  PolicyDocument: {
-                    Statement: [],
+          awsCompileFunctions.serverless.service.provider.compiledCloudFormationTemplate.Resources.IamRoleLambdaExecution =
+            {
+              Properties: {
+                Policies: [
+                  {
+                    PolicyDocument: {
+                      Statement: [],
+                    },
                   },
-                },
-              ],
-            },
-          };
+                ],
+              },
+            };
         });
 
         it('should create necessary resources if a tracing config is provided', () => {
@@ -912,7 +640,7 @@ describe('AwsCompileFunctions', () => {
               Handler: 'func.function.handler',
               MemorySize: 1024,
               Role: { 'Fn::GetAtt': ['IamRoleLambdaExecution', 'Arn'] },
-              Runtime: 'nodejs12.x',
+              Runtime: 'nodejs14.x',
               Timeout: 6,
               TracingConfig: {
                 Mode: 'Active',
@@ -969,7 +697,7 @@ describe('AwsCompileFunctions', () => {
           Handler: 'func.function.handler',
           MemorySize: 1024,
           Role: { 'Fn::GetAtt': ['IamRoleLambdaExecution', 'Arn'] },
-          Runtime: 'nodejs12.x',
+          Runtime: 'nodejs14.x',
           Timeout: 6,
           Environment: {
             Variables: {
@@ -1036,7 +764,7 @@ describe('AwsCompileFunctions', () => {
           Handler: 'func.function.handler',
           MemorySize: 128,
           Role: { 'Fn::GetAtt': ['IamRoleLambdaExecution', 'Arn'] },
-          Runtime: 'nodejs12.x',
+          Runtime: 'nodejs14.x',
           Timeout: 10,
         },
       };
@@ -1049,43 +777,6 @@ describe('AwsCompileFunctions', () => {
       });
     });
 
-    it('should default to the nodejs12.x runtime when no provider runtime is given', () => {
-      const s3Folder = awsCompileFunctions.serverless.service.package.artifactDirectoryName;
-      const s3FileName = awsCompileFunctions.serverless.service.package.artifact
-        .split(path.sep)
-        .pop();
-      awsCompileFunctions.serverless.service.provider.runtime = null;
-      awsCompileFunctions.serverless.service.functions = {
-        func: {
-          handler: 'func.function.handler',
-          name: 'new-service-dev-func',
-        },
-      };
-      const compiledFunction = {
-        Type: 'AWS::Lambda::Function',
-        DependsOn: ['FuncLogGroup'],
-        Properties: {
-          Code: {
-            S3Key: `${s3Folder}/${s3FileName}`,
-            S3Bucket: { Ref: 'ServerlessDeploymentBucket' },
-          },
-          FunctionName: 'new-service-dev-func',
-          Handler: 'func.function.handler',
-          MemorySize: 1024,
-          Role: { 'Fn::GetAtt': ['IamRoleLambdaExecution', 'Arn'] },
-          Runtime: 'nodejs12.x',
-          Timeout: 6,
-        },
-      };
-
-      return expect(awsCompileFunctions.compileFunctions()).to.be.fulfilled.then(() => {
-        expect(
-          awsCompileFunctions.serverless.service.provider.compiledCloudFormationTemplate.Resources
-            .FuncLambdaFunction
-        ).to.deep.equal(compiledFunction);
-      });
-    });
-
     it('should include description if specified', () => {
       awsCompileFunctions.serverless.service.functions = {
         func: {
@@ -1207,7 +898,7 @@ describe('AwsCompileFunctions', () => {
           MemorySize: 1024,
           ReservedConcurrentExecutions: 5,
           Role: { 'Fn::GetAtt': ['IamRoleLambdaExecution', 'Arn'] },
-          Runtime: 'nodejs12.x',
+          Runtime: 'nodejs14.x',
           Timeout: 6,
         },
       };
@@ -1263,7 +954,7 @@ describe('AwsCompileFunctions', () => {
           MemorySize: 1024,
           ReservedConcurrentExecutions: 0,
           Role: { 'Fn::GetAtt': ['IamRoleLambdaExecution', 'Arn'] },
-          Runtime: 'nodejs12.x',
+          Runtime: 'nodejs14.x',
           Timeout: 6,
         },
       };
@@ -1278,72 +969,6 @@ describe('AwsCompileFunctions', () => {
   });
 
   describe('#compileRole()', () => {
-    it('adds the default role without DependsOn values', () => {
-      const role = 'IamRoleLambdaExecution';
-      const resource = { Properties: {} };
-      awsCompileFunctions.compileRole(resource, role);
-
-      expect(resource).to.deep.equal({
-        Properties: {
-          Role: {
-            'Fn::GetAtt': [role, 'Arn'],
-          },
-        },
-      });
-    });
-
-    it('adds a role based on a logical name with DependsOn values', () => {
-      const role = 'LogicalRoleName';
-      const resource = { Properties: {} };
-      awsCompileFunctions.compileRole(resource, role);
-
-      expect(resource).to.deep.equal({
-        DependsOn: [role],
-        Properties: {
-          Role: {
-            'Fn::GetAtt': [role, 'Arn'],
-          },
-        },
-      });
-    });
-
-    it('adds a role based on a Fn::GetAtt with DependsOn values', () => {
-      const role = { 'Fn::GetAtt': ['Foo', 'Arn'] };
-      const resource = { Properties: {} };
-      awsCompileFunctions.compileRole(resource, role);
-
-      expect(resource).to.deep.equal({
-        DependsOn: ['Foo'],
-        Properties: {
-          Role: role,
-        },
-      });
-    });
-
-    it('adds a role based on a Fn::ImportValue', () => {
-      const role = { 'Fn::ImportValue': 'Foo' };
-      const resource = { Properties: {} };
-      awsCompileFunctions.compileRole(resource, role);
-
-      expect(resource).to.deep.equal({
-        Properties: {
-          Role: role,
-        },
-      });
-    });
-
-    it('adds a role based on a predefined arn string', () => {
-      const role = 'arn:aws:xxx:*:*';
-      const resource = { Properties: {} };
-      awsCompileFunctions.compileRole(resource, role);
-
-      expect(resource).to.deep.equal({
-        Properties: {
-          Role: role,
-        },
-      });
-    });
-
     it('should not set unset properties when not specified in yml (layers, vpc, etc)', () => {
       const s3Folder = awsCompileFunctions.serverless.service.package.artifactDirectoryName;
       const s3FileName = awsCompileFunctions.serverless.service.package.artifact
@@ -1368,7 +993,7 @@ describe('AwsCompileFunctions', () => {
           Handler: 'func.function.handler',
           MemorySize: 1024,
           Role: { 'Fn::GetAtt': ['IamRoleLambdaExecution', 'Arn'] },
-          Runtime: 'nodejs12.x',
+          Runtime: 'nodejs14.x',
           Timeout: 6,
         },
       };
@@ -1406,7 +1031,7 @@ describe('AwsCompileFunctions', () => {
           Handler: 'func.function.handler',
           MemorySize: 1024,
           Role: { 'Fn::GetAtt': ['IamRoleLambdaExecution', 'Arn'] },
-          Runtime: 'nodejs12.x',
+          Runtime: 'nodejs14.x',
           Timeout: 6,
           Layers: ['arn:aws:xxx:*:*'],
         },
@@ -1465,17 +1090,14 @@ describe('lib/plugins/aws/package/compile/functions/index.test.js', () => {
     let iamRolePolicyStatements;
 
     before(async () => {
+      const imageSha = '6bb600b4d6e1d7cf521097177dd0c4e9ea373edb91984a505333be8ac9455d38';
+      const imageWithSha = `000000000000.dkr.ecr.sa-east-1.amazonaws.com/test-lambda-docker@sha256:${imageSha}`;
       const { awsNaming, cfTemplate, fixtureData } = await runServerless({
-        fixture: 'packageArtifact',
+        fixture: 'package-artifact',
         command: 'package',
         configExt: {
-          service: {
-            // TODO: When removing support for service.awsKmsKeyArn, whole service object
-            // should be removed from this configuration
-            name: 'service',
-            awsKmsKeyArn: 'arn:aws:kms:region:accountid:pro/vider',
-          },
           provider: {
+            kmsKeyArn: 'arn:aws:kms:region:accountid:pro/vider',
             vpc: {
               subnetIds: ['subnet-01010101'],
               securityGroupIds: ['sg-0a0a0a0a'],
@@ -1493,19 +1115,21 @@ describe('lib/plugins/aws/package/compile/functions/index.test.js', () => {
               providerEnvVarA: 'providerEnvVarAValue',
               providerEnvVarB: 'providerEnvVarBValue',
               sharedEnvVar: 'valueFromProvider',
+              providerCfIfEnvVar: { 'Fn::If': ['cond', 'first', 'second'] },
             },
             memorySize: 4096,
-            runtime: 'nodejs10.x',
+            runtime: 'nodejs14.x',
             deploymentBucket: 'com.serverless.deploys',
             versionFunctions: false,
           },
           functions: {
+            fnImage: { image: imageWithSha },
             foo: {
               vpc: {
                 subnetIds: ['subnet-02020202'],
                 securityGroupIds: ['sg-1b1b1b1b'],
               },
-              awsKmsKeyArn: 'arn:aws:kms:region:accountid:fun/ction',
+              kmsKeyArn: 'arn:aws:kms:region:accountid:fun/ction',
               tracing: 'PassThrough',
               environment: {
                 funcEnvVarA: 'funcEnvVarAValue',
@@ -1520,10 +1144,13 @@ describe('lib/plugins/aws/package/compile/functions/index.test.js', () => {
               handler: 'index.handler',
               fileSystemConfig: {
                 localMountPath: '/mnt/path',
-                arn:
-                  'arn:aws:elasticfilesystem:us-east-1:111111111111:access-point/fsap-a1a1a1a1a1a1a1a1a',
+                arn: 'arn:aws:elasticfilesystem:us-east-1:111111111111:access-point/fsap-a1a1a1a1a1a1a1a1a',
               },
             },
+            vpcNullify: {
+              vpc: null,
+              handler: 'index.handler',
+            },
           },
         },
       });
@@ -1569,6 +1196,12 @@ describe('lib/plugins/aws/package/compile/functions/index.test.js', () => {
       expect(VpcConfig.SubnetIds).to.deep.equal(fooFunctionConfig.vpc.subnetIds);
     });
 
+    it('should allow `functions[].vpc` to specify no vpc', () => {
+      const Properties = cfResources[naming.getLambdaLogicalId('vpcNullify')].Properties;
+
+      expect(Properties.VpcConfig).to.be.undefined;
+    });
+
     it('should support `provider.tags`', () => {
       const providerConfig = serviceConfig.provider;
 
@@ -1594,27 +1227,27 @@ describe('lib/plugins/aws/package/compile/functions/index.test.js', () => {
       expect(Tags).to.deep.include.members(expectedTags);
     });
 
-    it('should support `service.awsKmsKeyArn`', () => {
+    it('should support `provider.kmsKeyArn`', () => {
       const { KmsKeyArn } = cfResources[naming.getLambdaLogicalId('other')].Properties;
 
-      expect(KmsKeyArn).to.equal(serviceConfig.service.awsKmsKeyArn);
+      expect(KmsKeyArn).to.equal(serviceConfig.provider.kmsKeyArn);
       expect(iamRolePolicyStatements).to.deep.include({
         Effect: 'Allow',
         Action: ['kms:Decrypt'],
-        Resource: [serviceConfig.service.awsKmsKeyArn],
+        Resource: [serviceConfig.provider.kmsKeyArn],
       });
     });
 
-    it('should prefer `functions[].awsKmsKeyArn` over `service.awsKmsKeyArn`', () => {
+    it('should prefer `functions[].kmsKeyArn` over `provider.kmsKeyArn`', () => {
       const fooFunctionConfig = serviceConfig.functions.foo;
 
       const { KmsKeyArn } = cfResources[naming.getLambdaLogicalId('foo')].Properties;
 
-      expect(KmsKeyArn).to.equal(fooFunctionConfig.awsKmsKeyArn);
+      expect(KmsKeyArn).to.equal(fooFunctionConfig.kmsKeyArn);
       expect(iamRolePolicyStatements).to.deep.include({
         Effect: 'Allow',
         Action: ['kms:Decrypt'],
-        Resource: [fooFunctionConfig.awsKmsKeyArn],
+        Resource: [fooFunctionConfig.kmsKeyArn],
       });
     });
 
@@ -1737,9 +1370,64 @@ describe('lib/plugins/aws/package/compile/functions/index.test.js', () => {
       });
     });
 
+    it('should support `provider.architecture`', async () => {
+      const imageSha = '6bb600b4d6e1d7cf521097177dd0c4e9ea373edb91984a505333be8ac9455d38';
+      const imageWithSha = `000000000000.dkr.ecr.sa-east-1.amazonaws.com/test-lambda-docker@sha256:${imageSha}`;
+      const {
+        awsNaming: localNaming,
+        cfTemplate: { Resources: localResources },
+      } = await runServerless({
+        fixture: 'function',
+        command: 'package',
+        configExt: {
+          functions: { fnImage: { image: imageWithSha } },
+          provider: { architecture: 'arm64' },
+        },
+      });
+
+      expect(
+        localResources[localNaming.getLambdaLogicalId('basic')].Properties.Architectures
+      ).to.deep.equal(['arm64']);
+      expect(
+        localResources[localNaming.getLambdaLogicalId('fnImage')].Properties.Architectures
+      ).to.deep.equal(['arm64']);
+      expect(cfResources[naming.getLambdaLogicalId('fnImage')].Properties).to.not.have.property(
+        'Architectures'
+      );
+      expect(cfResources[naming.getLambdaLogicalId('foo')].Properties).to.not.have.property(
+        'Architectures'
+      );
+    });
+
+    it('should support `vpc` defined with `Fn::Split`', async () => {
+      const { awsNaming, cfTemplate, fixtureData } = await runServerless({
+        fixture: 'function',
+        command: 'package',
+        configExt: {
+          provider: {
+            vpc: {
+              subnetIds: {
+                'Fn::Split': [',', 'subnet-01010101,subnet-21212121'],
+              },
+              securityGroupIds: {
+                'Fn::Split': [',', 'sg-0a0a0a0a,sg-0b0b0b0b'],
+              },
+            },
+          },
+        },
+      });
+
+      const providerConfig = fixtureData.serviceConfig.provider;
+
+      const { VpcConfig } = cfTemplate.Resources[awsNaming.getLambdaLogicalId('basic')].Properties;
+
+      expect(VpcConfig.SecurityGroupIds).to.deep.equal(providerConfig.vpc.securityGroupIds);
+      expect(VpcConfig.SubnetIds).to.deep.equal(providerConfig.vpc.subnetIds);
+    });
+
     describe('when custom IAM role is used', () => {
       let customRoleServiceConfig;
-      let fooFunctionRole;
+      let basicFunctionRole;
       let otherFunctionRole;
 
       before(async () => {
@@ -1753,13 +1441,14 @@ describe('lib/plugins/aws/package/compile/functions/index.test.js', () => {
               },
             },
             functions: {
-              foo: {
+              basic: {
                 role: 'arn:aws:iam::123456789012:role/fromFunction',
               },
             },
           },
         });
-        fooFunctionRole = cfTemplate.Resources[awsNaming.getLambdaLogicalId('foo')].Properties.Role;
+        basicFunctionRole =
+          cfTemplate.Resources[awsNaming.getLambdaLogicalId('basic')].Properties.Role;
         otherFunctionRole =
           cfTemplate.Resources[awsNaming.getLambdaLogicalId('other')].Properties.Role;
         customRoleServiceConfig = fixtureData.serviceConfig;
@@ -1772,9 +1461,9 @@ describe('lib/plugins/aws/package/compile/functions/index.test.js', () => {
       });
 
       it('should prefer `functions[].role` over `provider.iam.role`', () => {
-        const fooFunctionConfig = customRoleServiceConfig.functions.foo;
+        const basicFunctionConfig = customRoleServiceConfig.functions.basic;
 
-        expect(fooFunctionRole).to.equal(fooFunctionConfig.role);
+        expect(basicFunctionRole).to.equal(basicFunctionConfig.role);
       });
 
       it('should support `provider.iam.role` defined as CF function', async () => {
@@ -1793,37 +1482,58 @@ describe('lib/plugins/aws/package/compile/functions/index.test.js', () => {
         });
 
         const functionRole =
-          cfTemplate.Resources[awsNaming.getLambdaLogicalId('foo')].Properties.Role;
+          cfTemplate.Resources[awsNaming.getLambdaLogicalId('basic')].Properties.Role;
         expect(functionRole).to.deep.equal(fixtureData.serviceConfig.provider.iam.role);
       });
     });
   });
 
-  describe.skip('TODO: `provider.role` variants', () => {
-    // After addressing remove also:
-    // https://github.com/serverless/serverless/blob/d8527d8b57e7e5f0b94ba704d9f53adb34298d99/lib/plugins/aws/package/compile/functions/index.test.js#L2222-L2286
-
+  describe('`provider.role` variants', () => {
     it('should support resource name', async () => {
-      await runServerless({ fixture: 'function', configExt: {}, command: 'package' });
-      // Replacement for
-      // https://github.com/serverless/serverless/blob/d8527d8b57e7e5f0b94ba704d9f53adb34298d99/lib/plugins/aws/package/compile/functions/index.test.js#L235-L257
-      //
-      // Confirm that provider.role is refereenced at Function.Properties.Role
-      // and that it's added to function DependsOn
+      const { awsNaming, cfTemplate, fixtureData } = await runServerless({
+        fixture: 'function',
+        configExt: {
+          provider: {
+            iam: {
+              role: 'LogicalNameRole',
+            },
+          },
+        },
+        command: 'package',
+      });
+
+      const funcResource = cfTemplate.Resources[awsNaming.getLambdaLogicalId('basic')];
+      expect(funcResource.DependsOn).to.deep.equal(['BasicLogGroup', 'LogicalNameRole']);
+      expect(funcResource.Properties.Role).to.deep.equal({
+        'Fn::GetAtt': [fixtureData.serviceConfig.provider.iam.role, 'Arn'],
+      });
     });
 
     it('should support Fn::GetAtt function', async () => {
-      await runServerless({ fixture: 'function', configExt: {}, command: 'package' });
-      // Replacement for
-      // https://github.com/serverless/serverless/blob/d8527d8b57e7e5f0b94ba704d9f53adb34298d99/lib/plugins/aws/package/compile/functions/index.test.js#L259-L281
-      //
-      // Confirm that provider.role is refereenced at Function.Properties.Role
-      // and that it's added to function DependsOn
+      const { awsNaming, cfTemplate, fixtureData } = await runServerless({
+        fixture: 'function',
+        configExt: {
+          provider: {
+            iam: {
+              role: {
+                'Fn::GetAtt': ['LogicalNameRole', 'Arn'],
+              },
+            },
+          },
+        },
+        command: 'package',
+      });
+
+      const funcResource = cfTemplate.Resources[awsNaming.getLambdaLogicalId('basic')];
+      expect(funcResource.DependsOn).to.deep.equal(['BasicLogGroup', 'LogicalNameRole']);
+      expect(funcResource.Properties.Role).to.deep.equal(
+        fixtureData.serviceConfig.provider.iam.role
+      );
     });
   });
 
   describe('`provider.lambdaHashingVersion` support', () => {
-    it('CodeSha256 for functions should be the same for default hashing and for 20201221 version', async () => {
+    it('CodeSha256 for functions should be the same for default hashing and for 20200924 version', async () => {
       const { servicePath: serviceDir, updateConfig } = await fixtures.setup('function', {
         configExt: {
           provider: {
@@ -1837,7 +1547,7 @@ describe('lib/plugins/aws/package/compile/functions/index.test.js', () => {
         command: 'package',
       });
 
-      const functionCfLogicalId = awsNaming.getLambdaLogicalId('foo');
+      const functionCfLogicalId = awsNaming.getLambdaLogicalId('basic');
 
       const originalVersionCfConfig = Object.values(originalTemplate.Resources).find(
         (resource) =>
@@ -1846,8 +1556,9 @@ describe('lib/plugins/aws/package/compile/functions/index.test.js', () => {
       ).Properties;
 
       await updateConfig({
+        disabledDeprecations: ['LAMBDA_HASHING_VERSION_PROPERTY'],
         provider: {
-          lambdaHashingVersion: '20201221',
+          lambdaHashingVersion: '20200924',
         },
       });
       const { cfTemplate: updatedTemplate } = await runServerless({
@@ -1880,10 +1591,21 @@ describe('lib/plugins/aws/package/compile/functions/index.test.js', () => {
         serverless: serverlessInstance,
         fixtureData,
       } = await runServerless({
-        fixture: 'functionDestinations',
+        fixture: 'function',
         command: 'package',
         configExt: {
           functions: {
+            target: {
+              handler: 'target.handler',
+            },
+            trigger: {
+              handler: 'trigger.handler',
+              destinations: { onSuccess: 'target' },
+            },
+            fnArch: {
+              handler: 'target.handler',
+              architecture: 'arm64',
+            },
             fnTargetFailure: {
               handler: 'target.handler',
             },
@@ -1906,13 +1628,16 @@ describe('lib/plugins/aws/package/compile/functions/index.test.js', () => {
               },
               fileSystemConfig: {
                 localMountPath: '/mnt/path',
-                arn:
-                  'arn:aws:elasticfilesystem:us-east-1:111111111111:access-point/fsap-a1a1a1a1a1a1a1a1a',
+                arn: 'arn:aws:elasticfilesystem:us-east-1:111111111111:access-point/fsap-a1a1a1a1a1a1a1a1a',
               },
             },
             fnImage: {
               image: imageWithSha,
             },
+            fnImageArch: {
+              image: imageWithSha,
+              architecture: 'arm64',
+            },
             fnImageWithConfig: {
               image: {
                 uri: imageWithSha,
@@ -1921,6 +1646,30 @@ describe('lib/plugins/aws/package/compile/functions/index.test.js', () => {
                 command: ['anotherexecutable'],
               },
             },
+            fnExternalLayer: {
+              handler: 'target.handler',
+              layers: [{ Ref: 'ExternalLambdaLayer' }],
+            },
+            fnProvisioned: {
+              handler: 'trigger.handler',
+              maximumRetryAttempts: 0,
+              provisionedConcurrency: 1,
+            },
+          },
+          resources: {
+            Resources: {
+              ExternalLambdaLayer: {
+                Type: 'AWS::Lambda::LayerVersion',
+                Properties: {
+                  CompatibleRuntimes: ['nodejs12.x'],
+                  Content: {
+                    S3Bucket: 'bucket',
+                    S3Key: 'key',
+                  },
+                  LayerName: 'externalLayer',
+                },
+              },
+            },
           },
         },
       });
@@ -2011,26 +1760,11 @@ describe('lib/plugins/aws/package/compile/functions/index.test.js', () => {
       // https://github.com/serverless/serverless/blob/d8527d8b57e7e5f0b94ba704d9f53adb34298d99/lib/plugins/aws/package/compile/functions/index.test.js#L907-L948
     });
 
-    it.skip('TODO: should support `functions[].awsKmsKeyArn` as arn string', () => {
-      // Replacement for
-      // https://github.com/serverless/serverless/blob/d8527d8b57e7e5f0b94ba704d9f53adb34298d99/lib/plugins/aws/package/compile/functions/index.test.js#L1232-L1278
-      //
-      // Confirm also that IAM policy statement was added
-    });
-    it.skip('TODO: should support `functions[].awsKmsKeyArn` as Fn::GetAtt', () => {
-      // Replacement for
-      // https://github.com/serverless/serverless/blob/d8527d8b57e7e5f0b94ba704d9f53adb34298d99/lib/plugins/aws/package/compile/functions/index.test.js#L1001-L1036
-    });
+    it.skip('TODO: should support `functions[].kmsKeyArn` as Fn::GetAtt', () => {});
 
-    it.skip('TODO: should support `functions[].awsKmsKeyArn` as Ref', () => {
-      // Replacement for
-      // https://github.com/serverless/serverless/blob/d8527d8b57e7e5f0b94ba704d9f53adb34298d99/lib/plugins/aws/package/compile/functions/index.test.js#L1038-L1073
-    });
+    it.skip('TODO: should support `functions[].kmsKeyArn` as Ref', () => {});
 
-    it.skip('TODO: should support `functions[].awsKmsKeyArn` as Fn::ImportValue', () => {
-      // Replacement for
-      // https://github.com/serverless/serverless/blob/d8527d8b57e7e5f0b94ba704d9f53adb34298d99/lib/plugins/aws/package/compile/functions/index.test.js#L1075-L1110
-    });
+    it.skip('TODO: should support `functions[].kmsKeyArn` as Fn::ImportValue', () => {});
 
     it.skip('TODO: should support `functions[].environment`', () => {
       // Replacement for
@@ -2055,9 +1789,9 @@ describe('lib/plugins/aws/package/compile/functions/index.test.js', () => {
       // https://github.com/serverless/serverless/blob/d8527d8b57e7e5f0b94ba704d9f53adb34298d99/lib/plugins/aws/package/compile/functions/index.test.js#L1784-L1820
     });
 
-    it.skip('TODO: should default to "nodejs12.x" runtime`', () => {
-      // Replacement for
-      // https://github.com/serverless/serverless/blob/d8527d8b57e7e5f0b94ba704d9f53adb34298d99/lib/plugins/aws/package/compile/functions/index.test.js#L1864-L1899
+    it('should default to "nodejs14.x" runtime`', () => {
+      const funcResource = cfResources[naming.getLambdaLogicalId('target')];
+      expect(funcResource.Properties.Runtime).to.equal('nodejs14.x');
     });
 
     it.skip('TODO: should support `functions[].runtime`', () => {
@@ -2104,21 +1838,10 @@ describe('lib/plugins/aws/package/compile/functions/index.test.js', () => {
       // https://github.com/serverless/serverless/blob/d8527d8b57e7e5f0b94ba704d9f53adb34298d99/lib/plugins/aws/package/compile/functions/index.test.js#L2325-L2362
     });
 
-    it('should throw an error when nonexistent layer is referenced', async () => {
-      await expect(
-        runServerless({
-          fixture: 'functionDestinations',
-          command: 'package',
-          configExt: {
-            functions: {
-              fnInvalidLayer: {
-                handler: 'target.handler',
-                layers: [{ Ref: 'NonexistentLambdaLayer' }],
-              },
-            },
-          },
-        })
-      ).to.be.eventually.rejected.and.have.property('code', 'LAMBDA_LAYER_REFERENCE_NOT_FOUND');
+    it('should support `Ref` references to external layers (not defined as a part of `layers` top-level property in configuration)', async () => {
+      expect(
+        cfResources[naming.getLambdaLogicalId('fnExternalLayer')].Properties.Layers
+      ).to.deep.equal([{ Ref: 'ExternalLambdaLayer' }]);
     });
 
     it.skip('TODO: should support `functions[].conditions`', () => {
@@ -2131,6 +1854,21 @@ describe('lib/plugins/aws/package/compile/functions/index.test.js', () => {
       // https://github.com/serverless/serverless/blob/d8527d8b57e7e5f0b94ba704d9f53adb34298d99/lib/plugins/aws/package/compile/functions/index.test.js#L2381-L2397
     });
 
+    it('should support `functions[].architecture`', () => {
+      expect(
+        cfResources[naming.getLambdaLogicalId('fnArch')].Properties.Architectures
+      ).to.deep.equal(['arm64']);
+      expect(
+        cfResources[naming.getLambdaLogicalId('fnImageArch')].Properties.Architectures
+      ).to.deep.equal(['arm64']);
+      expect(cfResources[naming.getLambdaLogicalId('fnImage')].Properties).to.not.have.property(
+        'Architectures'
+      );
+      expect(cfResources[naming.getLambdaLogicalId('target')].Properties).to.not.have.property(
+        'Architectures'
+      );
+    });
+
     it('should support `functions[].destinations.onSuccess` referencing function in same stack', () => {
       const destinationConfig =
         cfResources[naming.getLambdaEventConfigLogicalId('trigger')].Properties.DestinationConfig;
@@ -2212,12 +1950,17 @@ describe('lib/plugins/aws/package/compile/functions/index.test.js', () => {
     it('should support `functions[].maximumRetryAttempts`', () => {
       const maximumRetryAttempts =
         serviceConfig.functions.fnMaximumRetryAttempts.maximumRetryAttempts;
+
       expect(maximumRetryAttempts).to.be.a('number');
 
       expect(
         cfResources[naming.getLambdaEventConfigLogicalId('fnMaximumRetryAttempts')].Properties
           .MaximumRetryAttempts
       ).to.equal(maximumRetryAttempts);
+
+      expect(cfResources[naming.getLambdaEventConfigLogicalId('fnProvisioned')].DependsOn).to.equal(
+        naming.getLambdaProvisionedConcurrencyAliasLogicalId('fnProvisioned')
+      );
     });
 
     it('should support `functions[].fileSystemConfig` (with vpc configured on function)', () => {
@@ -2280,11 +2023,10 @@ describe('lib/plugins/aws/package/compile/functions/index.test.js', () => {
         fixture: 'function',
         configExt: {
           functions: {
-            foo: {
+            basic: {
               fileSystemConfig: {
                 localMountPath: '/mnt/path',
-                arn:
-                  'arn:aws:elasticfilesystem:us-east-1:111111111111:access-point/fsap-a1a1a1a1a1a1a1a1a',
+                arn: 'arn:aws:elasticfilesystem:us-east-1:111111111111:access-point/fsap-a1a1a1a1a1a1a1a1a',
               },
             },
           },
@@ -2298,7 +2040,12 @@ describe('lib/plugins/aws/package/compile/functions/index.test.js', () => {
 
   describe('Version hash resolution', () => {
     const testLambdaHashingVersion = (lambdaHashingVersion) => {
-      const configExt = lambdaHashingVersion ? { provider: { lambdaHashingVersion } } : {};
+      const configExt = lambdaHashingVersion
+        ? {
+            provider: { lambdaHashingVersion },
+            disabledDeprecations: ['LAMBDA_HASHING_VERSION_PROPERTY'],
+          }
+        : {};
 
       it.skip('TODO: should create a different version if configuration changed', () => {
         // Replacement for
@@ -2316,13 +2063,14 @@ describe('lib/plugins/aws/package/compile/functions/index.test.js', () => {
           cwd: serviceDir,
           command: 'package',
         });
-        const originalVersionArn = originalTemplate.Outputs.FooLambdaFunctionQualifiedArn.Value.Ref;
+        const originalVersionArn =
+          originalTemplate.Outputs.BasicLambdaFunctionQualifiedArn.Value.Ref;
 
         await updateConfig({
           functions: {
-            foo: {
+            basic: {
               tags: {
-                foo: 'bar',
+                basic: 'bar',
               },
               reservedConcurrency: 1,
             },
@@ -2332,10 +2080,10 @@ describe('lib/plugins/aws/package/compile/functions/index.test.js', () => {
           cwd: serviceDir,
           command: 'package',
         });
-        const updatedVersionArn = updatedTemplate.Outputs.FooLambdaFunctionQualifiedArn.Value.Ref;
+        const updatedVersionArn = updatedTemplate.Outputs.BasicLambdaFunctionQualifiedArn.Value.Ref;
 
         expect(
-          updatedTemplate.Resources.FooLambdaFunction.Properties.ReservedConcurrentExecutions
+          updatedTemplate.Resources.BasicLambdaFunction.Properties.ReservedConcurrentExecutions
         ).to.equal(1);
 
         expect(originalVersionArn).to.equal(updatedVersionArn);
@@ -2352,7 +2100,7 @@ describe('lib/plugins/aws/package/compile/functions/index.test.js', () => {
         };
 
         beforeEach(async () => {
-          const serviceData = await fixtures.setup('functionLayers', { configExt });
+          const serviceData = await fixtures.setup('function-layers', { configExt });
           ({ servicePath: serviceDir, updateConfig } = serviceData);
           const data = await runServerless({
             cwd: serviceDir,
@@ -2373,7 +2121,7 @@ describe('lib/plugins/aws/package/compile/functions/index.test.js', () => {
             firstCfTemplate.Outputs.LayerFuncLambdaFunctionQualifiedArn.Value.Ref;
 
           await updateConfig({
-            layers: { testLayer: { path: 'testLayer', description: 'Different description' } },
+            layers: { testLayer: { path: 'test-layer', description: 'Different description' } },
           });
 
           const data = await runServerless({
@@ -2496,18 +2244,18 @@ describe('lib/plugins/aws/package/compile/functions/index.test.js', () => {
           let backupLayer;
 
           beforeEach(async () => {
-            originalLayer = path.join(serviceDir, 'testLayer');
-            sourceChangeLayer = path.join(serviceDir, 'extra_layers', 'testLayerSourceChange');
-            backupLayer = path.join(serviceDir, 'extra_layers', 'testLayerBackup');
+            originalLayer = path.join(serviceDir, 'test-layer');
+            sourceChangeLayer = path.join(serviceDir, 'extra-layers', 'test-layer-source-change');
+            backupLayer = path.join(serviceDir, 'extra-layers', 'test-layer-backup');
 
-            await fse.rename(originalLayer, backupLayer);
-            await fse.rename(sourceChangeLayer, originalLayer);
+            await fsp.rename(originalLayer, backupLayer);
+            await fsp.rename(sourceChangeLayer, originalLayer);
             getHashForFilePath.clear();
           });
 
           afterEach(async () => {
-            await fse.rename(originalLayer, sourceChangeLayer);
-            await fse.rename(backupLayer, originalLayer);
+            await fsp.rename(originalLayer, sourceChangeLayer);
+            await fsp.rename(backupLayer, originalLayer);
           });
 
           it('should create different lambda version id', async () => {
@@ -2531,19 +2279,54 @@ describe('lib/plugins/aws/package/compile/functions/index.test.js', () => {
       testLambdaHashingVersion();
     });
 
-    describe('lambdaHashingVersion: 20201221', () => {
-      testLambdaHashingVersion('20201221');
+    describe('lambdaHashingVersion: 20200924', () => {
+      testLambdaHashingVersion('20200924');
+    });
+
+    describe('lambdaHashingVersion migration', () => {
+      it('should enforce new description configuration and version with `--enforce-hash-update` flag', async () => {
+        const { servicePath: serviceDir } = await fixtures.setup('function', {
+          configExt: {
+            disabledDeprecations: ['LAMBDA_HASHING_VERSION_V2'],
+            provider: {
+              lambdaHashingVersion: null,
+            },
+          },
+        });
+
+        const { cfTemplate: originalTemplate, awsNaming } = await runServerless({
+          cwd: serviceDir,
+          command: 'package',
+        });
+        const originalVersionArn =
+          originalTemplate.Outputs.BasicLambdaFunctionQualifiedArn.Value.Ref;
+
+        const { cfTemplate: updatedTemplate } = await runServerless({
+          cwd: serviceDir,
+          command: 'deploy',
+          lastLifecycleHookName: 'before:deploy:deploy',
+          options: {
+            'enforce-hash-update': true,
+          },
+        });
+        const updatedVersionArn = updatedTemplate.Outputs.BasicLambdaFunctionQualifiedArn.Value.Ref;
+
+        expect(originalVersionArn).not.to.equal(updatedVersionArn);
+        expect(
+          updatedTemplate.Resources[awsNaming.getLambdaLogicalId('basic')].Properties.Description
+        ).to.equal('temporary-description-to-enforce-hash-update');
+      });
     });
   });
 
   describe.skip('TODO: Download package artifact from S3 bucket', () => {
     before(async () => {
       await runServerless({
-        fixture: 'packageArtifact',
+        fixture: 'package-artifact',
         command: 'deploy',
         configExt: {
           package: { artifact: 'some s3 url' },
-          functions: { foo: { package: { individually: true, artifact: 'other s3 url' } } },
+          functions: { basic: { package: { individually: true, artifact: 'other s3 url' } } },
         },
       });
     });
@@ -2562,7 +2345,7 @@ describe('lib/plugins/aws/package/compile/functions/index.test.js', () => {
       //    - Corresponding url is configured in CF template
       // Test with "deploy" command, and configure `lastLifecycleHookName` to 'aws:deploy:deploy:uploadArtifact'
       // It'll demand stubbing few other AWS calls for that follow this stub:
-      // https://github.com/serverless/enterprise-plugin/blob/cdd53df45dfad18d8bdd79969194a61cb8178671/lib/deployment/parse.test.js#L1585-L1627
+      // https://github.com/serverless/dashboard-plugin/blob/cdd53df45dfad18d8bdd79969194a61cb8178671/lib/deployment/parse.test.js#L1585-L1627
       // Confirm same artifact is used for all functions
     });
 
diff --git a/test/unit/lib/plugins/aws/package/compile/layers.test.js b/test/unit/lib/plugins/aws/package/compile/layers.test.js
index 0c9091eeba6..909439ac355 100644
--- a/test/unit/lib/plugins/aws/package/compile/layers.test.js
+++ b/test/unit/lib/plugins/aws/package/compile/layers.test.js
@@ -49,6 +49,7 @@ describe('lib/plugins/aws/package/compile/layers/index.test.js', () => {
             description: 'Layer two example',
             path: 'layer',
             compatibleRuntimes: ['nodejs12.x'],
+            compatibleArchitectures: ['arm64'],
             licenseInfo: 'GPL',
             allowedAccounts: ['123456789012', '123456789013'],
           },
@@ -188,6 +189,13 @@ describe('lib/plugins/aws/package/compile/layers/index.test.js', () => {
     expect(layerOne.Properties.CompatibleRuntimes).to.deep.equals(['nodejs12.x']);
   });
 
+  it('should support `layers[].compatibleArchitectures`', () => {
+    const layerResourceName = naming.getLambdaLayerLogicalId('LayerTwo');
+    const layerOne = cfResources[layerResourceName];
+
+    expect(layerOne.Properties.CompatibleArchitectures).to.deep.equals(['arm64']);
+  });
+
   it('should support `layers[].licenseInfo`', () => {
     const layerResourceName = naming.getLambdaLayerLogicalId('LayerTwo');
     const layerOne = cfResources[layerResourceName];
diff --git a/test/unit/lib/plugins/aws/package/index.test.js b/test/unit/lib/plugins/aws/package/index.test.js
index aba358a28c1..1109bcde540 100644
--- a/test/unit/lib/plugins/aws/package/index.test.js
+++ b/test/unit/lib/plugins/aws/package/index.test.js
@@ -2,8 +2,8 @@
 
 const AwsProvider = require('../../../../../../lib/plugins/aws/provider');
 const AwsPackage = require('../../../../../../lib/plugins/aws/package/index');
-const Serverless = require('../../../../../../lib/Serverless');
-const CLI = require('../../../../../../lib/classes/CLI');
+const Serverless = require('../../../../../../lib/serverless');
+const CLI = require('../../../../../../lib/classes/cli');
 const expect = require('chai').expect;
 const sinon = require('sinon');
 const path = require('path');
@@ -14,7 +14,7 @@ describe('AwsPackage', () => {
   let options;
 
   beforeEach(() => {
-    serverless = new Serverless();
+    serverless = new Serverless({ commands: [], options: {} });
     options = {
       stage: 'dev',
       region: 'us-east-1',
diff --git a/test/unit/lib/plugins/aws/package/lib/addExportNameForOutputs.test.js b/test/unit/lib/plugins/aws/package/lib/add-export-name-for-outputs.test.js
similarity index 98%
rename from test/unit/lib/plugins/aws/package/lib/addExportNameForOutputs.test.js
rename to test/unit/lib/plugins/aws/package/lib/add-export-name-for-outputs.test.js
index fa5e724a297..277aea04c20 100644
--- a/test/unit/lib/plugins/aws/package/lib/addExportNameForOutputs.test.js
+++ b/test/unit/lib/plugins/aws/package/lib/add-export-name-for-outputs.test.js
@@ -10,7 +10,7 @@ describe('test/unit/lib/plugins/aws/package/lib/addExportNameForOutputs.test.js'
   let service;
   before(async () => {
     const result = await runServerless({
-      fixture: 'apiGateway',
+      fixture: 'api-gateway',
       command: 'package',
       configExt: {
         resources: {
diff --git a/test/unit/lib/plugins/aws/package/lib/generateArtifactDirectoryName.test.js b/test/unit/lib/plugins/aws/package/lib/generate-artifact-directory-name.test.js
similarity index 86%
rename from test/unit/lib/plugins/aws/package/lib/generateArtifactDirectoryName.test.js
rename to test/unit/lib/plugins/aws/package/lib/generate-artifact-directory-name.test.js
index b2a17f77e8b..1a3d47cd994 100644
--- a/test/unit/lib/plugins/aws/package/lib/generateArtifactDirectoryName.test.js
+++ b/test/unit/lib/plugins/aws/package/lib/generate-artifact-directory-name.test.js
@@ -3,14 +3,14 @@
 const expect = require('chai').expect;
 const AwsPackage = require('../../../../../../../lib/plugins/aws/package/index');
 const AwsProvider = require('../../../../../../../lib/plugins/aws/provider');
-const Serverless = require('../../../../../../../lib/Serverless');
+const Serverless = require('../../../../../../../lib/serverless');
 
 describe('#generateArtifactDirectoryName()', () => {
   let serverless;
   let awsPackage;
 
   beforeEach(() => {
-    serverless = new Serverless();
+    serverless = new Serverless({ commands: [], options: {} });
     const options = {
       stage: 'dev',
       region: 'us-east-1',
diff --git a/test/unit/lib/plugins/aws/package/lib/generateCoreTemplate.test.js b/test/unit/lib/plugins/aws/package/lib/generate-core-template.test.js
similarity index 77%
rename from test/unit/lib/plugins/aws/package/lib/generateCoreTemplate.test.js
rename to test/unit/lib/plugins/aws/package/lib/generate-core-template.test.js
index 5c228204ad9..ef3bbcc9576 100644
--- a/test/unit/lib/plugins/aws/package/lib/generateCoreTemplate.test.js
+++ b/test/unit/lib/plugins/aws/package/lib/generate-core-template.test.js
@@ -5,6 +5,7 @@ const runServerless = require('../../../../../../utils/run-serverless');
 const expect = require('chai').expect;
 
 chai.use(require('chai-as-promised'));
+chai.use(require('sinon-chai'));
 
 describe('#generateCoreTemplate()', () => {
   it('should reject non-HTTPS requests to the deployment bucket', () =>
@@ -72,7 +73,7 @@ describe('#generateCoreTemplate()', () => {
     });
   });
 
-  it('should enable S3 Block Public Access if specified', () =>
+  it('should enable S3 Block Public Access & versioning if specified', () =>
     runServerless({
       config: {
         service: 'irrelevant',
@@ -80,6 +81,7 @@ describe('#generateCoreTemplate()', () => {
           name: 'aws',
           deploymentBucket: {
             blockPublicAccess: true,
+            versioning: true,
           },
         },
       },
@@ -92,6 +94,9 @@ describe('#generateCoreTemplate()', () => {
           IgnorePublicAcls: true,
           RestrictPublicBuckets: true,
         },
+        VersioningConfiguration: {
+          Status: 'Enabled',
+        },
       });
     }));
 
@@ -131,28 +136,37 @@ describe('#generateCoreTemplate()', () => {
       });
     }));
 
-  it('should use a custom bucket if specified, even with S3 transfer acceleration', () => {
+  it('should result in error for custom bucket and accelerate flag', async () => {
     const bucketName = 'com.serverless.deploys';
 
-    return runServerless({
-      config: {
-        service: 'irrelevant',
-        provider: {
-          name: 'aws',
-          deploymentBucket: bucketName,
+    await expect(
+      runServerless({
+        config: {
+          service: 'irrelevant',
+          provider: {
+            name: 'aws',
+            deploymentBucket: bucketName,
+          },
         },
-      },
-      command: 'deploy',
-      options: { 'aws-s3-accelerate': true },
-      lastLifecycleHookName: 'before:deploy:deploy',
-      awsRequestStubMap: { S3: { getBucketLocation: { LocationConstraint: '' } } },
-    }).then(({ cfTemplate: template }) => {
-      expect(template.Outputs.ServerlessDeploymentBucketName.Value).to.equal(bucketName);
-      // eslint-disable-next-line no-unused-expressions
-      expect(template.Resources.ServerlessDeploymentBucket).to.not.exist;
-      // eslint-disable-next-line no-unused-expressions
-      expect(template.Outputs.ServerlessDeploymentBucketAccelerated).to.not.exist;
-    });
+        awsRequestStubMap: {
+          S3: { getBucketLocation: { LocationConstraint: '' } },
+          STS: {
+            getCallerIdentity: {
+              ResponseMetadata: { RequestId: 'ffffffff-ffff-ffff-ffff-ffffffffffff' },
+              UserId: 'XXXXXXXXXXXXXXXXXXXXX',
+              Account: '1234567890',
+              Arn: 'arn:aws:iam::1234567890:user/test',
+            },
+          },
+        },
+        command: 'deploy',
+        options: { 'aws-s3-accelerate': true },
+        lastLifecycleHookName: 'before:deploy:deploy',
+      })
+    ).to.eventually.be.rejected.and.have.property(
+      'code',
+      'S3_TRANSFER_ACCELERATION_ON_EXISTING_BUCKET'
+    );
   });
 
   it('should use a auto generated bucket if you does not specify deploymentBucket', () =>
@@ -182,6 +196,16 @@ describe('#generateCoreTemplate()', () => {
       command: 'deploy',
       options: { 'aws-s3-accelerate': true },
       lastLifecycleHookName: 'before:deploy:deploy',
+      awsRequestStubMap: {
+        STS: {
+          getCallerIdentity: {
+            ResponseMetadata: { RequestId: 'ffffffff-ffff-ffff-ffff-ffffffffffff' },
+            UserId: 'XXXXXXXXXXXXXXXXXXXXX',
+            Account: '1234567890',
+            Arn: 'arn:aws:iam::1234567890:user/test',
+          },
+        },
+      },
     }).then(({ cfTemplate: template }) => {
       expect(template.Outputs.ServerlessDeploymentBucketAccelerated).to.not.equal(null);
       expect(template.Outputs.ServerlessDeploymentBucketAccelerated.Value).to.equal(true);
@@ -193,6 +217,16 @@ describe('#generateCoreTemplate()', () => {
       command: 'deploy',
       options: { 'aws-s3-accelerate': false },
       lastLifecycleHookName: 'before:deploy:deploy',
+      awsRequestStubMap: {
+        STS: {
+          getCallerIdentity: {
+            ResponseMetadata: { RequestId: 'ffffffff-ffff-ffff-ffff-ffffffffffff' },
+            UserId: 'XXXXXXXXXXXXXXXXXXXXX',
+            Account: '1234567890',
+            Arn: 'arn:aws:iam::1234567890:user/test',
+          },
+        },
+      },
     }).then(({ cfTemplate: template }) => {
       expect(template.Resources.ServerlessDeploymentBucket).to.be.deep.equal({
         Type: 'AWS::S3::Bucket',
@@ -217,6 +251,16 @@ describe('#generateCoreTemplate()', () => {
     runServerless({
       config: { service: 'irrelevant', provider: { name: 'aws', region: 'us-gov-west-1' } },
       command: 'deploy',
+      awsRequestStubMap: {
+        STS: {
+          getCallerIdentity: {
+            ResponseMetadata: { RequestId: 'ffffffff-ffff-ffff-ffff-ffffffffffff' },
+            UserId: 'XXXXXXXXXXXXXXXXXXXXX',
+            Account: '1234567890',
+            Arn: 'arn:aws:iam::1234567890:user/test',
+          },
+        },
+      },
       options: { 'aws-s3-accelerate': false },
       lastLifecycleHookName: 'before:deploy:deploy',
     }).then(({ cfTemplate: template }) => {
diff --git a/test/unit/lib/plugins/aws/package/lib/getHashForFilePath.test.js b/test/unit/lib/plugins/aws/package/lib/get-hash-for-file-path.test.js
similarity index 85%
rename from test/unit/lib/plugins/aws/package/lib/getHashForFilePath.test.js
rename to test/unit/lib/plugins/aws/package/lib/get-hash-for-file-path.test.js
index 2963352df45..3bf62e74ba5 100644
--- a/test/unit/lib/plugins/aws/package/lib/getHashForFilePath.test.js
+++ b/test/unit/lib/plugins/aws/package/lib/get-hash-for-file-path.test.js
@@ -1,8 +1,8 @@
 'use strict';
 
 const chai = require('chai');
-const getHashForFilePath = require('../../../../../../../lib/plugins/aws/package/lib/getHashForFilePath');
-const fs = require('fs');
+const getHashForFilePath = require('../../../../../../../lib/plugins/aws/package/lib/get-hash-for-file-path');
+const fsp = require('fs').promises;
 const path = require('path');
 
 chai.use(require('chai-as-promised'));
@@ -13,7 +13,7 @@ describe('getHashForFilePath', () => {
   let filePath;
   before(async () => {
     filePath = path.join(process.cwd(), 'file.txt');
-    await fs.promises.writeFile(filePath, 'content');
+    await fsp.writeFile(filePath, 'content');
   });
 
   it('correctly generates hash for existing file', async () => {
diff --git a/test/unit/lib/plugins/aws/package/lib/mergeCustomProviderResources.test.js b/test/unit/lib/plugins/aws/package/lib/merge-custom-provider-resources.test.js
similarity index 87%
rename from test/unit/lib/plugins/aws/package/lib/mergeCustomProviderResources.test.js
rename to test/unit/lib/plugins/aws/package/lib/merge-custom-provider-resources.test.js
index e750e820b84..d47adba4307 100644
--- a/test/unit/lib/plugins/aws/package/lib/mergeCustomProviderResources.test.js
+++ b/test/unit/lib/plugins/aws/package/lib/merge-custom-provider-resources.test.js
@@ -3,7 +3,8 @@
 const path = require('path');
 const expect = require('chai').expect;
 const AwsPackage = require('../../../../../../../lib/plugins/aws/package/index');
-const Serverless = require('../../../../../../../lib/Serverless');
+const Serverless = require('../../../../../../../lib/serverless');
+const ServerlessError = require('../../../../../../../lib/serverless-error');
 
 describe('mergeCustomProviderResources', () => {
   let serverless;
@@ -11,7 +12,7 @@ describe('mergeCustomProviderResources', () => {
   let coreCloudFormationTemplate;
 
   beforeEach(() => {
-    serverless = new Serverless();
+    serverless = new Serverless({ commands: [], options: {} });
     awsPackage = new AwsPackage(serverless, {});
 
     coreCloudFormationTemplate = awsPackage.serverless.utils.readFileSync(
@@ -21,7 +22,8 @@ describe('mergeCustomProviderResources', () => {
       )
     );
 
-    awsPackage.serverless.service.provider.compiledCloudFormationTemplate = coreCloudFormationTemplate;
+    awsPackage.serverless.service.provider.compiledCloudFormationTemplate =
+      coreCloudFormationTemplate;
   });
 
   describe('#mergeCustomProviderResources()', () => {
@@ -168,48 +170,6 @@ describe('mergeCustomProviderResources', () => {
       ).to.deep.equal(coreCloudFormationTemplate.Outputs.ServerlessDeploymentBucketName);
     });
 
-    it('should create non-existent resource / attributes for resources.extensions.*', () => {
-      awsPackage.serverless.service.provider.compiledCloudFormationTemplate.Resources = {};
-
-      awsPackage.serverless.service.resources = {
-        extensions: {
-          SampleResource: {
-            Properties: {
-              PropertyA: 'new',
-            },
-            DependsOn: ['new'],
-            Metadata: {
-              key: 'value',
-              anotherKey: {
-                key2: 'value2',
-              },
-            },
-          },
-        },
-      };
-
-      awsPackage.mergeCustomProviderResources();
-      expect(awsPackage.serverless.service.provider.compiledCloudFormationTemplate.extensions).to
-        .not.exist;
-
-      expect(
-        awsPackage.serverless.service.provider.compiledCloudFormationTemplate.Resources
-      ).to.deep.equal({
-        SampleResource: {
-          Properties: {
-            PropertyA: 'new',
-          },
-          DependsOn: ['new'],
-          Metadata: {
-            key: 'value',
-            anotherKey: {
-              key2: 'value2',
-            },
-          },
-        },
-      });
-    });
-
     it('should overwrite for resources.extensions.*.{CreationPolicy,DeletionPolicy,UpdatePolicy,UpdateReplacePolicy}', () => {
       awsPackage.serverless.service.provider.compiledCloudFormationTemplate.Resources = {
         SampleResource: {
@@ -340,9 +300,9 @@ describe('mergeCustomProviderResources', () => {
         },
       };
 
-      expect(() => awsPackage.mergeCustomProviderResources()).to.throw(
-        /SampleResource: Sorry, extending the unsupported resource attribute at this point is not supported/
-      );
+      expect(() => awsPackage.mergeCustomProviderResources())
+        .to.throw(ServerlessError)
+        .with.property('code', 'RESOURCE_EXTENSION_UNSUPPORTED_ATTRIBUTE');
     });
   });
 });
diff --git a/test/unit/lib/plugins/aws/package/lib/mergeIamTemplates.test.js b/test/unit/lib/plugins/aws/package/lib/merge-iam-templates.test.js
similarity index 88%
rename from test/unit/lib/plugins/aws/package/lib/mergeIamTemplates.test.js
rename to test/unit/lib/plugins/aws/package/lib/merge-iam-templates.test.js
index 388e3e9b710..231129f2f34 100644
--- a/test/unit/lib/plugins/aws/package/lib/mergeIamTemplates.test.js
+++ b/test/unit/lib/plugins/aws/package/lib/merge-iam-templates.test.js
@@ -1,8 +1,12 @@
 'use strict';
 
-const expect = require('chai').expect;
+const chai = require('chai');
 const runServerless = require('../../../../../../utils/run-serverless');
 
+chai.use(require('chai-as-promised'));
+
+const expect = chai.expect;
+
 describe('lib/plugins/aws/package/lib/mergeIamTemplates.test.js', () => {
   describe('No default role', () => {
     it('should not create role resource if there are no functions', async () => {
@@ -14,11 +18,12 @@ describe('lib/plugins/aws/package/lib/mergeIamTemplates.test.js', () => {
       expect(cfTemplate.Resources).to.not.have.property(iamRoleLambdaExecution);
     });
 
-    it('should not create role resource with `provider.role`', async () => {
+    it('should not create role resource with deprecated `provider.role`', async () => {
       const { cfTemplate, awsNaming } = await runServerless({
         fixture: 'function',
         command: 'package',
         configExt: {
+          disabledDeprecations: ['PROVIDER_IAM_SETTINGS_V3'],
           provider: {
             name: 'aws',
             role: 'arn:aws:iam::YourAccountNumber:role/YourIamRole',
@@ -54,7 +59,7 @@ describe('lib/plugins/aws/package/lib/mergeIamTemplates.test.js', () => {
         command: 'package',
         configExt: {
           functions: {
-            foo: {
+            basic: {
               role: 'some:aws:arn:xx1:*:*',
             },
             other: {
@@ -175,6 +180,7 @@ describe('lib/plugins/aws/package/lib/mergeIamTemplates.test.js', () => {
           fixture: 'function',
           command: 'package',
           configExt: {
+            disabledDeprecations: ['PROVIDER_IAM_SETTINGS_V3'],
             provider: {
               iamRoleStatements: [
                 {
@@ -241,6 +247,7 @@ describe('lib/plugins/aws/package/lib/mergeIamTemplates.test.js', () => {
           fixture: 'function',
           command: 'package',
           configExt: {
+            disabledDeprecations: ['PROVIDER_IAM_SETTINGS_V3'],
             provider: {
               iam: {
                 role: {
@@ -274,6 +281,8 @@ describe('lib/plugins/aws/package/lib/mergeIamTemplates.test.js', () => {
             provider: {
               iam: {
                 role: {
+                  name: 'custom-default-role',
+                  path: '/custom-role-path/',
                   statements: [
                     {
                       Effect: 'Allow',
@@ -307,23 +316,32 @@ describe('lib/plugins/aws/package/lib/mergeIamTemplates.test.js', () => {
       });
 
       it('should support `provider.iam.role.name`', async () => {
-        const customRoleName = 'custom-default-role';
-        const { cfTemplate, awsNaming } = await runServerless({
-          fixture: 'function',
-          command: 'package',
-          configExt: {
-            provider: {
-              iam: {
-                role: {
-                  name: customRoleName,
+        const iamRoleLambdaResource = cfResources[naming.getRoleLogicalId()];
+        expect(iamRoleLambdaResource.Properties.RoleName).to.be.eq('custom-default-role');
+      });
+
+      it('should support `provider.iam.role.path`', async () => {
+        const iamRoleLambdaResource = cfResources[naming.getRoleLogicalId()];
+        expect(iamRoleLambdaResource.Properties.Path).to.be.eq('/custom-role-path/');
+      });
+
+      it('should reject an invalid `provider.iam.role.path`', async () => {
+        const customRolePath = '/invalid';
+        await expect(
+          runServerless({
+            fixture: 'function',
+            command: 'package',
+            configExt: {
+              provider: {
+                iam: {
+                  role: {
+                    path: customRolePath,
+                  },
                 },
               },
             },
-          },
-        });
-
-        const iamRoleLambdaResource = cfTemplate.Resources[awsNaming.getRoleLogicalId()];
-        expect(iamRoleLambdaResource.Properties.RoleName).to.be.eq(customRoleName);
+          })
+        ).to.be.eventually.rejectedWith(/'provider.iam.role.path': must match pattern/);
       });
 
       it('should support `provider.iam.role.statements`', async () => {
@@ -361,6 +379,32 @@ describe('lib/plugins/aws/package/lib/mergeIamTemplates.test.js', () => {
         );
       });
 
+      it('should support `provider.iam.role.permissionsBoundary` defined with CF intrinsic functions', async () => {
+        const { cfTemplate, awsNaming } = await runServerless({
+          fixture: 'function',
+          command: 'package',
+          configExt: {
+            provider: {
+              iam: {
+                role: {
+                  permissionsBoundary: {
+                    'Fn::Sub': 'arn:aws:iam::${AWS::AccountId}:policy/XCompanyBoundaries',
+                  },
+                },
+              },
+            },
+          },
+        });
+
+        const IamRoleLambdaExecution = awsNaming.getRoleLogicalId();
+        const {
+          Properties: { PermissionsBoundary },
+        } = cfTemplate.Resources[IamRoleLambdaExecution];
+        expect(PermissionsBoundary).to.deep.includes({
+          'Fn::Sub': 'arn:aws:iam::${AWS::AccountId}:policy/XCompanyBoundaries',
+        });
+      });
+
       it('should ensure needed IAM configuration when `provider.vpc` is configured', () => {
         const IamRoleLambdaExecution = naming.getRoleLogicalId();
         const iamResource = cfResources[IamRoleLambdaExecution];
@@ -378,11 +422,11 @@ describe('lib/plugins/aws/package/lib/mergeIamTemplates.test.js', () => {
       });
 
       it('should support `provider.logRetentionInDays`', () => {
-        const normalizedName = naming.getLogGroupLogicalId('foo');
+        const normalizedName = naming.getLogGroupLogicalId('basic');
         const iamResource = cfResources[normalizedName];
         expect(iamResource.Type).to.be.equal('AWS::Logs::LogGroup');
         expect(iamResource.Properties.RetentionInDays).to.be.equal(5);
-        expect(iamResource.Properties.LogGroupName).to.be.equal(`/aws/lambda/${service}-dev-foo`);
+        expect(iamResource.Properties.LogGroupName).to.be.equal(`/aws/lambda/${service}-dev-basic`);
       });
 
       it('should support `provider.iam.role.tags`', () => {
@@ -416,7 +460,11 @@ describe('lib/plugins/aws/package/lib/mergeIamTemplates.test.js', () => {
       let serverless;
       const customFunctionName = 'foo-bar';
       before(async () => {
-        const { awsNaming, cfTemplate, serverless: serverlessInstance } = await runServerless({
+        const {
+          awsNaming,
+          cfTemplate,
+          serverless: serverlessInstance,
+        } = await runServerless({
           fixture: 'function',
           command: 'package',
           configExt: {
diff --git a/test/unit/lib/plugins/aws/package/lib/saveCompiledTemplate.test.js b/test/unit/lib/plugins/aws/package/lib/save-compiled-template.test.js
similarity index 92%
rename from test/unit/lib/plugins/aws/package/lib/saveCompiledTemplate.test.js
rename to test/unit/lib/plugins/aws/package/lib/save-compiled-template.test.js
index ae0e40ce550..3cfedde920c 100644
--- a/test/unit/lib/plugins/aws/package/lib/saveCompiledTemplate.test.js
+++ b/test/unit/lib/plugins/aws/package/lib/save-compiled-template.test.js
@@ -4,7 +4,7 @@ const expect = require('chai').expect;
 const sinon = require('sinon');
 const path = require('path');
 const AwsPackage = require('../../../../../../../lib/plugins/aws/package/index');
-const Serverless = require('../../../../../../../lib/Serverless');
+const Serverless = require('../../../../../../../lib/serverless');
 const AwsProvider = require('../../../../../../../lib/plugins/aws/provider');
 
 describe('#saveCompiledTemplate()', () => {
@@ -15,7 +15,7 @@ describe('#saveCompiledTemplate()', () => {
 
   beforeEach(() => {
     const options = {};
-    serverless = new Serverless();
+    serverless = new Serverless({ commands: [], options: {} });
     serverless.setProvider('aws', new AwsProvider(serverless, options));
     awsPackage = new AwsPackage(serverless, options);
     serverless.serviceDir = 'my-service';
diff --git a/test/unit/lib/plugins/aws/package/lib/saveServiceState.test.js b/test/unit/lib/plugins/aws/package/lib/save-service-state.test.js
similarity index 95%
rename from test/unit/lib/plugins/aws/package/lib/saveServiceState.test.js
rename to test/unit/lib/plugins/aws/package/lib/save-service-state.test.js
index ca7077cac10..b466c077512 100644
--- a/test/unit/lib/plugins/aws/package/lib/saveServiceState.test.js
+++ b/test/unit/lib/plugins/aws/package/lib/save-service-state.test.js
@@ -4,7 +4,7 @@ const expect = require('chai').expect;
 const sinon = require('sinon');
 const path = require('path');
 const AwsPackage = require('../../../../../../../lib/plugins/aws/package/index');
-const Serverless = require('../../../../../../../lib/Serverless');
+const Serverless = require('../../../../../../../lib/serverless');
 const AwsProvider = require('../../../../../../../lib/plugins/aws/provider');
 
 describe('#saveServiceState()', () => {
@@ -15,7 +15,7 @@ describe('#saveServiceState()', () => {
 
   beforeEach(() => {
     const options = {};
-    serverless = new Serverless();
+    serverless = new Serverless({ commands: [], options: {} });
     serverless.setProvider('aws', new AwsProvider(serverless, options));
     awsPackage = new AwsPackage(serverless, options);
     serverless.serviceDir = 'my-service';
diff --git a/test/unit/lib/plugins/aws/package/lib/stripNullPropsFromTemplateResources.test.js b/test/unit/lib/plugins/aws/package/lib/strip-null-props-from-template-resources.test.js
similarity index 60%
rename from test/unit/lib/plugins/aws/package/lib/stripNullPropsFromTemplateResources.test.js
rename to test/unit/lib/plugins/aws/package/lib/strip-null-props-from-template-resources.test.js
index dfd3bcdcbba..76bde758e0f 100644
--- a/test/unit/lib/plugins/aws/package/lib/stripNullPropsFromTemplateResources.test.js
+++ b/test/unit/lib/plugins/aws/package/lib/strip-null-props-from-template-resources.test.js
@@ -11,7 +11,7 @@ describe('test/unit/lib/plugins/aws/package/lib/stripNullPropsFromTemplateResour
   before(async () => {
     const result = await runServerless({
       fixture: 'aws',
-      command: 'deploy',
+      command: 'package',
       lastLifecycleHookName: 'package:finalize',
       configExt: {
         resources: {
@@ -28,6 +28,24 @@ describe('test/unit/lib/plugins/aws/package/lib/stripNullPropsFromTemplateResour
                 ObjectLockEnabled: false,
               },
             },
+            myLambdaFunction: {
+              Type: 'AWS::Lambda::Function',
+              Properties: {
+                Environment: {
+                  Variables: {
+                    MYNULLVAR: null,
+                  },
+                },
+                Handler: 'index.handler',
+                Role: {
+                  'Fn::GetAtt': ['MyLambdaRole', 'Arn'],
+                },
+                Code: {
+                  S3Bucket: 's3-containing-lambda',
+                },
+                Runtime: 'nodejs12.x',
+              },
+            },
           },
         },
       },
@@ -39,6 +57,12 @@ describe('test/unit/lib/plugins/aws/package/lib/stripNullPropsFromTemplateResour
     expect(Object.keys(finalTemplate.Resources.myBucket.Properties).length).to.equal(0);
   });
 
+  it('Should remove null values within nested objects in resource properties', async () => {
+    expect(
+      Object.keys(finalTemplate.Resources.myLambdaFunction.Properties.Environment.Variables).length
+    ).to.equal(0);
+  });
+
   it('Should not affect resources without null props', async () => {
     expect(Object.keys(finalTemplate.Resources.anotherBucket.Properties).length).to.equal(1);
   });
diff --git a/test/unit/lib/plugins/aws/provider.test.js b/test/unit/lib/plugins/aws/provider.test.js
index e36ce853675..7c9691eaf68 100644
--- a/test/unit/lib/plugins/aws/provider.test.js
+++ b/test/unit/lib/plugins/aws/provider.test.js
@@ -12,7 +12,7 @@ const sinon = require('sinon');
 const overrideEnv = require('process-utils/override-env');
 
 const AwsProvider = require('../../../../../lib/plugins/aws/provider');
-const Serverless = require('../../../../../lib/Serverless');
+const Serverless = require('../../../../../lib/serverless');
 const runServerless = require('../../../../utils/run-serverless');
 
 chai.use(require('chai-as-promised'));
@@ -31,7 +31,7 @@ describe('AwsProvider', () => {
 
   beforeEach(() => {
     ({ restoreEnv } = overrideEnv());
-    serverless = new Serverless(options);
+    serverless = new Serverless({ ...options, commands: [], options: {} });
     serverless.cli = new serverless.classes.CLI();
     awsProvider = new AwsProvider(serverless, options);
   });
@@ -53,6 +53,8 @@ describe('AwsProvider', () => {
             even if http event is present and stage is ${stage}`, () => {
           const config = {
             stage,
+            commands: [],
+            options: {},
           };
           serverless = new Serverless(config);
 
@@ -164,17 +166,19 @@ describe('AwsProvider', () => {
   describe('#request()', () => {
     let awsRequestStub;
     let awsProviderProxied;
-    let logStub;
 
     beforeEach(() => {
-      logStub = sinon.stub();
       awsRequestStub = sinon.stub().resolves();
       awsRequestStub.memoized = sinon.stub().resolves();
       const AwsProviderProxyquired = proxyquire
         .noCallThru()
         .load('../../../../../lib/plugins/aws/provider.js', {
           '../../aws/request': awsRequestStub,
-          '@serverless/utils/log': logStub,
+          '@serverless/utils/log': {
+            log: {
+              debug: sinon.stub(),
+            },
+          },
         });
       awsProviderProxied = new AwsProviderProxyquired(serverless, options);
     });
@@ -213,21 +217,6 @@ describe('AwsProvider', () => {
           expect(awsRequestStub.memoized).to.have.been.calledTwice;
         });
     });
-
-    it('should detect incompatible legacy use of aws request and print a debug warning', () => {
-      // Enable debug log
-      process.env.SLS_DEBUG = true;
-      return awsProviderProxied
-        .request('S3', 'getObject', {}, 'incompatible string option')
-        .then(() => {
-          expect(logStub).to.have.been.calledWith(
-            'WARNING: Inappropriate call of provider.request()'
-          );
-        })
-        .finally(() => {
-          process.env.SLS_DEBUG = false;
-        });
-    });
   });
 
   describe('#getServerlessDeploymentBucketName()', () => {
@@ -359,12 +348,16 @@ describe('test/unit/lib/plugins/aws/provider.test.js', () => {
           this.secretAccessKey = 'secret';
         }
       }
+      class FakeMetadataService {}
+
       const modulesCacheStub = {
         'aws-sdk': {
           SharedIniFileCredentials,
           EnvironmentCredentials,
           CloudFormation: FakeCloudFormation,
+          config: {},
         },
+        'aws-sdk/lib/metadata_service': FakeMetadataService,
       };
       const { serverless } = await runServerless({
         fixture: 'aws',
@@ -813,8 +806,7 @@ aws_secret_access_key = CUSTOMSECRET
                 images: {
                   invalidimage: {
                     path: './',
-                    uri:
-                      '000000000000.dkr.ecr.sa-east-1.amazonaws.com/test-lambda-docker@sha256:6bb600b4d6e1d7cf521097177dd0c4e9ea373edb91984a505333be8ac9455d38',
+                    uri: '000000000000.dkr.ecr.sa-east-1.amazonaws.com/test-lambda-docker@sha256:6bb600b4d6e1d7cf521097177dd0c4e9ea373edb91984a505333be8ac9455d38',
                   },
                 },
               },
@@ -832,6 +824,95 @@ aws_secret_access_key = CUSTOMSECRET
       );
     });
 
+    it('should fail if `functions[].image` references image with both buildArgs and uri', async () => {
+      await expect(
+        runServerless({
+          fixture: 'function',
+          command: 'package',
+          configExt: {
+            provider: {
+              ecr: {
+                images: {
+                  invalidimage: {
+                    buildArgs: {
+                      TESTKEY: 'TESTVAL',
+                    },
+                    uri: '000000000000.dkr.ecr.sa-east-1.amazonaws.com/test-lambda-docker@sha256:6bb600b4d6e1d7cf521097177dd0c4e9ea373edb91984a505333be8ac9455d38',
+                  },
+                },
+              },
+            },
+            functions: {
+              fnProviderInvalidImage: {
+                image: 'invalidimage',
+              },
+            },
+          },
+        })
+      ).to.be.eventually.rejected.and.have.property(
+        'code',
+        'ECR_IMAGE_BOTH_URI_AND_BUILDARGS_DEFINED_ERROR'
+      );
+    });
+
+    it('should fail if `functions[].image` references image with both cacheFrom and uri', async () => {
+      await expect(
+        runServerless({
+          fixture: 'function',
+          command: 'package',
+          configExt: {
+            provider: {
+              ecr: {
+                images: {
+                  invalidimage: {
+                    cacheFrom: ['my-image:latest'],
+                    uri: '000000000000.dkr.ecr.sa-east-1.amazonaws.com/test-lambda-docker@sha256:6bb600b4d6e1d7cf521097177dd0c4e9ea373edb91984a505333be8ac9455d38',
+                  },
+                },
+              },
+            },
+            functions: {
+              fnProviderInvalidImage: {
+                image: 'invalidimage',
+              },
+            },
+          },
+        })
+      ).to.be.eventually.rejected.and.have.property(
+        'code',
+        'ECR_IMAGE_BOTH_URI_AND_CACHEFROM_DEFINED_ERROR'
+      );
+    });
+
+    it('should fail if `functions[].image` references image with both platform and uri', async () => {
+      await expect(
+        runServerless({
+          fixture: 'function',
+          command: 'package',
+          configExt: {
+            provider: {
+              ecr: {
+                images: {
+                  invalidimage: {
+                    platform: 'TESTVAL',
+                    uri: '000000000000.dkr.ecr.sa-east-1.amazonaws.com/test-lambda-docker@sha256:6bb600b4d6e1d7cf521097177dd0c4e9ea373edb91984a505333be8ac9455d38',
+                  },
+                },
+              },
+            },
+            functions: {
+              fnProviderInvalidImage: {
+                image: 'invalidimage',
+              },
+            },
+          },
+        })
+      ).to.be.eventually.rejected.and.have.property(
+        'code',
+        'ECR_IMAGE_BOTH_URI_AND_PLATFORM_DEFINED_ERROR'
+      );
+    });
+
     it('should fail if `functions[].image` references image without path and uri', async () => {
       await expect(
         runServerless({
@@ -909,8 +990,7 @@ aws_secret_access_key = CUSTOMSECRET
               foo: {
                 image: {
                   name: 'baseimage',
-                  uri:
-                    '000000000000.dkr.ecr.sa-east-1.amazonaws.com/test-lambda-docker@sha256:6bb600b4d6e1d7cf521097177dd0c4e9ea373edb91984a505333be8ac9455d38',
+                  uri: '000000000000.dkr.ecr.sa-east-1.amazonaws.com/test-lambda-docker@sha256:6bb600b4d6e1d7cf521097177dd0c4e9ea373edb91984a505333be8ac9455d38',
                 },
               },
             },
@@ -1124,6 +1204,7 @@ aws_secret_access_key = CUSTOMSECRET
       const proxyEndpoint = `https://${repositoryUri}`;
       const describeRepositoriesStub = sinon.stub();
       const createRepositoryStub = sinon.stub();
+      const createRepositoryStubScanOnPush = sinon.stub();
       const baseAwsRequestStubMap = {
         STS: {
           getCallerIdentity: {
@@ -1152,7 +1233,7 @@ aws_secret_access_key = CUSTOMSECRET
       });
       const modulesCacheStub = {
         'child-process-ext/spawn': spawnExtStub,
-        './lib/utils/telemetry/generatePayload.js': async () => ({}),
+        './lib/utils/telemetry/generate-payload.js': () => ({}),
       };
 
       beforeEach(() => {
@@ -1216,6 +1297,53 @@ aws_secret_access_key = CUSTOMSECRET
         expect(spawnExtStub).to.be.calledWith('docker', ['push', `${repositoryUri}:baseimage`]);
       });
 
+      it('should work correctly when repository does not exist beforehand and scanOnPush is set', async () => {
+        const awsRequestStubMap = {
+          ...baseAwsRequestStubMap,
+          ECR: {
+            ...baseAwsRequestStubMap.ECR,
+            describeRepositories: describeRepositoriesStub.throws({
+              providerError: { code: 'RepositoryNotFoundException' },
+            }),
+            createRepository: createRepositoryStubScanOnPush.resolves({
+              repository: { repositoryUri },
+            }),
+          },
+        };
+
+        const { awsNaming, cfTemplate } = await runServerless({
+          fixture: 'ecr',
+          command: 'package',
+          awsRequestStubMap,
+          modulesCacheStub,
+          configExt: {
+            provider: {
+              ecr: {
+                scanOnPush: true,
+                images: {
+                  baseimage: {
+                    path: './',
+                    file: 'Dockerfile.dev',
+                  },
+                },
+              },
+            },
+          },
+        });
+
+        const functionCfLogicalId = awsNaming.getLambdaLogicalId('foo');
+        const functionCfConfig = cfTemplate.Resources[functionCfLogicalId].Properties;
+        const versionCfConfig = findVersionCfConfig(cfTemplate.Resources, functionCfLogicalId);
+
+        expect(functionCfConfig.Code.ImageUri).to.deep.equal(`${repositoryUri}@sha256:${imageSha}`);
+        expect(versionCfConfig.CodeSha256).to.equal(imageSha);
+        expect(describeRepositoriesStub).to.be.calledOnce;
+        expect(createRepositoryStubScanOnPush).to.be.calledOnce;
+        expect(createRepositoryStubScanOnPush.args[0][0].imageScanningConfiguration).to.deep.equal({
+          scanOnPush: true,
+        });
+      });
+
       it('should work correctly when repository does not exist beforehand', async () => {
         const awsRequestStubMap = {
           ...baseAwsRequestStubMap,
@@ -1355,7 +1483,7 @@ aws_secret_access_key = CUSTOMSECRET
         ]);
       });
 
-      it('should emit warning if docker login stores unencrypted credentials', async () => {
+      it('should work correctly when image is defined with implicit path in provider', async () => {
         const awsRequestStubMap = {
           ...baseAwsRequestStubMap,
           ECR: {
@@ -1366,31 +1494,37 @@ aws_secret_access_key = CUSTOMSECRET
             createRepository: createRepositoryStub,
           },
         };
-
-        const { stdoutData } = await runServerless({
+        const { awsNaming, cfTemplate } = await runServerless({
           fixture: 'ecr',
           command: 'package',
           awsRequestStubMap,
-          modulesCacheStub: {
-            ...modulesCacheStub,
-            'child-process-ext/spawn': sinon
-              .stub()
-              .returns({
-                stdBuffer: `digest: sha256:${imageSha} size: 1787`,
-              })
-              .onCall(3)
-              .throws({ stdBuffer: 'no basic auth credentials' })
-              .onCall(4)
-              .returns({ stdBuffer: 'your password will be stored unencrypted' }),
+          modulesCacheStub,
+          configExt: {
+            provider: {
+              ecr: {
+                images: {
+                  baseimage: './',
+                },
+              },
+            },
           },
         });
 
-        expect(stdoutData).to.include(
-          'WARNING: Docker authentication token will be stored unencrypted in docker config.'
-        );
+        const functionCfLogicalId = awsNaming.getLambdaLogicalId('foo');
+        const functionCfConfig = cfTemplate.Resources[functionCfLogicalId].Properties;
+        const versionCfConfig = Object.values(cfTemplate.Resources).find(
+          (resource) =>
+            resource.Type === 'AWS::Lambda::Version' &&
+            resource.Properties.FunctionName.Ref === functionCfLogicalId
+        ).Properties;
+
+        expect(functionCfConfig.Code.ImageUri).to.deep.equal(`${repositoryUri}@sha256:${imageSha}`);
+        expect(versionCfConfig.CodeSha256).to.equal(imageSha);
+        expect(describeRepositoriesStub).to.be.calledOnce;
+        expect(createRepositoryStub.notCalled).to.be.true;
       });
 
-      it('should work correctly when image is defined with implicit path in provider', async () => {
+      it('should work correctly when image is defined with `file` set', async () => {
         const awsRequestStubMap = {
           ...baseAwsRequestStubMap,
           ECR: {
@@ -1401,7 +1535,11 @@ aws_secret_access_key = CUSTOMSECRET
             createRepository: createRepositoryStub,
           },
         };
-        const { awsNaming, cfTemplate } = await runServerless({
+        const {
+          awsNaming,
+          cfTemplate,
+          fixtureData: { servicePath: serviceDir },
+        } = await runServerless({
           fixture: 'ecr',
           command: 'package',
           awsRequestStubMap,
@@ -1410,7 +1548,10 @@ aws_secret_access_key = CUSTOMSECRET
             provider: {
               ecr: {
                 images: {
-                  baseimage: './',
+                  baseimage: {
+                    path: './',
+                    file: 'Dockerfile.dev',
+                  },
                 },
               },
             },
@@ -1429,9 +1570,17 @@ aws_secret_access_key = CUSTOMSECRET
         expect(versionCfConfig.CodeSha256).to.equal(imageSha);
         expect(describeRepositoriesStub).to.be.calledOnce;
         expect(createRepositoryStub.notCalled).to.be.true;
+        expect(spawnExtStub).to.be.calledWith('docker', [
+          'build',
+          '-t',
+          `${awsNaming.getEcrRepositoryName()}:baseimage`,
+          '-f',
+          path.join(serviceDir, 'Dockerfile.dev'),
+          './',
+        ]);
       });
 
-      it('should work correctly when image is defined with `file` set', async () => {
+      it('should work correctly when image is defined with `cacheFrom` set', async () => {
         const awsRequestStubMap = {
           ...baseAwsRequestStubMap,
           ECR: {
@@ -1458,6 +1607,7 @@ aws_secret_access_key = CUSTOMSECRET
                   baseimage: {
                     path: './',
                     file: 'Dockerfile.dev',
+                    cacheFrom: ['my-image:latest'],
                   },
                 },
               },
@@ -1483,11 +1633,13 @@ aws_secret_access_key = CUSTOMSECRET
           `${awsNaming.getEcrRepositoryName()}:baseimage`,
           '-f',
           path.join(serviceDir, 'Dockerfile.dev'),
+          '--cache-from',
+          'my-image:latest',
           './',
         ]);
       });
 
-      it('should work correctly when image is defined with `cacheFrom` set', async () => {
+      it('should work correctly when image is defined with `buildArgs` set', async () => {
         const awsRequestStubMap = {
           ...baseAwsRequestStubMap,
           ECR: {
@@ -1514,7 +1666,9 @@ aws_secret_access_key = CUSTOMSECRET
                   baseimage: {
                     path: './',
                     file: 'Dockerfile.dev',
-                    cacheFrom: ['my-image:latest'],
+                    buildArgs: {
+                      TESTKEY: 'TESTVAL',
+                    },
                   },
                 },
               },
@@ -1540,13 +1694,13 @@ aws_secret_access_key = CUSTOMSECRET
           `${awsNaming.getEcrRepositoryName()}:baseimage`,
           '-f',
           path.join(serviceDir, 'Dockerfile.dev'),
-          '--cache-from',
-          'my-image:latest',
+          '--build-arg',
+          'TESTKEY=TESTVAL',
           './',
         ]);
       });
 
-      it('should work correctly when image is defined with `buildArgs` set', async () => {
+      it('should work correctly when image is defined with `platform` set', async () => {
         const awsRequestStubMap = {
           ...baseAwsRequestStubMap,
           ECR: {
@@ -1573,9 +1727,7 @@ aws_secret_access_key = CUSTOMSECRET
                   baseimage: {
                     path: './',
                     file: 'Dockerfile.dev',
-                    buildArgs: {
-                      TESTKEY: 'TESTVAL',
-                    },
+                    platform: 'TESTVAL',
                   },
                 },
               },
@@ -1601,9 +1753,8 @@ aws_secret_access_key = CUSTOMSECRET
           `${awsNaming.getEcrRepositoryName()}:baseimage`,
           '-f',
           path.join(serviceDir, 'Dockerfile.dev'),
-          '--build-arg',
-          'TESTKEY=TESTVAL',
           './',
+          '--platform=TESTVAL',
         ]);
       });
 
diff --git a/test/unit/lib/plugins/aws/remove/index.test.js b/test/unit/lib/plugins/aws/remove/index.test.js
index de5ab0e9900..2cd2a9d1b83 100644
--- a/test/unit/lib/plugins/aws/remove/index.test.js
+++ b/test/unit/lib/plugins/aws/remove/index.test.js
@@ -33,6 +33,7 @@ describe('test/unit/lib/plugins/aws/remove/index.test.js', () => {
     S3: {
       deleteObjects: deleteObjectsStub,
       listObjectsV2: { Contents: [{ Key: 'first' }, { Key: 'second' }] },
+      headBucket: {},
     },
     CloudFormation: {
       describeStackEvents: describeStackEventsStub,
@@ -105,6 +106,97 @@ describe('test/unit/lib/plugins/aws/remove/index.test.js', () => {
     expect(deleteRepositoryStub).not.to.be.called;
   });
 
+  it('executes expected operations related to files removal when S3 bucket has files', async () => {
+    await runServerless({
+      fixture: 'function',
+      command: 'remove',
+      awsRequestStubMap: {
+        ...awsRequestStubMap,
+        S3: {
+          deleteObjects: deleteObjectsStub,
+          listObjectsV2: { Contents: [] },
+          headBucket: {},
+        },
+      },
+    });
+
+    expect(deleteObjectsStub).not.to.be.called;
+  });
+
+  it('executes expected operations related to files removal when S3 bucket is empty', async () => {
+    await runServerless({
+      fixture: 'function',
+      command: 'remove',
+      awsRequestStubMap,
+    });
+
+    expect(deleteObjectsStub).to.be.calledWithExactly({
+      Bucket: 'resource-id',
+      Delete: {
+        Objects: [{ Key: 'first' }, { Key: 'second' }],
+      },
+    });
+  });
+
+  it('skips attempts to remove S3 objects if S3 bucket not found', async () => {
+    const { awsNaming } = await runServerless({
+      fixture: 'function',
+      command: 'remove',
+      awsRequestStubMap: {
+        ...awsRequestStubMap,
+        S3: {
+          deleteObjects: deleteObjectsStub,
+          listObjectsV2: { Contents: [{ Key: 'first' }, { Key: 'second' }] },
+          headBucket: () => {
+            const err = new Error('err');
+            err.code = 'AWS_S3_HEAD_BUCKET_NOT_FOUND';
+            throw err;
+          },
+        },
+      },
+    });
+
+    expect(deleteObjectsStub).not.to.be.called;
+    expect(deleteStackStub).to.be.calledWithExactly({ StackName: awsNaming.getStackName() });
+    expect(describeStackEventsStub).to.be.calledWithExactly({
+      StackName: awsNaming.getStackName(),
+    });
+    expect(describeStackEventsStub.calledAfter(deleteStackStub)).to.be.true;
+  });
+
+  it('skips attempts to remove S3 objects if S3 bucket resource missing from CloudFormation template', async () => {
+    const headBucketStub = sinon.stub();
+    const { awsNaming } = await runServerless({
+      fixture: 'function',
+      command: 'remove',
+      awsRequestStubMap: {
+        ...awsRequestStubMap,
+        S3: {
+          ...awsRequestStubMap.S3,
+          headBucket: headBucketStub,
+        },
+        CloudFormation: {
+          ...awsRequestStubMap.CloudFormation,
+          describeStackResource: () => {
+            const err = new Error('does not exist for stack');
+            err.providerError = {
+              code: 'ValidationError',
+            };
+            throw err;
+          },
+        },
+      },
+    });
+
+    expect(headBucketStub).not.to.be.called;
+    expect(deleteObjectsStub).not.to.be.called;
+    expect(deleteStackStub).to.be.calledWithExactly({ StackName: awsNaming.getStackName() });
+    expect(describeStackEventsStub).to.be.calledWithExactly({
+      StackName: awsNaming.getStackName(),
+    });
+    expect(describeStackEventsStub.calledAfter(deleteStackStub)).to.be.true;
+  });
+
   it('removes ECR repository if it exists', async () => {
     describeRepositoriesStub.resolves();
     const { awsNaming } = await runServerless({
@@ -120,18 +212,89 @@ describe('test/unit/lib/plugins/aws/remove/index.test.js', () => {
     });
   });
 
-  it('emits warning when repository cannot be accessed due to denied access but there are images defined', async () => {
-    describeRepositoriesStub.throws({ providerError: { code: 'AccessDeniedException' } });
+  it('should execute expected operations with versioning enabled if no object versions are present', async () => {
+    const listObjectVersionsStub = sinon.stub().resolves();
 
-    const { stdoutData } = await runServerless({
-      fixture: 'ecr',
+    const { serverless } = await runServerless({
       command: 'remove',
-      awsRequestStubMap,
+      fixture: 'function',
+      configExt: {
+        provider: {
+          deploymentPrefix: 'serverless',
+          deploymentBucket: {
+            name: 'bucket',
+            versioning: true,
+          },
+        },
+      },
+      awsRequestStubMap: {
+        ...awsRequestStubMap,
+        S3: {
+          listObjectVersions: listObjectVersionsStub,
+          headBucket: {},
+        },
+      },
+    });
+
+    expect(listObjectVersionsStub).to.be.calledWithExactly({
+      Bucket: 'bucket',
+      Prefix: `serverless/${serverless.service.service}/dev`,
     });
+  });
 
-    expect(stdoutData).to.include('WARNING: Could not access ECR repository due to denied access');
-    expect(stdoutData).to.include('ECR repository removal will be skipped.');
+  it('should execute expected operations with versioning enabled if object versions are present', async () => {
+    const listObjectVersionsStub = sinon.stub().resolves({
+      Versions: [
+        { Key: 'object1', VersionId: null },
+        { Key: 'object2', VersionId: 'v1' },
+      ],
+      DeleteMarkers: [{ Key: 'object3', VersionId: 'v2' }],
+    });
 
-    expect(deleteRepositoryStub).not.to.be.called;
+    const innerDeleteObjectsStub = sinon.stub().resolves({
+      Deleted: [
+        { Key: 'object1', VersionId: null },
+        { Key: 'object2', VersionId: 'v1' },
+        { Key: 'object3', VersionId: 'v2' },
+      ],
+    });
+
+    const { serverless } = await runServerless({
+      command: 'remove',
+      fixture: 'function',
+      configExt: {
+        provider: {
+          deploymentPrefix: 'serverless',
+          deploymentBucket: {
+            name: 'bucket',
+            versioning: true,
+          },
+        },
+      },
+      awsRequestStubMap: {
+        ...awsRequestStubMap,
+        S3: {
+          listObjectVersions: listObjectVersionsStub,
+          deleteObjects: innerDeleteObjectsStub,
+          headBucket: {},
+        },
+      },
+    });
+
+    expect(listObjectVersionsStub).to.be.calledWithExactly({
+      Bucket: 'bucket',
+      Prefix: `serverless/${serverless.service.service}/dev`,
+    });
+
+    expect(innerDeleteObjectsStub).to.be.calledWithExactly({
+      Bucket: 'bucket',
+      Delete: {
+        Objects: [
+          { Key: 'object1', VersionId: null },
+          { Key: 'object2', VersionId: 'v1' },
+          { Key: 'object3', VersionId: 'v2' },
+        ],
+      },
+    });
   });
 });
diff --git a/test/unit/lib/plugins/aws/remove/lib/bucket.test.js b/test/unit/lib/plugins/aws/remove/lib/bucket.test.js
deleted file mode 100644
index 8ad896b7939..00000000000
--- a/test/unit/lib/plugins/aws/remove/lib/bucket.test.js
+++ /dev/null
@@ -1,133 +0,0 @@
-'use strict';
-
-const expect = require('chai').expect;
-const sinon = require('sinon');
-const AwsProvider = require('../../../../../../../lib/plugins/aws/provider');
-const AwsRemove = require('../../../../../../../lib/plugins/aws/remove/index');
-const Serverless = require('../../../../../../../lib/Serverless');
-
-describe('emptyS3Bucket', () => {
-  const options = {
-    stage: 'dev',
-    region: 'us-east-1',
-  };
-  const serverless = new Serverless();
-  serverless.service.service = 'emptyS3Bucket';
-  serverless.setProvider('aws', new AwsProvider(serverless, options));
-
-  let awsRemove;
-
-  beforeEach(() => {
-    awsRemove = new AwsRemove(serverless, options);
-    awsRemove.serverless.cli = new serverless.classes.CLI();
-  });
-
-  describe('#setServerlessDeploymentBucketName()', () => {
-    it('should store the name of the Serverless deployment bucket in the "this" variable', () => {
-      const getServerlessDeploymentBucketNameStub = sinon
-        .stub(awsRemove.provider, 'getServerlessDeploymentBucketName')
-        .resolves('new-service-dev-us-east-1-12345678');
-
-      return awsRemove.setServerlessDeploymentBucketName().then(() => {
-        expect(awsRemove.bucketName).to.equal('new-service-dev-us-east-1-12345678');
-        expect(getServerlessDeploymentBucketNameStub.calledOnce).to.be.equal(true);
-        expect(getServerlessDeploymentBucketNameStub.calledWithExactly()).to.be.equal(true);
-        awsRemove.provider.getServerlessDeploymentBucketName.restore();
-      });
-    });
-  });
-
-  describe('#listObjects()', () => {
-    it('should resolve if no objects are present', () => {
-      const listObjectsStub = sinon.stub(awsRemove.provider, 'request').resolves();
-
-      const stage = awsRemove.provider.getStage();
-      const prefix = awsRemove.provider.getDeploymentPrefix();
-
-      return awsRemove.listObjects().then(() => {
-        expect(listObjectsStub.calledOnce).to.be.equal(true);
-        expect(
-          listObjectsStub.calledWithExactly('S3', 'listObjectsV2', {
-            Bucket: awsRemove.bucketName,
-            Prefix: `${prefix}/${serverless.service.service}/${stage}`,
-          })
-        ).to.be.equal(true);
-        expect(awsRemove.objectsInBucket.length).to.equal(0);
-        awsRemove.provider.request.restore();
-      });
-    });
-
-    it('should push objects to the array if present', () => {
-      const listObjectsStub = sinon.stub(awsRemove.provider, 'request').resolves({
-        Contents: [{ Key: 'object1' }, { Key: 'object2' }],
-      });
-
-      const stage = awsRemove.provider.getStage();
-      const prefix = awsRemove.provider.getDeploymentPrefix();
-
-      return awsRemove.listObjects().then(() => {
-        expect(listObjectsStub.calledOnce).to.be.equal(true);
-        expect(
-          listObjectsStub.calledWithExactly('S3', 'listObjectsV2', {
-            Bucket: awsRemove.bucketName,
-            Prefix: `${prefix}/${serverless.service.service}/${stage}`,
-          })
-        ).to.be.equal(true);
-        expect(awsRemove.objectsInBucket[0]).to.deep.equal({ Key: 'object1' });
-        expect(awsRemove.objectsInBucket[1]).to.deep.equal({ Key: 'object2' });
-        awsRemove.provider.request.restore();
-      });
-    });
-  });
-
-  describe('#deleteObjects()', () => {
-    it('should delete all objects in the S3 bucket', () => {
-      awsRemove.objectsInBucket = [{ Key: 'foo' }];
-
-      const deleteObjectsStub = sinon.stub(awsRemove.provider, 'request').resolves();
-
-      return awsRemove.deleteObjects().then(() => {
-        expect(deleteObjectsStub.calledOnce).to.be.equal(true);
-        expect(
-          deleteObjectsStub.calledWithExactly('S3', 'deleteObjects', {
-            Bucket: awsRemove.bucketName,
-            Delete: {
-              Objects: awsRemove.objectsInBucket,
-            },
-          })
-        ).to.be.equal(true);
-        awsRemove.provider.request.restore();
-      });
-    });
-
-    it('should resolve if objectsInBucket is empty', (done) => {
-      awsRemove.objectsInBucket = [];
-
-      awsRemove.deleteObjects().then(() => {
-        done();
-      });
-    });
-  });
-
-  describe('#emptyS3Bucket()', () => {
-    it('should run promise chain in order', () => {
-      const setServerlessDeploymentBucketNameStub = sinon
-        .stub(awsRemove, 'setServerlessDeploymentBucketName')
-        .resolves();
-      const listObjectsStub = sinon.stub(awsRemove, 'listObjects').resolves();
-      const deleteObjectsStub = sinon.stub(awsRemove, 'deleteObjects').resolves();
-
-      return awsRemove.emptyS3Bucket().then(() => {
-        expect(setServerlessDeploymentBucketNameStub.calledOnce).to.be.equal(true);
-        expect(listObjectsStub.calledAfter(setServerlessDeploymentBucketNameStub)).to.be.equal(
-          true
-        );
-        expect(deleteObjectsStub.calledAfter(listObjectsStub)).to.be.equal(true);
-
-        awsRemove.setServerlessDeploymentBucketName.restore();
-        awsRemove.listObjects.restore();
-        awsRemove.deleteObjects.restore();
-      });
-    });
-  });
-});
diff --git a/test/unit/lib/plugins/aws/remove/lib/stack.test.js b/test/unit/lib/plugins/aws/remove/lib/stack.test.js
index 7e039991ae1..e3a06e9e52d 100644
--- a/test/unit/lib/plugins/aws/remove/lib/stack.test.js
+++ b/test/unit/lib/plugins/aws/remove/lib/stack.test.js
@@ -4,14 +4,14 @@ const expect = require('chai').expect;
 const sinon = require('sinon');
 const AwsProvider = require('../../../../../../../lib/plugins/aws/provider');
 const AwsRemove = require('../../../../../../../lib/plugins/aws/remove/index');
-const Serverless = require('../../../../../../../lib/Serverless');
+const Serverless = require('../../../../../../../lib/serverless');
 
 describe('removeStack', () => {
   const options = {
     stage: 'dev',
     region: 'us-east-1',
   };
-  const serverless = new Serverless();
+  const serverless = new Serverless({ commands: [], options: {} });
   serverless.service.service = 'removeStack';
   serverless.setProvider('aws', new AwsProvider(serverless, options));
 
diff --git a/test/unit/lib/plugins/aws/rollbackFunction.test.js b/test/unit/lib/plugins/aws/rollback-function.test.js
similarity index 92%
rename from test/unit/lib/plugins/aws/rollbackFunction.test.js
rename to test/unit/lib/plugins/aws/rollback-function.test.js
index ae9885680ce..4c244d27338 100644
--- a/test/unit/lib/plugins/aws/rollbackFunction.test.js
+++ b/test/unit/lib/plugins/aws/rollback-function.test.js
@@ -2,24 +2,23 @@
 
 const expect = require('chai').expect;
 const sinon = require('sinon');
-const Serverless = require('../../../../../lib/Serverless');
+const Serverless = require('../../../../../lib/serverless');
 const AwsProvider = require('../../../../../lib/plugins/aws/provider');
-const CLI = require('../../../../../lib/classes/CLI');
+const CLI = require('../../../../../lib/classes/cli');
 const proxyquire = require('proxyquire');
 
 describe('AwsRollbackFunction', () => {
   let serverless;
   let awsRollbackFunction;
-  let consoleLogStub;
   let fetchStub;
   let AwsRollbackFunction;
 
   beforeEach(() => {
     fetchStub = sinon.stub().resolves({ buffer: () => {} });
-    AwsRollbackFunction = proxyquire('../../../../../lib/plugins/aws/rollbackFunction.js', {
+    AwsRollbackFunction = proxyquire('../../../../../lib/plugins/aws/rollback-function.js', {
       'node-fetch': fetchStub,
     });
-    serverless = new Serverless();
+    serverless = new Serverless({ commands: [], options: {} });
     serverless.service.functions = {
       hello: {
         handler: true,
@@ -34,11 +33,6 @@ describe('AwsRollbackFunction', () => {
     serverless.setProvider('aws', new AwsProvider(serverless, options));
     serverless.cli = new CLI(serverless);
     awsRollbackFunction = new AwsRollbackFunction(serverless, options);
-    consoleLogStub = sinon.stub(serverless.cli, 'consoleLog').returns();
-  });
-
-  afterEach(() => {
-    serverless.cli.consoleLog.restore();
   });
 
   describe('#constructor()', () => {
@@ -108,7 +102,6 @@ describe('AwsRollbackFunction', () => {
               Qualifier: '4711',
             })
           ).to.equal(true);
-          expect(consoleLogStub.called).to.equal(true);
           expect(result).to.deep.equal({ function: 'hello' });
         });
       });
@@ -140,7 +133,6 @@ describe('AwsRollbackFunction', () => {
               Qualifier: '4711',
             })
           ).to.equal(true);
-          expect(consoleLogStub.called).to.equal(true);
         });
       });
     });
@@ -171,7 +163,6 @@ describe('AwsRollbackFunction', () => {
               Qualifier: '4711',
             })
           ).to.equal(true);
-          expect(consoleLogStub.called).to.equal(true);
         });
       });
     });
@@ -214,7 +205,6 @@ describe('AwsRollbackFunction', () => {
             ZipFile: zipBuffer,
           })
         ).to.equal(true);
-        expect(consoleLogStub.called).to.equal(true);
       });
     });
   });
diff --git a/test/unit/lib/plugins/aws/rollback.test.js b/test/unit/lib/plugins/aws/rollback.test.js
index 146d5bb72e4..57d5c473bb0 100644
--- a/test/unit/lib/plugins/aws/rollback.test.js
+++ b/test/unit/lib/plugins/aws/rollback.test.js
@@ -2,7 +2,7 @@
 
 const AwsProvider = require('../../../../../lib/plugins/aws/provider');
 const AwsRollback = require('../../../../../lib/plugins/aws/rollback');
-const Serverless = require('../../../../../lib/Serverless');
+const Serverless = require('../../../../../lib/serverless');
 const expect = require('chai').expect;
 const assert = require('chai').assert;
 const sinon = require('sinon');
@@ -15,7 +15,7 @@ describe('AwsRollback', () => {
   let provider;
 
   const createInstance = (options) => {
-    serverless = new Serverless();
+    serverless = new Serverless({ commands: [], options: {} });
     provider = new AwsProvider(serverless, options);
     serverless.setProvider('aws', provider);
     serverless.service.service = 'rollback';
@@ -91,8 +91,7 @@ describe('AwsRollback', () => {
       const s3Objects = [
         {
           // eslint-disable-next-line max-len
-          Key:
-            'serverless/rollback/dev/1476779096930-2016-10-18T08:24:56.930Z/compiled-cloudformation-template.json',
+          Key: 'serverless/rollback/dev/1476779096930-2016-10-18T08:24:56.930Z/compiled-cloudformation-template.json',
         },
         {
           Key: 'serverless/rollback/dev/1476779096930-2016-10-18T08:24:56.930Z/test.zip',
@@ -124,8 +123,8 @@ describe('AwsRollback', () => {
         .then(() => {
           assert.isNotOk(true, 'setStackToUpdate should not resolve');
         })
-        .catch((errorMessage) => {
-          expect(errorMessage).to.include("Couldn't find any existing deployments");
+        .catch((error) => {
+          expect(error.code).to.equal('ROLLBACK_DEPLOYMENTS_NOT_FOUND');
           expect(listObjectsStub.calledOnce).to.be.equal(true);
           expect(
             listObjectsStub.calledWithExactly('S3', 'listObjectsV2', {
@@ -141,8 +140,7 @@ describe('AwsRollback', () => {
       const s3Objects = [
         {
           // eslint-disable-next-line max-len
-          Key:
-            'serverless/rollback/dev/2000000000000-2016-10-18T08:24:56.930Z/compiled-cloudformation-template.json',
+          Key: 'serverless/rollback/dev/2000000000000-2016-10-18T08:24:56.930Z/compiled-cloudformation-template.json',
         },
         {
           Key: 'serverless/rollback/dev/2000000000000-2016-10-18T08:24:56.930Z/test.zip',
@@ -159,8 +157,8 @@ describe('AwsRollback', () => {
         .then(() => {
           assert.isNotOk(true, 'setStackToUpdate should not resolve');
         })
-        .catch((errorMessage) => {
-          expect(errorMessage).to.include("Couldn't find a deployment for the timestamp");
+        .catch((error) => {
+          expect(error.code).to.equal('ROLLBACK_DEPLOYMENT_NOT_FOUND');
           expect(listObjectsStub.calledOnce).to.be.equal(true);
           expect(
             listObjectsStub.calledWithExactly('S3', 'listObjectsV2', {
@@ -176,8 +174,7 @@ describe('AwsRollback', () => {
       const s3Objects = [
         {
           // eslint-disable-next-line max-len
-          Key:
-            'serverless/rollback/dev/1476779096930-2016-10-18T08:24:56.930Z/compiled-cloudformation-template.json',
+          Key: 'serverless/rollback/dev/1476779096930-2016-10-18T08:24:56.930Z/compiled-cloudformation-template.json',
         },
         {
           Key: 'serverless/rollback/dev/1476779096930-2016-10-18T08:24:56.930Z/test.zip',
diff --git a/test/unit/lib/plugins/aws/utils/findAndGroupDeployments.test.js b/test/unit/lib/plugins/aws/utils/find-and-group-deployments.test.js
similarity index 82%
rename from test/unit/lib/plugins/aws/utils/findAndGroupDeployments.test.js
rename to test/unit/lib/plugins/aws/utils/find-and-group-deployments.test.js
index 4df749cc925..493fff36f81 100644
--- a/test/unit/lib/plugins/aws/utils/findAndGroupDeployments.test.js
+++ b/test/unit/lib/plugins/aws/utils/find-and-group-deployments.test.js
@@ -1,7 +1,7 @@
 'use strict';
 
 const expect = require('chai').expect;
-const findAndGroupDeployments = require('../../../../../../lib/plugins/aws/utils/findAndGroupDeployments');
+const findAndGroupDeployments = require('../../../../../../lib/plugins/aws/utils/find-and-group-deployments');
 
 describe('#findAndGroupDeployments()', () => {
   it('should return an empty result in case no S3 objects are provided', () => {
@@ -16,24 +16,21 @@ describe('#findAndGroupDeployments()', () => {
     const s3Objects = [
       {
         // eslint-disable-next-line max-len
-        Key:
-          'serverless/test/dev/1476779096930-2016-10-18T08:24:56.930Z/compiled-cloudformation-template.json',
+        Key: 'serverless/test/dev/1476779096930-2016-10-18T08:24:56.930Z/compiled-cloudformation-template.json',
       },
       {
         Key: 'serverless/test/dev/1476779096930-2016-10-18T08:24:56.930Z/test.zip',
       },
       {
         // eslint-disable-next-line max-len
-        Key:
-          'serverless/test/dev/1476779278222-2016-10-18T08:27:58.222Z/compiled-cloudformation-template.json',
+        Key: 'serverless/test/dev/1476779278222-2016-10-18T08:27:58.222Z/compiled-cloudformation-template.json',
       },
       {
         Key: 'serverless/test/dev/1476779278222-2016-10-18T08:27:58.222Z/test.zip',
       },
       {
         // eslint-disable-next-line max-len
-        Key:
-          'serverless/test/dev/1476781042481-2016-10-18T08:57:22.481Z/compiled-cloudformation-template.json',
+        Key: 'serverless/test/dev/1476781042481-2016-10-18T08:57:22.481Z/compiled-cloudformation-template.json',
       },
       {
         Key: 'serverless/test/dev/1476781042481-2016-10-18T08:57:22.481Z/test.zip',
diff --git a/test/unit/lib/plugins/aws/utils/findReferences.test.js b/test/unit/lib/plugins/aws/utils/find-references.test.js
similarity index 98%
rename from test/unit/lib/plugins/aws/utils/findReferences.test.js
rename to test/unit/lib/plugins/aws/utils/find-references.test.js
index 00d79d061cb..2711b3f6463 100644
--- a/test/unit/lib/plugins/aws/utils/findReferences.test.js
+++ b/test/unit/lib/plugins/aws/utils/find-references.test.js
@@ -1,7 +1,7 @@
 'use strict';
 
 const expect = require('chai').expect;
-const findReferences = require('../../../../../../lib/plugins/aws/utils/findReferences');
+const findReferences = require('../../../../../../lib/plugins/aws/utils/find-references');
 
 describe('#findReferences()', () => {
   it('should succeed on invalid input', () => {
diff --git a/test/unit/lib/plugins/aws/utils/formatLambdaLogEvent.test.js b/test/unit/lib/plugins/aws/utils/format-lambda-log-event.test.js
similarity index 66%
rename from test/unit/lib/plugins/aws/utils/formatLambdaLogEvent.test.js
rename to test/unit/lib/plugins/aws/utils/format-lambda-log-event.test.js
index 015a8fb74a7..c97d40132ae 100644
--- a/test/unit/lib/plugins/aws/utils/formatLambdaLogEvent.test.js
+++ b/test/unit/lib/plugins/aws/utils/format-lambda-log-event.test.js
@@ -2,30 +2,32 @@
 
 const expect = require('chai').expect;
 const dayjs = require('dayjs');
-const chalk = require('chalk');
-const os = require('os');
-const formatLambdaLogEvent = require('../../../../../../lib/plugins/aws/utils/formatLambdaLogEvent');
+const { style } = require('@serverless/utils/log');
+const formatLambdaLogEvent = require('../../../../../../lib/plugins/aws/utils/format-lambda-log-event');
 
 describe('#formatLambdaLogEvent()', () => {
   it('should format invocation report', () => {
     const msg =
-      'REPORT\tRequestId: 99c30000-b01a-11e5-93f7-b8e85631a00e\tDuration: 0.40 ms\tBilled Duration: 100 ms\tMemory Size: 512 MB\tMax Memory Used: 30 MB';
+      'REPORT RequestId: 99c30000-b01a-11e5-93f7-b8e85631a00e\tDuration: 0.40 ms\tBilled Duration: 100 ms\tMemory Size: 512 MB\tMax Memory Used: 30 MB';
+    const expectedMsg = style.aside(
+      'END Duration: 0.40 ms\tBilled Duration: 100 ms\tMemory Size: 512 MB\tMax Memory Used: 30 MB'
+    );
 
-    expect(formatLambdaLogEvent(msg)).to.equal(chalk.grey(msg + os.EOL));
+    expect(formatLambdaLogEvent(msg)).to.deep.equal(expectedMsg);
   });
 
   it('should format invocation failures', () => {
     const msg = 'Process exited before completing request';
-    expect(formatLambdaLogEvent(msg)).to.equal(chalk.red(msg));
+    expect(formatLambdaLogEvent(msg)).to.deep.equal(style.error(msg));
   });
 
   it('should format lambda console.log lines', () => {
-    const nodeLogLine = '2016-01-01T12:00:00Z\t99c30000-b01a-11e5-93f7-b8e85631a00e\ttest';
+    const nodeLogLine = '2016-01-01T12:00:00Z\t99c30000-b01a-11e5-93f7-b8e85631a00e\tINFO\ttest';
 
     let expectedLogMessage = '';
-    const date = dayjs('2016-01-01T12:00:00Z').format('YYYY-MM-DD HH:mm:ss.SSS (Z)');
-    expectedLogMessage += `${chalk.green(date)}\t`;
-    expectedLogMessage += `${chalk.yellow('99c30000-b01a-11e5-93f7-b8e85631a00e')}\t`;
+    const date = dayjs('2016-01-01T12:00:00Z').format('YYYY-MM-DD HH:mm:ss.SSS');
+    expectedLogMessage += `${style.aside(date)}\t`;
+    expectedLogMessage += 'INFO\t';
     expectedLogMessage += 'test';
 
     expect(formatLambdaLogEvent(nodeLogLine)).to.equal(expectedLogMessage);
@@ -36,9 +38,8 @@ describe('#formatLambdaLogEvent()', () => {
       '[INFO]\t2016-01-01T12:00:00Z\t99c30000-b01a-11e5-93f7-b8e85631a00e\ttest';
 
     let expectedLogMessage = '';
-    const date = dayjs('2016-01-01T12:00:00Z').format('YYYY-MM-DD HH:mm:ss.SSS (Z)');
-    expectedLogMessage += `${chalk.green(date)}\t`;
-    expectedLogMessage += `${chalk.yellow('99c30000-b01a-11e5-93f7-b8e85631a00e')}\t`;
+    const date = dayjs('2016-01-01T12:00:00Z').format('YYYY-MM-DD HH:mm:ss.SSS');
+    expectedLogMessage += `${style.aside(date)}\t`;
     expectedLogMessage += `${'[INFO]'}\t`;
     expectedLogMessage += 'test';
 
diff --git a/test/unit/lib/plugins/aws/utils/getS3EndpointForRegion.test.js b/test/unit/lib/plugins/aws/utils/get-s3-endpoint-for-region.test.js
similarity index 63%
rename from test/unit/lib/plugins/aws/utils/getS3EndpointForRegion.test.js
rename to test/unit/lib/plugins/aws/utils/get-s3-endpoint-for-region.test.js
index c8b87ebbb41..84736a9aeb1 100644
--- a/test/unit/lib/plugins/aws/utils/getS3EndpointForRegion.test.js
+++ b/test/unit/lib/plugins/aws/utils/get-s3-endpoint-for-region.test.js
@@ -1,6 +1,6 @@
 'use strict';
 const expect = require('chai').expect;
-const getS3EndpointForRegion = require('../../../../../../lib/plugins/aws/utils/getS3EndpointForRegion');
+const getS3EndpointForRegion = require('../../../../../../lib/plugins/aws/utils/get-s3-endpoint-for-region');
 
 describe('getS3EndpointForRegion', () => {
   it('should return standard endpoint for us-east-1', () => {
@@ -18,4 +18,14 @@ describe('getS3EndpointForRegion', () => {
     const actual = getS3EndpointForRegion('cn-north-1');
     expect(actual).to.equal(expected);
   });
+  it('should return US isolated region', () => {
+    const expected = 's3.us-iso-east-1.c2s.ic.gov';
+    const actual = getS3EndpointForRegion('us-iso-east-1');
+    expect(actual).to.equal(expected);
+  });
+  it('should return US isolated B region', () => {
+    const expected = 's3.us-isob-east-1.sc2s.sgov.gov';
+    const actual = getS3EndpointForRegion('us-isob-east-1');
+    expect(actual).to.equal(expected);
+  });
 });
diff --git a/test/unit/lib/plugins/aws/utils/getS3ObjectsFromStacks.test.js b/test/unit/lib/plugins/aws/utils/get-s3-objects-from-stacks.test.js
similarity index 83%
rename from test/unit/lib/plugins/aws/utils/getS3ObjectsFromStacks.test.js
rename to test/unit/lib/plugins/aws/utils/get-s3-objects-from-stacks.test.js
index 064737bd632..dd04f628f5f 100644
--- a/test/unit/lib/plugins/aws/utils/getS3ObjectsFromStacks.test.js
+++ b/test/unit/lib/plugins/aws/utils/get-s3-objects-from-stacks.test.js
@@ -1,7 +1,7 @@
 'use strict';
 
 const expect = require('chai').expect;
-const getS3ObjectsFromStacks = require('../../../../../../lib/plugins/aws/utils/getS3ObjectsFromStacks');
+const getS3ObjectsFromStacks = require('../../../../../../lib/plugins/aws/utils/get-s3-objects-from-stacks');
 
 describe('#getS3ObjectsFromStacks()', () => {
   it('should return an empty result in case no stacks are provided', () => {
@@ -35,14 +35,12 @@ describe('#getS3ObjectsFromStacks()', () => {
     const expected = [
       // eslint-disable-next-line max-len
       {
-        Key:
-          'serverless/test/dev/1476779096930-2016-10-18T08:24:56.930Z/compiled-cloudformation-template.json',
+        Key: 'serverless/test/dev/1476779096930-2016-10-18T08:24:56.930Z/compiled-cloudformation-template.json',
       },
       { Key: 'serverless/test/dev/1476779096930-2016-10-18T08:24:56.930Z/test.zip' },
       // eslint-disable-next-line max-len
       {
-        Key:
-          'serverless/test/dev/1476779278222-2016-10-18T08:27:58.222Z/compiled-cloudformation-template.json',
+        Key: 'serverless/test/dev/1476779278222-2016-10-18T08:27:58.222Z/compiled-cloudformation-template.json',
       },
       { Key: 'serverless/test/dev/1476779278222-2016-10-18T08:27:58.222Z/test.zip' },
     ];
diff --git a/test/unit/lib/plugins/aws/utils/parse-s3-uri.test.js b/test/unit/lib/plugins/aws/utils/parse-s3-uri.test.js
new file mode 100644
index 00000000000..fb86cbcfa4a
--- /dev/null
+++ b/test/unit/lib/plugins/aws/utils/parse-s3-uri.test.js
@@ -0,0 +1,74 @@
+'use strict';
+const expect = require('chai').expect;
+const parseS3URI = require('../../../../../../lib/plugins/aws/utils/parse-s3-uri');
+
+describe('test/unit/lib/plugins/aws/utils/parse-s3-uri.test.js', () => {
+  it('should parse an S3 URI', () => {
+    const expected = {
+      Bucket: 'test-bucket',
+      Key: 'path/to/artifact.zip',
+    };
+    const actual = parseS3URI('s3://test-bucket/path/to/artifact.zip');
+    expect(actual).to.deep.equal(expected);
+  });
+  it('should parse an old style S3 URL', () => {
+    const expected = {
+      Bucket: 'test-bucket',
+      Key: 'path/to/artifact.zip',
+    };
+    const actual = parseS3URI('https://s3.amazonaws.com/test-bucket/path/to/artifact.zip');
+    expect(actual).to.deep.equal(expected);
+  });
+  it('should parse an old style S3 URL with region', () => {
+    const expected = {
+      Bucket: 'test-bucket',
+      Key: 'path/to/artifact.zip',
+    };
+    const actual = parseS3URI(
+      'https://s3.us-west-1.amazonaws.com/test-bucket/path/to/artifact.zip'
+    );
+    expect(actual).to.deep.equal(expected);
+  });
+  it('should parse another old style S3 URL with region', () => {
+    const expected = {
+      Bucket: 'test-bucket',
+      Key: 'path/to/artifact.zip',
+    };
+    const actual = parseS3URI(
+      'https://s3-us-west-1.amazonaws.com/test-bucket/path/to/artifact.zip'
+    );
+    expect(actual).to.deep.equal(expected);
+  });
+  it('should parse a new style S3 URL', () => {
+    const expected = {
+      Bucket: 'test-bucket',
+      Key: 'path/to/artifact.zip',
+    };
+    const actual = parseS3URI('https://test-bucket.s3.amazonaws.com/path/to/artifact.zip');
+    expect(actual).to.deep.equal(expected);
+  });
+  it('should parse a new style S3 URL with region', () => {
+    const expected = {
+      Bucket: 'test-bucket',
+      Key: 'path/to/artifact.zip',
+    };
+    const actual = parseS3URI(
+      'https://test-bucket.s3.eu-west-1.amazonaws.com/path/to/artifact.zip'
+    );
+    expect(actual).to.deep.equal(expected);
+  });
+  it('should parse another new style S3 URL with region', () => {
+    const expected = {
+      Bucket: 'test-bucket',
+      Key: 'path/to/artifact.zip',
+    };
+    const actual = parseS3URI(
+      'https://test-bucket.s3-eu-west-1.amazonaws.com/path/to/artifact.zip'
+    );
+    expect(actual).to.deep.equal(expected);
+  });
+  it('should reject non S3 URLs', () => {
+    const actual = parseS3URI('https://example.com/path/to/artifact.zip');
+    expect(actual).to.be.null;
+  });
+});
diff --git a/test/unit/lib/plugins/aws/utils/resolveCfImportValue.test.js b/test/unit/lib/plugins/aws/utils/resolve-cf-import-value.test.js
similarity index 94%
rename from test/unit/lib/plugins/aws/utils/resolveCfImportValue.test.js
rename to test/unit/lib/plugins/aws/utils/resolve-cf-import-value.test.js
index 0389c768286..eb87ca71acd 100644
--- a/test/unit/lib/plugins/aws/utils/resolveCfImportValue.test.js
+++ b/test/unit/lib/plugins/aws/utils/resolve-cf-import-value.test.js
@@ -2,7 +2,7 @@
 
 const expect = require('chai').expect;
 const BbPromise = require('bluebird');
-const resolveCfImportValue = require('../../../../../../lib/plugins/aws/utils/resolveCfImportValue');
+const resolveCfImportValue = require('../../../../../../lib/plugins/aws/utils/resolve-cf-import-value');
 
 describe('#resolveCfImportValue', () => {
   it('should return matching exported value if found', () => {
diff --git a/test/unit/lib/plugins/aws/utils/resolveCfRefValue.test.js b/test/unit/lib/plugins/aws/utils/resolve-cf-ref-value.test.js
similarity index 96%
rename from test/unit/lib/plugins/aws/utils/resolveCfRefValue.test.js
rename to test/unit/lib/plugins/aws/utils/resolve-cf-ref-value.test.js
index 073f24c2764..c001af1dc64 100644
--- a/test/unit/lib/plugins/aws/utils/resolveCfRefValue.test.js
+++ b/test/unit/lib/plugins/aws/utils/resolve-cf-ref-value.test.js
@@ -2,7 +2,7 @@
 
 const expect = require('chai').expect;
 const BbPromise = require('bluebird');
-const resolveCfRefValue = require('../../../../../../lib/plugins/aws/utils/resolveCfRefValue');
+const resolveCfRefValue = require('../../../../../../lib/plugins/aws/utils/resolve-cf-ref-value');
 
 describe('#resolveCfRefValue', () => {
   it('should return matching exported value if found', () => {
diff --git a/test/unit/lib/plugins/aws/utils/resolveLambdaTarget.test.js b/test/unit/lib/plugins/aws/utils/resolve-lambda-target.test.js
similarity index 95%
rename from test/unit/lib/plugins/aws/utils/resolveLambdaTarget.test.js
rename to test/unit/lib/plugins/aws/utils/resolve-lambda-target.test.js
index 3342089e0ab..ec78d053cbf 100644
--- a/test/unit/lib/plugins/aws/utils/resolveLambdaTarget.test.js
+++ b/test/unit/lib/plugins/aws/utils/resolve-lambda-target.test.js
@@ -1,7 +1,7 @@
 'use strict';
 
 const expect = require('chai').expect;
-const resolveLambdaTarget = require('../../../../../../lib/plugins/aws/utils/resolveLambdaTarget');
+const resolveLambdaTarget = require('../../../../../../lib/plugins/aws/utils/resolve-lambda-target');
 
 describe('#resolveLambdaTarget', () => {
   it('should return a reference to Lambda Arn when provisionnedConcurrency is not set', () => {
diff --git a/test/unit/lib/plugins/config.test.js b/test/unit/lib/plugins/config.test.js
index e089709a204..62958ad44d3 100644
--- a/test/unit/lib/plugins/config.test.js
+++ b/test/unit/lib/plugins/config.test.js
@@ -1,20 +1,13 @@
 'use strict';
 
 const fs = require('fs');
-const path = require('path');
-const os = require('os');
 const BbPromise = require('bluebird');
 const { expect } = require('chai');
 const config = require('@serverless/utils/config');
 const runServerless = require('../../../utils/run-serverless');
-const isTabCompletionSupported = require('../../../../lib/utils/tabCompletion/isSupported');
 
 BbPromise.promisifyAll(fs);
 
-const unexpected = () => {
-  throw new Error('Unexpected');
-};
-
 describe('Config', () => {
   it('should support "config credentials" command', () =>
     runServerless({
@@ -23,55 +16,14 @@ describe('Config', () => {
       options: { provider: 'aws', key: 'foo', secret: 'bar' },
     }));
 
-  if (isTabCompletionSupported) {
-    it('should support "config tabcompletion install" command', () =>
-      runServerless({
-        cwd: os.homedir(),
-        env: { SHELL: 'bash' },
-        command: 'config tabcompletion install',
-      }).then(() =>
-        Promise.all([
-          fs
-            .readFileAsync(path.resolve(os.homedir(), '.bashrc'), 'utf8')
-            .then((bashRcContent) =>
-              expect(bashRcContent).to.include(' ~/.config/tabtab/__tabtab.bash')
-            ),
-          fs.readFileAsync(path.resolve(os.homedir(), '.config/tabtab/serverless.bash'), 'utf8'),
-          fs.readFileAsync(path.resolve(os.homedir(), '.config/tabtab/sls.bash'), 'utf8'),
-        ])
-      ));
-
-    it('should support "config tabcompletion uninstall" command', () =>
-      runServerless({
-        cwd: os.homedir(),
-        env: { SHELL: 'bash' },
-        command: 'config tabcompletion install',
-      }).then(() =>
-        runServerless({
-          cwd: os.homedir(),
-          env: { SHELL: 'bash' },
-          command: 'config tabcompletion uninstall',
-        }).then(() =>
-          Promise.all([
-            fs
-              .readFileAsync(path.resolve(os.homedir(), '.config/tabtab/serverless.bash'))
-              .then(unexpected, (error) => expect(error.code).to.equal('ENOENT')),
-            fs
-              .readFileAsync(path.resolve(os.homedir(), '.config/tabtab/sls.bash'))
-              .then(unexpected, (error) => expect(error.code).to.equal('ENOENT')),
-          ])
-        )
-      ));
-  }
-
   it('should turn on autoupdate with "--autoupdate"', async () => {
     await runServerless({
       cwd: require('os').homedir(),
       command: 'config',
       options: { autoupdate: true },
       modulesCacheStub: {
-        './lib/utils/npmPackage/isGlobal.js': async () => true,
-        './lib/utils/npmPackage/isWritable.js': async () => true,
+        './lib/utils/npm-package/is-global.js': async () => true,
+        './lib/utils/npm-package/is-writable.js': async () => true,
       },
     });
     expect(config.get('autoUpdate.enabled')).to.be.true;
diff --git a/test/unit/lib/plugins/create/create.test.js b/test/unit/lib/plugins/create/create.test.js
index 303855c563e..38be9dcbb74 100644
--- a/test/unit/lib/plugins/create/create.test.js
+++ b/test/unit/lib/plugins/create/create.test.js
@@ -5,12 +5,13 @@ const fs = require('fs');
 const path = require('path');
 const fse = require('fs-extra');
 const Create = require('../../../../../lib/plugins/create/create');
-const Serverless = require('../../../../../lib/Serverless');
+const Serverless = require('../../../../../lib/serverless');
 const sinon = require('sinon');
-const walkDirSync = require('../../../../../lib/utils/fs/walkDirSync');
-const download = require('../../../../../lib/utils/downloadTemplateFromRepo');
+const walkDirSync = require('../../../../../lib/utils/fs/walk-dir-sync');
+const download = require('../../../../../lib/utils/download-template-from-repo');
 const { getTmpDirPath } = require('../../../../utils/fs');
 
+chai.use(require('chai-as-promised'));
 chai.use(require('sinon-chai'));
 const { expect } = require('chai');
 
@@ -18,14 +19,12 @@ const templatesPath = path.resolve(__dirname, '../../../../../lib/plugins/create
 
 describe('Create', () => {
   let create;
-  let logSpy;
 
   before(() => {
-    const serverless = new Serverless();
+    const serverless = new Serverless({ commands: [], options: {} });
     const options = {};
     create = new Create(serverless, options);
     create.serverless.cli = new serverless.classes.CLI();
-    logSpy = sinon.spy(create.serverless.cli, 'log');
   });
 
   describe('#constructor()', () => {
@@ -79,40 +78,11 @@ describe('Create', () => {
           expect(downloadStub).to.have.been.calledOnce;
         });
       });
-
-      it('should resolve if download succeeds', () => {
-        downloadStub.resolves('serverless');
-        create.options['template-url'] = 'https://github.com/serverless/serverless';
-
-        return create.create().then(() => {
-          const installationMessage = logSpy.args.filter((arg) =>
-            arg[0].includes('installed "serverless"')
-          );
-
-          expect(downloadStub).to.have.been.calledOnce;
-          expect(installationMessage[0]).to.have.lengthOf(1);
-        });
-      });
-
-      it('should resolve if download succeeds and display the desired service name', () => {
-        downloadStub.resolves('serverless');
-        create.options['template-url'] = 'https://github.com/serverless/serverless';
-        create.options.name = 'sls';
-
-        return create.create().then(() => {
-          const installationMessage = logSpy.args.filter((arg) =>
-            arg[0].includes('installed "serverless" as "sls"')
-          );
-
-          expect(downloadStub).to.have.been.calledOnce;
-          expect(installationMessage[0]).to.have.lengthOf(1);
-        });
-      });
     });
 
     it('should throw error if user passed unsupported template', () => {
       create.options.template = 'invalid-template';
-      expect(() => create.create()).to.throw(Error);
+      return expect(create.create()).to.be.eventually.rejectedWith(Error);
     });
 
     it('should overwrite the name for the service if user passed name', () => {
@@ -135,15 +105,6 @@ describe('Create', () => {
       });
     });
 
-    it('should display ascii greeting', () => {
-      process.chdir(tmpDir);
-
-      const greetingStub = sinon.stub(create.serverless.cli, 'asciiGreeting');
-      return create.create().then(() => {
-        expect(greetingStub.callCount).to.be.equal(1);
-      });
-    });
-
     it('should generate scaffolding for "aws-clojure-gradle" template', () => {
       process.chdir(tmpDir);
       create.options.template = 'aws-clojure-gradle';
@@ -218,11 +179,10 @@ describe('Create', () => {
         expect(dirContent).to.include(path.join('src', 'functions', 'hello', 'mock.json'));
         expect(dirContent).to.include(path.join('src', 'functions', 'hello', 'schema.ts'));
         expect(dirContent).to.include(path.join('src', 'functions', 'index.ts'));
-        expect(dirContent).to.include(path.join('src', 'libs', 'apiGateway.ts'));
+        expect(dirContent).to.include(path.join('src', 'libs', 'api-gateway.ts'));
         expect(dirContent).to.include(path.join('src', 'libs', 'lambda.ts'));
         expect(dirContent).to.include('tsconfig.json');
         expect(dirContent).to.include('tsconfig.paths.json');
-        expect(dirContent).to.include('webpack.config.js');
       });
     });
 
@@ -1081,7 +1041,7 @@ describe('Create', () => {
       const dirContent = fs.readdirSync(tmpDir);
 
       expect(dirContent).to.include('serverless.yml');
-      expect(() => create.create()).to.throw(Error);
+      return expect(create.create()).to.eventually.be.rejectedWith(Error);
     });
 
     it('should throw error if the directory for the service already exists in cwd', () => {
@@ -1092,7 +1052,7 @@ describe('Create', () => {
       fse.mkdirsSync(path.join(tmpDir, create.options.path));
       process.chdir(tmpDir);
 
-      expect(() => create.create()).to.throw(Error);
+      return expect(create.create()).to.eventually.be.rejectedWith(Error);
     });
 
     it('should copy "aws-nodejs" template from local path', () => {
diff --git a/test/unit/lib/plugins/deploy.test.js b/test/unit/lib/plugins/deploy.test.js
index fa162ef7ff7..2e6c6bfcab1 100644
--- a/test/unit/lib/plugins/deploy.test.js
+++ b/test/unit/lib/plugins/deploy.test.js
@@ -3,7 +3,7 @@
 const BbPromise = require('bluebird');
 const chai = require('chai');
 const Deploy = require('../../../../lib/plugins/deploy');
-const Serverless = require('../../../../lib/Serverless');
+const Serverless = require('../../../../lib/serverless');
 const sinon = require('sinon');
 
 // Configure chai
@@ -17,7 +17,7 @@ describe('Deploy', () => {
   let options;
 
   beforeEach(() => {
-    serverless = new Serverless();
+    serverless = new Serverless({ commands: [], options: {} });
     options = {};
     deploy = new Deploy(serverless, options);
     deploy.serverless.providers = { validProvider: true };
@@ -79,22 +79,6 @@ describe('Deploy', () => {
       );
     });
 
-    it('should execute deploy function if a function option is given', () => {
-      deploy.options.package = false;
-      deploy.options.function = 'myfunc';
-      deploy.serverless.service.package.path = false;
-
-      return expect(deploy.hooks['before:deploy:deploy']()).to.be.fulfilled.then(() =>
-        BbPromise.all([
-          expect(spawnPackageStub).to.not.be.called,
-          expect(spawnDeployFunctionStub).to.be.calledOnce,
-          expect(spawnDeployFunctionStub).to.be.calledWithExactly('deploy:function', {
-            terminateLifecycleAfterExecution: true,
-          }),
-        ])
-      );
-    });
-
     it('should throw an error if provider does not exist', () => {
       deploy.serverless.service.provider.name = 'nonExistentProvider';
 
diff --git a/test/unit/lib/plugins/info.test.js b/test/unit/lib/plugins/info.test.js
index b3e8a21f712..97b67506c87 100644
--- a/test/unit/lib/plugins/info.test.js
+++ b/test/unit/lib/plugins/info.test.js
@@ -2,7 +2,7 @@
 
 const chai = require('chai');
 const Info = require('../../../../lib/plugins/info');
-const Serverless = require('../../../../lib/Serverless');
+const Serverless = require('../../../../lib/serverless');
 
 const expect = chai.expect;
 chai.use(require('chai-as-promised'));
@@ -13,7 +13,7 @@ describe('Info', () => {
   let serverless;
 
   beforeEach(() => {
-    serverless = new Serverless();
+    serverless = new Serverless({ commands: [], options: {} });
     info = new Info(serverless);
   });
 
diff --git a/test/unit/lib/plugins/install.test.js b/test/unit/lib/plugins/install.test.js
index 0a6df6bc2c4..a9956cd9ef0 100644
--- a/test/unit/lib/plugins/install.test.js
+++ b/test/unit/lib/plugins/install.test.js
@@ -1,10 +1,10 @@
 'use strict';
 
 const chai = require('chai');
-const Serverless = require('../../../../lib/Serverless');
+const Serverless = require('../../../../lib/serverless');
 const Install = require('../../../../lib/plugins/install.js');
 const sinon = require('sinon');
-const download = require('../../../../lib/utils/downloadTemplateFromRepo');
+const download = require('../../../../lib/utils/download-template-from-repo');
 const fse = require('fs-extra');
 const path = require('path');
 const { getTmpDirPath } = require('../../../utils/fs');
@@ -16,7 +16,6 @@ describe('Install', () => {
   let install;
   let serverless;
   let cwd;
-  let logSpy;
 
   let serviceDir;
 
@@ -29,11 +28,10 @@ describe('Install', () => {
 
     serviceDir = tmpDir;
 
-    serverless = new Serverless();
+    serverless = new Serverless({ commands: ['print'], options: {}, serviceDir: null });
     install = new Install(serverless);
     return serverless.init().then(() => {
       install.serverless.cli = new serverless.classes.CLI();
-      logSpy = sinon.spy(install.serverless.cli, 'log');
     });
   });
 
@@ -112,12 +110,7 @@ describe('Install', () => {
       downloadStub.resolves('remote-service');
 
       return install.install().then(() => {
-        const installationMessage = logSpy.args.filter((arg) =>
-          arg[0].includes('installed "remote-service"')
-        );
-
         expect(downloadStub).to.have.been.calledOnce;
-        expect(installationMessage[0]).to.have.lengthOf(1);
       });
     });
 
@@ -127,12 +120,7 @@ describe('Install', () => {
       downloadStub.resolves('remote-service');
 
       return install.install().then(() => {
-        const installationMessage = logSpy.args.filter((arg) =>
-          arg[0].includes('installed "remote-service" as "remote"')
-        );
-
         expect(downloadStub).to.have.been.calledOnce;
-        expect(installationMessage[0]).to.have.lengthOf(1);
       });
     });
   });
diff --git a/test/unit/lib/plugins/interactiveCli/autoUpdate.test.js b/test/unit/lib/plugins/interactiveCli/autoUpdate.test.js
deleted file mode 100644
index 993ef6bbece..00000000000
--- a/test/unit/lib/plugins/interactiveCli/autoUpdate.test.js
+++ /dev/null
@@ -1,116 +0,0 @@
-'use strict';
-
-const { expect } = require('chai');
-const sinon = require('sinon');
-const runServerless = require('../../../../utils/run-serverless');
-const configureInquirerStub = require('@serverless/test/configure-inquirer-stub');
-
-const fs = require('fs');
-const BbPromise = require('bluebird');
-const configUtils = require('@serverless/utils/config');
-const inquirer = require('@serverless/utils/inquirer');
-
-const lifecycleHookNamesBlacklist = [
-  'before:interactiveCli:setupAws',
-  'interactiveCli:initializeService',
-  'interactiveCli:setupAws',
-  'interactiveCli:tabCompletion',
-];
-
-BbPromise.promisifyAll(fs);
-
-const modulesCacheStub = {
-  './lib/utils/npmPackage/isGlobal.js': async () => true,
-  './lib/utils/npmPackage/isWritable.js': async () => true,
-  '@serverless/utils/inquirer': inquirer,
-};
-
-describe('interactiveCli: autoUpdate', () => {
-  let backupIsTTY;
-
-  before(() => {
-    backupIsTTY = process.stdin.isTTY;
-    process.stdin.isTTY = true;
-  });
-  after(() => {
-    process.stdin.isTTY = backupIsTTY;
-  });
-
-  afterEach(() => {
-    configUtils.set('autoUpdate.isInteractiveSetupPromptDisabled', false);
-    sinon.restore();
-  });
-
-  it('Should not suggest auto update in non supported environments', async () => {
-    await runServerless({
-      noService: true,
-      command: '',
-      lifecycleHookNamesBlacklist,
-      modulesCacheStub: {
-        ...modulesCacheStub,
-        './lib/utils/npmPackage/isGlobal.js': async () => false,
-      },
-    });
-    expect(configUtils.get('autoUpdate.enabled')).to.be.undefined;
-    await runServerless({
-      noService: true,
-      command: '',
-      lifecycleHookNamesBlacklist,
-      modulesCacheStub: {
-        ...modulesCacheStub,
-        './lib/utils/npmPackage/isWritable.js': async () => false,
-      },
-    });
-    expect(configUtils.get('autoUpdate.enabled')).to.be.undefined;
-  });
-
-  it('Should abort if user does not want to setup auto update', async () => {
-    configureInquirerStub(inquirer, {
-      confirm: { shouldSetupAutoUpdate: false },
-    });
-    await runServerless({
-      noService: true,
-      command: '',
-      lifecycleHookNamesBlacklist,
-      modulesCacheStub,
-    });
-    expect(configUtils.get('autoUpdate.enabled')).to.be.undefined;
-  });
-
-  it('Should not prompt again is user opt out from setup', async () => {
-    configureInquirerStub(inquirer, {
-      confirm: { shouldSetupAutoUpdate: false },
-    });
-    await runServerless({
-      noService: true,
-      command: '',
-      lifecycleHookNamesBlacklist,
-      modulesCacheStub,
-    });
-    expect(configUtils.get('autoUpdate.enabled')).to.be.undefined;
-    inquirer.prompt.restore();
-    await runServerless({
-      noService: true,
-      command: '',
-      lifecycleHookNamesBlacklist,
-      modulesCacheStub: {
-        './lib/utils/npmPackage/isGlobal.js': async () => true,
-        './lib/utils/npmPackage/isWritable.js': async () => true,
-      },
-    });
-    expect(configUtils.get('autoUpdate.enabled')).to.be.undefined;
-  });
-
-  it('Should setup auto update on user request', async () => {
-    configureInquirerStub(inquirer, {
-      confirm: { shouldSetupAutoUpdate: true },
-    });
-    await runServerless({
-      noService: true,
-      command: '',
-      lifecycleHookNamesBlacklist,
-      modulesCacheStub,
-    });
-    expect(configUtils.get('autoUpdate.enabled')).to.be.true;
-  });
-});
diff --git a/test/unit/lib/plugins/interactiveCli/fixtures/some-other-service/serverless.yml b/test/unit/lib/plugins/interactiveCli/fixtures/some-other-service/serverless.yml
deleted file mode 100644
index 8a1254a3f72..00000000000
--- a/test/unit/lib/plugins/interactiveCli/fixtures/some-other-service/serverless.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-service: 'some-other-service'
-provider: 'other'
diff --git a/test/unit/lib/plugins/interactiveCli/index.test.js b/test/unit/lib/plugins/interactiveCli/index.test.js
deleted file mode 100644
index 2dfe0f54f57..00000000000
--- a/test/unit/lib/plugins/interactiveCli/index.test.js
+++ /dev/null
@@ -1,28 +0,0 @@
-'use strict';
-
-const chai = require('chai');
-const InteractiveCli = require('../../../../../lib/plugins/interactiveCli');
-const Serverless = require('../../../../../lib/Serverless');
-
-const expect = chai.expect;
-chai.use(require('chai-as-promised'));
-chai.use(require('sinon-chai'));
-
-describe('interactiveCli', () => {
-  let interactiveCli;
-  let serverless;
-
-  beforeEach(() => {
-    serverless = new Serverless();
-    serverless.processedInput = { commands: [], options: {} };
-    const backupIsTTY = process.stdin.isTTY;
-    process.stdin.isTTY = true;
-    try {
-      interactiveCli = new InteractiveCli(serverless);
-    } finally {
-      process.stdin.isTTY = backupIsTTY;
-    }
-  });
-
-  it('should have commands', () => expect(interactiveCli.commands).to.be.not.empty);
-});
diff --git a/test/unit/lib/plugins/interactiveCli/initializeService.test.js b/test/unit/lib/plugins/interactiveCli/initializeService.test.js
deleted file mode 100644
index ad77398daaa..00000000000
--- a/test/unit/lib/plugins/interactiveCli/initializeService.test.js
+++ /dev/null
@@ -1,122 +0,0 @@
-'use strict';
-
-const chai = require('chai');
-const sinon = require('sinon');
-const configureInquirerStub = require('@serverless/test/configure-inquirer-stub');
-
-const { expect } = chai;
-
-chai.use(require('chai-as-promised'));
-
-const { join } = require('path');
-const { remove: rmDir, lstat } = require('fs-extra');
-const runServerless = require('../../../../utils/run-serverless');
-const inquirer = require('@serverless/utils/inquirer');
-
-const fixturesPath = join(__dirname, 'fixtures');
-const lifecycleHookNamesBlacklist = [
-  'before:interactiveCli:setupAws',
-  'interactiveCli:setupAws',
-  'interactiveCli:autoUpdate',
-  'interactiveCli:tabCompletion',
-];
-
-describe('interactiveCli: initializeService', () => {
-  const existingProjectName = 'some-other-service';
-  const newProjectName = 'foo-bar';
-  const newProjectPath = join(fixturesPath, newProjectName);
-  let backupIsTTY;
-
-  before(() => {
-    backupIsTTY = process.stdin.isTTY;
-    process.stdin.isTTY = true;
-  });
-  after(() => (process.stdin.isTTY = backupIsTTY));
-
-  afterEach(() => sinon.restore());
-
-  it('Should be ineffective, when at service path', async () =>
-    runServerless({
-      cwd: join(fixturesPath, 'some-other-service'),
-      command: '',
-      lifecycleHookNamesBlacklist,
-    }));
-
-  it("Should abort if user doesn't want setup", async () => {
-    configureInquirerStub(inquirer, {
-      confirm: { shouldCreateNewProject: false },
-    });
-    return runServerless({
-      cwd: fixturesPath,
-      command: '',
-      pluginPathsWhitelist: ['./lib/plugins/interactiveCli'],
-      lifecycleHookNamesBlacklist,
-    });
-  });
-
-  it("Should abort if user choses 'other' template", async () => {
-    configureInquirerStub(inquirer, {
-      confirm: { shouldCreateNewProject: true },
-      list: { projectType: 'other' },
-    });
-    return runServerless({
-      cwd: fixturesPath,
-      command: '',
-      pluginPathsWhitelist: ['./lib/plugins/interactiveCli'],
-      lifecycleHookNamesBlacklist,
-    });
-  });
-
-  describe('Create new project', () => {
-    after(async () => rmDir(newProjectPath));
-
-    it('Should create project at not existing directory', async () => {
-      configureInquirerStub(inquirer, {
-        confirm: { shouldCreateNewProject: true },
-        list: { projectType: 'aws-nodejs' },
-        input: { projectName: newProjectName },
-      });
-      await runServerless({
-        cwd: fixturesPath,
-        command: '',
-        pluginPathsWhitelist: ['./lib/plugins/interactiveCli'],
-        lifecycleHookNamesBlacklist,
-      });
-      const stats = await lstat(join(newProjectPath, 'serverless.yml'));
-      expect(stats.isFile()).to.be.true;
-    });
-  });
-
-  it('Should not allow project creation in a directory in which already service is configured', async () => {
-    configureInquirerStub(inquirer, {
-      confirm: { shouldCreateNewProject: true },
-      list: { projectType: 'aws-nodejs' },
-      input: { projectName: existingProjectName },
-    });
-
-    await expect(
-      runServerless({
-        cwd: fixturesPath,
-        command: '',
-        pluginPathsWhitelist: ['./lib/plugins/interactiveCli'],
-        lifecycleHookNamesBlacklist,
-      })
-    ).to.eventually.be.rejected.and.have.property('code', 'INVALID_ANSWER');
-  });
-
-  it('Should not allow project creation using an invalid project name', async () => {
-    configureInquirerStub(inquirer, {
-      confirm: { shouldCreateNewProject: true },
-      list: { projectType: 'aws-nodejs' },
-      input: { projectName: 'elo grzegżółka' },
-    });
-    await expect(
-      runServerless({
-        cwd: fixturesPath,
-        command: '',
-        pluginPathsWhitelist: ['./lib/plugins/interactiveCli'],
-        lifecycleHookNamesBlacklist,
-      })
-    ).to.eventually.be.rejected.and.have.property('code', 'INVALID_ANSWER');
-  });
-});
diff --git a/test/unit/lib/plugins/interactiveCli/setupAws.test.js b/test/unit/lib/plugins/interactiveCli/setupAws.test.js
deleted file mode 100644
index ba5f8400d5d..00000000000
--- a/test/unit/lib/plugins/interactiveCli/setupAws.test.js
+++ /dev/null
@@ -1,200 +0,0 @@
-'use strict';
-
-const { join } = require('path');
-const { homedir: getHomedir } = require('os');
-const { expect } = require('chai');
-const sinon = require('sinon');
-const BbPromise = require('bluebird');
-const { remove: rmDir, lstat, outputFile: writeFile } = require('fs-extra');
-const { resolveFileProfiles } = require('../../../../../lib/plugins/aws/utils/credentials');
-const inquirer = require('@serverless/utils/inquirer');
-const configureInquirerStub = require('@serverless/test/configure-inquirer-stub');
-const runServerless = require('../../../../utils/run-serverless');
-
-const fixturesPath = join(__dirname, 'fixtures');
-const lifecycleHookNamesBlacklist = [
-  'before:interactiveCli:setupAws',
-  'interactiveCli:initializeService',
-  'interactiveCli:autoUpdate',
-  'interactiveCli:tabCompletion',
-];
-
-const openBrowserUrls = [];
-const modulesCacheStub = {
-  './lib/utils/openBrowser': (url) =>
-    BbPromise.try(() => {
-      openBrowserUrls.push(url);
-    }),
-  // Ensure to rely on same inquirer module that we mock in tests
-  '@serverless/utils/inquirer': inquirer,
-};
-
-describe('interactiveCli: setupAws', () => {
-  const awsProjectPath = join(fixturesPath, 'some-aws-service');
-  const accessKeyId = 'AKIAIOSFODNN7EXAMPLE';
-  const secretAccessKey = 'wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY';
-  let backupIsTTY;
-
-  before(() => {
-    backupIsTTY = process.stdin.isTTY;
-    process.stdin.isTTY = true;
-  });
-  after(() => (process.stdin.isTTY = backupIsTTY));
-
-  afterEach(() => {
-    openBrowserUrls.length = 0;
-    sinon.restore();
-  });
-
-  it('Should be ineffective, when not at service path', () =>
-    runServerless({
-      cwd: fixturesPath,
-      command: '',
-      lifecycleHookNamesBlacklist,
-    }));
-
-  it('Should be ineffective, when not at AWS service', () =>
-    runServerless({
-      cwd: join(fixturesPath, 'some-other-service'),
-      command: '',
-      lifecycleHookNamesBlacklist,
-    }));
-
-  it('Should be ineffective, when credentials are set in environment', () =>
-    runServerless({
-      cwd: awsProjectPath,
-      command: '',
-      env: { AWS_ACCESS_KEY_ID: accessKeyId, AWS_SECRET_ACCESS_KEY: secretAccessKey },
-      lifecycleHookNamesBlacklist,
-    }));
-
-  it("Should not setup if user doesn't the setup", () => {
-    configureInquirerStub(inquirer, { confirm: { shouldSetupAwsCredentials: false } });
-    return runServerless({
-      cwd: awsProjectPath,
-      command: '',
-      lifecycleHookNamesBlacklist,
-    });
-  });
-
-  describe('AWS config handling', () => {
-    const credentialsDirPath = join(getHomedir(), '.aws');
-    const credentialsFilePath = join(credentialsDirPath, 'credentials');
-
-    before(() => {
-      // Abort if credentials are found in home directory
-      // (it should not be the case, as home directory is mocked to point temp dir)
-      return lstat(credentialsDirPath).then(
-        () => {
-          throw new Error('Unexpected ~/.aws directory, related tests aborted');
-        },
-        (error) => {
-          if (error.code === 'ENOENT') return;
-          throw error;
-        }
-      );
-    });
-
-    afterEach(() => rmDir(credentialsDirPath));
-
-    describe('Existing credentials case', () => {
-      before(() =>
-        writeFile(
-          credentialsFilePath,
-          [
-            '[some-profile]',
-            `aws_access_key_id = ${accessKeyId}`,
-            `aws_secret_access_key = ${secretAccessKey}`,
-          ].join('\n')
-        )
-      );
-
-      it('Should be ineffective, When credentials are set in AWS config', () =>
-        runServerless({
-          cwd: awsProjectPath,
-          command: '',
-          lifecycleHookNamesBlacklist,
-        }));
-    });
-
-    it('Should setup credentials for users not having an AWS account', () => {
-      configureInquirerStub(inquirer, {
-        confirm: { shouldSetupAwsCredentials: true, hasAwsAccount: false },
-        input: {
-          createAwsAccountPrompt: '',
-          generateAwsCredsPrompt: '',
-          accessKeyId,
-          secretAccessKey,
-        },
-      });
-      return runServerless({
-        cwd: awsProjectPath,
-        command: '',
-        lifecycleHookNamesBlacklist,
-        modulesCacheStub,
-      }).then(() => {
-        expect(openBrowserUrls.length).to.equal(2);
-        expect(openBrowserUrls[0].includes('signup')).to.be.true;
-        expect(openBrowserUrls[1].includes('console.aws.amazon.com')).to.be.true;
-        return resolveFileProfiles().then((profiles) => {
-          expect(profiles).to.deep.equal(new Map([['default', { accessKeyId, secretAccessKey }]]));
-        });
-      });
-    });
-
-    it('Should setup credentials for users having an AWS account', () => {
-      configureInquirerStub(inquirer, {
-        confirm: { shouldSetupAwsCredentials: true, hasAwsAccount: true },
-        input: { generateAwsCredsPrompt: '', accessKeyId, secretAccessKey },
-      });
-      return runServerless({
-        cwd: awsProjectPath,
-        command: '',
-        lifecycleHookNamesBlacklist,
-        modulesCacheStub,
-      }).then(() => {
-        expect(openBrowserUrls.length).to.equal(1);
-        expect(openBrowserUrls[0].includes('console.aws.amazon.com')).to.be.true;
-        return resolveFileProfiles().then((profiles) => {
-          expect(profiles).to.deep.equal(new Map([['default', { accessKeyId, secretAccessKey }]]));
-        });
-      });
-    });
-
-    it('Should not accept invalid access key id', () => {
-      configureInquirerStub(inquirer, {
-        confirm: { shouldSetupAwsCredentials: true, hasAwsAccount: true },
-        input: { generateAwsCredsPrompt: '', accessKeyId: 'foo', secretAccessKey },
-      });
-      return runServerless({
-        cwd: awsProjectPath,
-        command: '',
-        lifecycleHookNamesBlacklist,
-        modulesCacheStub,
-      }).then(
-        () => {
-          throw new Error('Unexpected');
-        },
-        (error) => expect(error.code).to.equal('INVALID_ANSWER')
-      );
-    });
-
-    it('Should not accept invalid secret access key', () => {
-      configureInquirerStub(inquirer, {
-        confirm: { shouldSetupAwsCredentials: true, hasAwsAccount: true },
-        input: { generateAwsCredsPrompt: '', accessKeyId, secretAccessKey: 'foo' },
-      });
-      return runServerless({
-        cwd: awsProjectPath,
-        command: '',
-        lifecycleHookNamesBlacklist,
-        modulesCacheStub,
-      }).then(
-        () => {
-          throw new Error('Unexpected');
-        },
-        (error) => expect(error.code).to.equal('INVALID_ANSWER')
-      );
-    });
-  });
-});
diff --git a/test/unit/lib/plugins/interactiveCli/tabCompletion.test.js b/test/unit/lib/plugins/interactiveCli/tabCompletion.test.js
deleted file mode 100644
index f55e22d9dd1..00000000000
--- a/test/unit/lib/plugins/interactiveCli/tabCompletion.test.js
+++ /dev/null
@@ -1,104 +0,0 @@
-'use strict';
-
-const { expect } = require('chai');
-const sinon = require('sinon');
-const runServerless = require('../../../../utils/run-serverless');
-const configureInquirerStub = require('@serverless/test/configure-inquirer-stub');
-
-const os = require('os');
-const fs = require('fs');
-const path = require('path');
-const BbPromise = require('bluebird');
-const configUtils = require('@serverless/utils/config');
-const promptDisabledConfigPropertyName = require('../../../../../lib/utils/tabCompletion/promptDisabledConfigPropertyName');
-const isTabCompletionSupported = require('../../../../../lib/utils/tabCompletion/isSupported');
-const inquirer = require('@serverless/utils/inquirer');
-
-const lifecycleHookNamesBlacklist = [
-  'before:interactiveCli:setupAws',
-  'interactiveCli:initializeService',
-  'interactiveCli:setupAws',
-  'interactiveCli:autoUpdate',
-];
-
-BbPromise.promisifyAll(fs);
-
-describe('interactiveCli: tabCompletion', () => {
-  let backupIsTTY;
-
-  before(() => {
-    backupIsTTY = process.stdin.isTTY;
-    process.stdin.isTTY = true;
-  });
-  after(() => {
-    process.stdin.isTTY = backupIsTTY;
-  });
-
-  afterEach(() => {
-    configUtils.set(promptDisabledConfigPropertyName, false);
-    sinon.restore();
-  });
-
-  if (!isTabCompletionSupported) {
-    it('Should not suggest tab completion setup in non supported environments', () => {
-      return runServerless({
-        cwd: os.homedir(),
-        command: '',
-        lifecycleHookNamesBlacklist,
-      });
-    });
-    return;
-  }
-
-  it('Should abort if user does not want to setup tab completion', () => {
-    configureInquirerStub(inquirer, {
-      confirm: { shouldSetupTabCompletion: false },
-    });
-    return runServerless({
-      cwd: os.homedir(),
-      command: '',
-      lifecycleHookNamesBlacklist,
-    });
-  });
-
-  it('Should not prompt again is user opt out from setup', () => {
-    configureInquirerStub(inquirer, {
-      confirm: { shouldSetupTabCompletion: false },
-    });
-    return runServerless({
-      cwd: os.homedir(),
-      command: '',
-      lifecycleHookNamesBlacklist,
-    }).then(() => {
-      inquirer.prompt.restore();
-      return runServerless({
-        cwd: os.homedir(),
-        command: '',
-        lifecycleHookNamesBlacklist,
-      });
-    });
-  });
-
-  it('Should setup tab completion on user request', () => {
-    configureInquirerStub(inquirer, {
-      confirm: { shouldSetupTabCompletion: true, locationOK: true },
-      list: { shell: 'bash' },
-    });
-    return runServerless({
-      cwd: os.homedir(),
-      command: '',
-      env: { SHELL: 'bash' },
-      lifecycleHookNamesBlacklist,
-    }).then(() =>
-      Promise.all([
-        fs
-          .readFileAsync(path.resolve(os.homedir(), '.bashrc'), 'utf8')
-          .then((bashRcContent) =>
-            expect(bashRcContent).to.include(' ~/.config/tabtab/__tabtab.bash')
-          ),
-        fs.readFileAsync(path.resolve(os.homedir(), '.config/tabtab/serverless.bash'), 'utf8'),
-        fs.readFileAsync(path.resolve(os.homedir(), '.config/tabtab/sls.bash'), 'utf8'),
-      ])
-    );
-  });
-});
diff --git a/test/unit/lib/plugins/invoke.test.js b/test/unit/lib/plugins/invoke.test.js
index 67f36ba1094..4e802e28974 100644
--- a/test/unit/lib/plugins/invoke.test.js
+++ b/test/unit/lib/plugins/invoke.test.js
@@ -3,7 +3,7 @@
 const chai = require('chai');
 const overrideEnv = require('process-utils/override-env');
 const Invoke = require('../../../../lib/plugins/invoke');
-const Serverless = require('../../../../lib/Serverless');
+const Serverless = require('../../../../lib/serverless');
 
 chai.use(require('chai-as-promised'));
 
@@ -16,7 +16,7 @@ describe('Invoke', () => {
 
   beforeEach(() => {
     ({ restoreEnv } = overrideEnv());
-    serverless = new Serverless();
+    serverless = new Serverless({ commands: [], options: {} });
     invoke = new Invoke(serverless);
   });
 
diff --git a/test/unit/lib/plugins/metrics.test.js b/test/unit/lib/plugins/metrics.test.js
index 714214f2935..c5b14d53cda 100644
--- a/test/unit/lib/plugins/metrics.test.js
+++ b/test/unit/lib/plugins/metrics.test.js
@@ -2,14 +2,14 @@
 
 const expect = require('chai').expect;
 const Metrics = require('../../../../lib/plugins/metrics');
-const Serverless = require('../../../../lib/Serverless');
+const Serverless = require('../../../../lib/serverless');
 
 describe('Metrics', () => {
   let metrics;
   let serverless;
 
   beforeEach(() => {
-    serverless = new Serverless();
+    serverless = new Serverless({ commands: [], options: {} });
     const options = {};
     metrics = new Metrics(serverless, options);
   });
diff --git a/test/unit/lib/plugins/package/lib/packageService.test.js b/test/unit/lib/plugins/package/lib/package-service.test.js
similarity index 86%
rename from test/unit/lib/plugins/package/lib/packageService.test.js
rename to test/unit/lib/plugins/package/lib/package-service.test.js
index b593109a0b9..968dc968b26 100644
--- a/test/unit/lib/plugins/package/lib/packageService.test.js
+++ b/test/unit/lib/plugins/package/lib/package-service.test.js
@@ -1,7 +1,7 @@
 'use strict';
 
 const path = require('path');
-const fs = require('fs');
+const fsp = require('fs').promises;
 const chai = require('chai');
 const sinon = require('sinon');
 const { listFileProperties, listZipFiles } = require('../../../../../utils/fs');
@@ -13,8 +13,11 @@ chai.use(require('chai-as-promised'));
 chai.use(require('sinon-chai'));
 const { expect } = require('chai');
 
-describe('lib/plugins/package/lib/packageService.test.js', () => {
-  const mockedDescribeStacksResponse = {
+describe('test/unit/lib/plugins/package/lib/packageService.test.js', () => {
+  const awsRequestStubMap = {
+    S3: {
+      headBucket: {},
+    },
     CloudFormation: {
       describeStacks: {
         Stacks: [
@@ -46,15 +49,19 @@ describe('lib/plugins/package/lib/packageService.test.js', () => {
       } = await runServerless({
         fixture: 'packaging',
         command: 'package',
-        awsRequestStubMap: mockedDescribeStacksResponse,
+        awsRequestStubMap,
         configExt: {
           package: {
-            exclude: ['dir1/**', '!dir1/subdir3/**'],
-            include: ['dir1/subdir2/**', '!dir1/subdir2/subsubdir1'],
+            patterns: [
+              '!dir1/**',
+              'dir1/subdir3/**',
+              'dir1/subdir2/**',
+              '!dir1/subdir2/subsubdir1',
+            ],
           },
           functions: {
             fnIndividual: {
-              package: { include: 'dir1/subdir4/**', exclude: 'dir3/**' },
+              package: { patterns: ['dir1/subdir4/**', '!dir3/**'] },
             },
           },
         },
@@ -140,7 +147,7 @@ describe('lib/plugins/package/lib/packageService.test.js', () => {
       } = await runServerless({
         fixture: 'packaging',
         command: 'package',
-        awsRequestStubMap: mockedDescribeStacksResponse,
+        awsRequestStubMap,
         configExt: {
           useDotenv: true,
         },
@@ -166,16 +173,20 @@ describe('lib/plugins/package/lib/packageService.test.js', () => {
       } = await runServerless({
         fixture: 'packaging',
         command: 'package',
-        awsRequestStubMap: mockedDescribeStacksResponse,
+        awsRequestStubMap,
         configExt: {
           package: {
             individually: true,
-            exclude: ['dir1/**', '!dir1/subdir3/**'],
-            include: ['dir1/subdir2/**', '!dir1/subdir2/subsubdir1'],
+            patterns: [
+              '!dir1/**',
+              'dir1/subdir3/**',
+              'dir1/subdir2/**',
+              '!dir1/subdir2/subsubdir1',
+            ],
           },
           functions: {
             fnIndividual: {
-              package: { include: 'dir1/subdir4/**', exclude: 'dir3/**' },
+              package: { patterns: ['dir1/subdir4/**', '!dir3/**'] },
             },
           },
           plugins: {
@@ -224,17 +235,16 @@ describe('lib/plugins/package/lib/packageService.test.js', () => {
       const { serverless: serverlessInstance } = await runServerless({
         fixture: 'packaging',
         command: 'package',
-        awsRequestStubMap: mockedDescribeStacksResponse,
+        awsRequestStubMap,
         configExt: {
           package: {
             artifact: 'artifact.zip',
-            exclude: ['dir1', '!dir1/subdir3/**'],
-            include: ['dir1/subdir2/**', '!dir1/subdir2/subsubdir1'],
+            patterns: ['!dir1', 'dir1/subdir3/**', 'dir1/subdir2/**', '!dir1/subdir2/subsubdir1'],
           },
           functions: {
             fnIndividual: {
               handler: 'index.handler',
-              package: { individually: true, include: 'dir1/subdir3/**', exclude: 'dir1/subdir2' },
+              package: { individually: true, patterns: ['dir1/subdir3/**', '!dir1/subdir2'] },
             },
             fnArtifact: {
               handler: 'index.handler',
@@ -265,7 +275,7 @@ describe('lib/plugins/package/lib/packageService.test.js', () => {
   describe('pre-prepared artifact with absolute artifact path', () => {
     describe('while deploying whole service', () => {
       const s3UploadStub = sinon.stub();
-      const awsRequestStubMap = {
+      const innerAwsRequestStubMap = {
         Lambda: {
           getFunction: {
             Configuration: {
@@ -276,6 +286,7 @@ describe('lib/plugins/package/lib/packageService.test.js', () => {
         S3: {
           upload: s3UploadStub,
           listObjectsV2: {},
+          headBucket: {},
         },
         CloudFormation: {
           describeStacks: {},
@@ -296,8 +307,8 @@ describe('lib/plugins/package/lib/packageService.test.js', () => {
       });
 
       it('for function', async () => {
-        const { servicePath: serviceDir, updateConfig } = await fixtures.setup('packageArtifact');
-        const absoluteArtifactFilePath = path.join(serviceDir, 'absoluteArtifact.zip');
+        const { servicePath: serviceDir, updateConfig } = await fixtures.setup('package-artifact');
+        const absoluteArtifactFilePath = path.join(serviceDir, 'absolute-artifact.zip');
 
         await updateConfig({
           functions: {
@@ -313,18 +324,18 @@ describe('lib/plugins/package/lib/packageService.test.js', () => {
           cwd: serviceDir,
           command: 'deploy',
           lastLifecycleHookName: 'aws:deploy:deploy:uploadArtifacts',
-          awsRequestStubMap,
+          awsRequestStubMap: innerAwsRequestStubMap,
         });
 
         const callArgs = s3UploadStub.args.find((item) =>
-          item[0].Key.endsWith('absoluteArtifact.zip')
+          item[0].Key.endsWith('absolute-artifact.zip')
         );
         expect(callArgs[0].Body.path).to.equal(absoluteArtifactFilePath);
       });
 
       it('service-wide', async () => {
-        const { servicePath: serviceDir, updateConfig } = await fixtures.setup('packageArtifact');
-        const absoluteArtifactFilePath = path.join(serviceDir, 'absoluteArtifact.zip');
+        const { servicePath: serviceDir, updateConfig } = await fixtures.setup('package-artifact');
+        const absoluteArtifactFilePath = path.join(serviceDir, 'absolute-artifact.zip');
 
         await updateConfig({
           package: {
@@ -335,11 +346,11 @@ describe('lib/plugins/package/lib/packageService.test.js', () => {
           cwd: serviceDir,
           command: 'deploy',
           lastLifecycleHookName: 'aws:deploy:deploy:uploadArtifacts',
-          awsRequestStubMap,
+          awsRequestStubMap: innerAwsRequestStubMap,
         });
 
         const callArgs = s3UploadStub.args.find((item) =>
-          item[0].Key.endsWith('absoluteArtifact.zip')
+          item[0].Key.endsWith('absolute-artifact.zip')
         );
         expect(callArgs[0].Body.path).to.equal(absoluteArtifactFilePath);
       });
@@ -347,11 +358,13 @@ describe('lib/plugins/package/lib/packageService.test.js', () => {
 
     describe('while deploying specific function', () => {
       const updateFunctionCodeStub = sinon.stub();
-      const awsRequestStubMap = {
+      const innerAwsRequestStubMap = {
         Lambda: {
           getFunction: {
             Configuration: {
               LastModified: '2020-05-20T15:34:16.494+0000',
+              State: 'Active',
+              LastUpdateStatus: 'Successful',
             },
           },
           updateFunctionCode: updateFunctionCodeStub,
@@ -364,9 +377,9 @@ describe('lib/plugins/package/lib/packageService.test.js', () => {
       });
 
       it('for function', async () => {
-        const { servicePath: serviceDir, updateConfig } = await fixtures.setup('packageArtifact');
-        const absoluteArtifactFilePath = path.join(serviceDir, 'absoluteArtifact.zip');
-        const zipContent = await fs.promises.readFile(absoluteArtifactFilePath);
+        const { servicePath: serviceDir, updateConfig } = await fixtures.setup('package-artifact');
+        const absoluteArtifactFilePath = path.join(serviceDir, 'absolute-artifact.zip');
+        const zipContent = await fsp.readFile(absoluteArtifactFilePath);
 
         await updateConfig({
           functions: {
@@ -381,16 +394,16 @@ describe('lib/plugins/package/lib/packageService.test.js', () => {
           cwd: serviceDir,
           command: 'deploy function',
           options: { function: 'other' },
-          awsRequestStubMap,
+          awsRequestStubMap: innerAwsRequestStubMap,
         });
         expect(updateFunctionCodeStub).to.have.been.calledOnce;
         expect(updateFunctionCodeStub.args[0][0].ZipFile).to.deep.equal(Buffer.from(zipContent));
       });
 
       it('service-wide', async () => {
-        const { servicePath: serviceDir, updateConfig } = await fixtures.setup('packageArtifact');
-        const absoluteArtifactFilePath = path.join(serviceDir, 'absoluteArtifact.zip');
-        const zipContent = await fs.promises.readFile(absoluteArtifactFilePath);
+        const { servicePath: serviceDir, updateConfig } = await fixtures.setup('package-artifact');
+        const absoluteArtifactFilePath = path.join(serviceDir, 'absolute-artifact.zip');
+        const zipContent = await fsp.readFile(absoluteArtifactFilePath);
 
         await updateConfig({
           package: {
@@ -401,7 +414,7 @@ describe('lib/plugins/package/lib/packageService.test.js', () => {
           cwd: serviceDir,
           command: 'deploy function',
           options: { function: 'foo' },
-          awsRequestStubMap,
+          awsRequestStubMap: innerAwsRequestStubMap,
         });
         expect(updateFunctionCodeStub).to.have.been.calledOnce;
         expect(updateFunctionCodeStub.args[0][0].ZipFile).to.deep.equal(Buffer.from(zipContent));
diff --git a/test/unit/lib/plugins/package/lib/zipService.test.js b/test/unit/lib/plugins/package/lib/zip-service.test.js
similarity index 99%
rename from test/unit/lib/plugins/package/lib/zipService.test.js
rename to test/unit/lib/plugins/package/lib/zip-service.test.js
index eabcf73b74e..87ec28829db 100644
--- a/test/unit/lib/plugins/package/lib/zipService.test.js
+++ b/test/unit/lib/plugins/package/lib/zip-service.test.js
@@ -13,7 +13,7 @@ const fs = BbPromise.promisifyAll(require('fs'));
 const childProcess = BbPromise.promisifyAll(require('child_process'));
 const sinon = require('sinon');
 const Package = require('../../../../../../lib/plugins/package/package');
-const Serverless = require('../../../../../../lib/Serverless');
+const Serverless = require('../../../../../../lib/serverless');
 const { getTmpDirPath } = require('../../../../../utils/fs');
 
 // Configure chai
@@ -29,7 +29,7 @@ describe('zipService', () => {
 
   beforeEach(() => {
     tmpDirPath = getTmpDirPath();
-    serverless = new Serverless();
+    serverless = new Serverless({ commands: [], options: {} });
     serverless.service.service = 'first-service';
     serverless.serviceDir = tmpDirPath;
     packagePlugin = new Package(serverless, {});
diff --git a/test/unit/lib/plugins/package/package.test.js b/test/unit/lib/plugins/package/package.test.js
index 1b29fc098eb..03b5f74f1e2 100644
--- a/test/unit/lib/plugins/package/package.test.js
+++ b/test/unit/lib/plugins/package/package.test.js
@@ -2,7 +2,7 @@
 
 const chai = require('chai');
 const Package = require('../../../../../lib/plugins/package/package');
-const Serverless = require('../../../../../lib/Serverless');
+const Serverless = require('../../../../../lib/serverless');
 const sinon = require('sinon');
 
 // Configure chai
@@ -16,7 +16,7 @@ describe('Package', () => {
   let pkg;
 
   beforeEach(() => {
-    serverless = new Serverless();
+    serverless = new Serverless({ commands: ['print'], options: {}, serviceDir: null });
     return serverless.init().then(() => {
       options = {
         stage: 'dev',
diff --git a/test/unit/lib/plugins/plugin/install.test.js b/test/unit/lib/plugins/plugin/install.test.js
deleted file mode 100644
index 9db3deb18ed..00000000000
--- a/test/unit/lib/plugins/plugin/install.test.js
+++ /dev/null
@@ -1,570 +0,0 @@
-'use strict';
-
-const chai = require('chai');
-const sinon = require('sinon');
-const BbPromise = require('bluebird');
-const yaml = require('js-yaml');
-const path = require('path');
-const childProcess = BbPromise.promisifyAll(require('child_process'));
-const fs = require('fs');
-const fse = require('fs-extra');
-const PluginInstall = require('../../../../../lib/plugins/plugin/install');
-const Serverless = require('../../../../../lib/Serverless');
-const CLI = require('../../../../../lib/classes/CLI');
-const { expect } = require('chai');
-const { getTmpDirPath } = require('../../../../utils/fs');
-
-chai.use(require('chai-as-promised'));
-
-describe('PluginInstall', () => {
-  let pluginInstall;
-  let serverless;
-  let consoleLogStub;
-  let serverlessErrorStub;
-  const plugins = [
-    {
-      name: '@scope/serverless-plugin-1',
-      description: 'Scoped Serverless Plugin 1',
-      githubUrl: 'https://github.com/serverless/serverless-plugin-1',
-    },
-    {
-      name: 'serverless-plugin-1',
-      description: 'Serverless Plugin 1',
-      githubUrl: 'https://github.com/serverless/serverless-plugin-1',
-    },
-    {
-      name: 'serverless-plugin-2',
-      description: 'Serverless Plugin 2',
-      githubUrl: 'https://github.com/serverless/serverless-plugin-2',
-    },
-    {
-      name: 'serverless-existing-plugin',
-      description: 'Serverless Existing plugin',
-      githubUrl: 'https://github.com/serverless/serverless-existing-plugin',
-    },
-  ];
-
-  beforeEach(() => {
-    serverless = new Serverless();
-    serverless.cli = new CLI(serverless);
-    const options = {};
-    pluginInstall = new PluginInstall(serverless, options);
-    consoleLogStub = sinon.stub(serverless.cli, 'consoleLog').returns();
-    serverlessErrorStub = sinon.stub(serverless.classes, 'Error').throws();
-  });
-
-  afterEach(() => {
-    serverless.cli.consoleLog.restore();
-    serverless.classes.Error.restore();
-  });
-
-  describe('#constructor()', () => {
-    let installStub;
-
-    beforeEach(() => {
-      installStub = sinon.stub(pluginInstall, 'install').returns(BbPromise.resolve());
-    });
-
-    afterEach(() => {
-      pluginInstall.install.restore();
-    });
-
-    it('should have the sub-command "install"', () => {
-      expect(pluginInstall.commands.plugin.commands.install).to.not.equal(undefined);
-    });
-
-    it('should have the lifecycle event "install" for the "install" sub-command', () => {
-      expect(pluginInstall.commands.plugin.commands.install.lifecycleEvents).to.deep.equal([
-        'install',
-      ]);
-    });
-
-    it('should have a required option "name" for the "install" sub-command', () => {
-      // eslint-disable-next-line no-unused-expressions
-      expect(pluginInstall.commands.plugin.commands.install.options.name.required).to.be.true;
-    });
-
-    it('should have a "plugin:install:install" hook', () => {
-      expect(pluginInstall.hooks['plugin:install:install']).to.not.equal(undefined);
-    });
-
-    it('should run promise chain in order for "plugin:install:install" hook', () =>
-      pluginInstall.hooks['plugin:install:install']().then(() => {
-        expect(installStub.calledOnce).to.equal(true);
-      }));
-  });
-
-  describe('#install()', () => {
-    let serviceDir;
-    let serverlessYmlFilePath;
-    let pluginInstallStub;
-    let validateStub;
-    let getPluginsStub;
-    let savedCwd;
-    let addPluginToServerlessFileStub;
-    let installPeerDependenciesStub;
-
-    beforeEach(() => {
-      serviceDir = getTmpDirPath();
-      pluginInstall.serverless.serviceDir = serviceDir;
-      fse.ensureDirSync(serviceDir);
-      serverlessYmlFilePath = path.join(serviceDir, 'serverless.yml');
-      validateStub = sinon.stub(pluginInstall, 'validate').returns(BbPromise.resolve());
-      pluginInstallStub = sinon.stub(pluginInstall, 'pluginInstall').returns(BbPromise.resolve());
-      addPluginToServerlessFileStub = sinon
-        .stub(pluginInstall, 'addPluginToServerlessFile')
-        .returns(BbPromise.resolve());
-      installPeerDependenciesStub = sinon
-        .stub(pluginInstall, 'installPeerDependencies')
-        .returns(BbPromise.resolve());
-      getPluginsStub = sinon.stub(pluginInstall, 'getPlugins').returns(BbPromise.resolve(plugins));
-      // save the cwd so that we can restore it later
-      savedCwd = process.cwd();
-      process.chdir(serviceDir);
-    });
-
-    afterEach(() => {
-      pluginInstall.validate.restore();
-      pluginInstall.getPlugins.restore();
-      pluginInstall.pluginInstall.restore();
-      pluginInstall.addPluginToServerlessFile.restore();
-      pluginInstall.installPeerDependencies.restore();
-      process.chdir(savedCwd);
-    });
-
-    it('should install the plugin if it can be found in the registry', () => {
-      // serverless.yml
-      const serverlessYml = {
-        service: 'plugin-service',
-        provider: 'aws',
-      };
-      serverless.utils.writeFileSync(serverlessYmlFilePath, yaml.dump(serverlessYml));
-
-      pluginInstall.options.name = 'serverless-plugin-1';
-
-      return expect(pluginInstall.install()).to.be.fulfilled.then(() => {
-        expect(validateStub.calledOnce).to.equal(true);
-        expect(getPluginsStub.calledOnce).to.equal(true);
-        expect(pluginInstallStub.calledOnce).to.equal(true);
-        expect(consoleLogStub.called).to.equal(true);
-        expect(serverlessErrorStub.calledOnce).to.equal(false);
-        expect(addPluginToServerlessFileStub.calledOnce).to.equal(true);
-        expect(installPeerDependenciesStub.calledOnce).to.equal(true);
-      });
-    });
-
-    it('should install a scoped plugin if it can be found in the registry', () => {
-      // serverless.yml
-      const serverlessYml = {
-        service: 'plugin-service',
-        provider: 'aws',
-      };
-      serverless.utils.writeFileSync(serverlessYmlFilePath, yaml.dump(serverlessYml));
-
-      pluginInstall.options.name = '@scope/serverless-plugin-1';
-
-      return expect(pluginInstall.install()).to.be.fulfilled.then(() => {
-        expect(validateStub.calledOnce).to.equal(true);
-        expect(getPluginsStub.calledOnce).to.equal(true);
-        expect(pluginInstallStub.calledOnce).to.equal(true);
-        expect(consoleLogStub.called).to.equal(true);
-        expect(serverlessErrorStub.calledOnce).to.equal(false);
-        expect(addPluginToServerlessFileStub.calledOnce).to.equal(true);
-        expect(installPeerDependenciesStub.calledOnce).to.equal(true);
-      });
-    });
-
-    it('should install the plugin even if it can not be found in the registry', () => {
-      // serverless.yml
-      const serverlessYml = {
-        service: 'plugin-service',
-        provider: 'aws',
-      };
-      serverless.utils.writeFileSync(serverlessYmlFilePath, yaml.dump(serverlessYml));
-
-      pluginInstall.options.name = 'serverless-not-in-registry-plugin';
-      return expect(pluginInstall.install()).to.be.fulfilled.then(() => {
-        expect(validateStub.calledOnce).to.equal(true);
-        expect(getPluginsStub.calledOnce).to.equal(true);
-        expect(pluginInstallStub.calledOnce).to.equal(true);
-        expect(consoleLogStub.called).to.equal(true);
-        expect(serverlessErrorStub.calledOnce).to.equal(false);
-        expect(addPluginToServerlessFileStub.calledOnce).to.equal(true);
-        expect(installPeerDependenciesStub.calledOnce).to.equal(true);
-      });
-    });
-
-    it('should apply the latest version if you can not get the version from name option', () => {
-      const serverlessYml = {
-        service: 'plugin-service',
-        provider: 'aws',
-      };
-      serverless.utils.writeFileSync(serverlessYmlFilePath, yaml.dump(serverlessYml));
-      pluginInstall.options.name = 'serverless-plugin-1';
-      return expect(pluginInstall.install()).to.be.fulfilled.then(() => {
-        expect(pluginInstall.options.pluginName).to.be.equal('serverless-plugin-1');
-        expect(pluginInstall.options.pluginVersion).to.be.equal('latest');
-      });
-    });
-
-    it(
-      'should apply the latest version if you can not get the ' +
-        'version from name option even if scoped',
-      () => {
-        const serverlessYml = {
-          service: 'plugin-service',
-          provider: 'aws',
-        };
-        serverless.utils.writeFileSync(serverlessYmlFilePath, yaml.dump(serverlessYml));
-        pluginInstall.options.name = '@scope/serverless-plugin-1';
-        return expect(pluginInstall.install()).to.be.fulfilled.then(() => {
-          expect(pluginInstall.options.pluginName).to.be.equal('@scope/serverless-plugin-1');
-          expect(pluginInstall.options.pluginVersion).to.be.equal('latest');
-        });
-      }
-    );
-
-    it('should apply the specified version if you can get the version from name option', () => {
-      const serverlessYml = {
-        service: 'plugin-service',
-        provider: 'aws',
-      };
-      serverless.utils.writeFileSync(serverlessYmlFilePath, yaml.dump(serverlessYml));
-      pluginInstall.options.name = 'serverless-plugin-1@1.0.0';
-      return expect(pluginInstall.install()).to.be.fulfilled.then(() => {
-        expect(pluginInstall.options.pluginName).to.be.equal('serverless-plugin-1');
-        expect(pluginInstall.options.pluginVersion).to.be.equal('1.0.0');
-      });
-    });
-  });
-
-  describe('#pluginInstall()', () => {
-    let serviceDir;
-    let packageJsonFilePath;
-    let npmInstallStub;
-    let savedCwd;
-
-    beforeEach(() => {
-      pluginInstall.options.pluginName = 'serverless-plugin-1';
-      pluginInstall.options.pluginVersion = 'latest';
-      serviceDir = getTmpDirPath();
-      pluginInstall.serverless.serviceDir = serviceDir;
-      fse.ensureDirSync(serviceDir);
-      packageJsonFilePath = path.join(serviceDir, 'package.json');
-      npmInstallStub = sinon.stub(childProcess, 'execAsync').callsFake(() => {
-        const packageJson = serverless.utils.readFileSync(packageJsonFilePath, 'utf8');
-        packageJson.devDependencies = {
-          'serverless-plugin-1': 'latest',
-        };
-        serverless.utils.writeFileSync(packageJsonFilePath, packageJson);
-        return BbPromise.resolve();
-      });
-
-      // save the cwd so that we can restore it later
-      savedCwd = process.cwd();
-      process.chdir(serviceDir);
-    });
-
-    afterEach(() => {
-      childProcess.execAsync.restore();
-      process.chdir(savedCwd);
-    });
-
-    it('should install the plugin if it has not been installed yet', () => {
-      const packageJson = {
-        name: 'test-service',
-        description: '',
-        version: '0.1.0',
-        dependencies: {},
-        devDependencies: {},
-      };
-
-      serverless.utils.writeFileSync(packageJsonFilePath, packageJson);
-
-      return expect(pluginInstall.pluginInstall()).to.be.fulfilled.then(() =>
-        Promise.all([
-          expect(consoleLogStub.called).to.equal(true),
-          expect(
-            npmInstallStub.calledWithExactly('npm install --save-dev serverless-plugin-1@latest', {
-              stdio: 'ignore',
-            })
-          ).to.equal(true),
-          expect(serverlessErrorStub.calledOnce).to.equal(false),
-        ])
-      );
-    });
-
-    it('should generate a package.json file in the service directory if not present', () =>
-      expect(pluginInstall.pluginInstall()).to.be.fulfilled.then(() => {
-        expect(consoleLogStub.called).to.equal(true);
-        expect(
-          npmInstallStub.calledWithExactly('npm install --save-dev serverless-plugin-1@latest', {
-            stdio: 'ignore',
-          })
-        ).to.equal(true);
-        expect(fs.existsSync(packageJsonFilePath)).to.equal(true);
-      }));
-  });
-
-  describe('#addPluginToServerlessFile()', () => {
-    let serviceDir;
-    let serverlessYmlFilePath;
-
-    beforeEach(() => {
-      serviceDir = getTmpDirPath();
-      pluginInstall.serverless.serviceDir = pluginInstall.serverless.serviceDir = serviceDir;
-      pluginInstall.serverless.configurationFilename = 'serverless.yml';
-      serverlessYmlFilePath = path.join(serviceDir, 'serverless.yml');
-    });
-
-    it('should add the plugin to the service file if plugins array is not present', () => {
-      // serverless.yml
-      const serverlessYml = {
-        service: 'plugin-service',
-        provider: 'aws',
-        // no plugins array here
-      };
-      serverless.utils.writeFileSync(serverlessYmlFilePath, yaml.dump(serverlessYml));
-
-      pluginInstall.options.pluginName = 'serverless-plugin-1';
-
-      return expect(pluginInstall.addPluginToServerlessFile()).to.be.fulfilled.then(() => {
-        expect(serverless.utils.readFileSync(serverlessYmlFilePath, 'utf8')).to.deep.equal(
-          Object.assign({}, serverlessYml, {
-            plugins: ['serverless-plugin-1'],
-          })
-        );
-      });
-    });
-
-    it('should push the plugin to the service files plugin array if present', () => {
-      // serverless.yml
-      const serverlessYml = {
-        service: 'plugin-service',
-        provider: 'aws',
-        plugins: ['serverless-existing-plugin'], // one plugin was already added
-      };
-      serverless.utils.writeFileSync(serverlessYmlFilePath, yaml.dump(serverlessYml));
-
-      pluginInstall.options.pluginName = 'serverless-plugin-1';
-
-      return expect(pluginInstall.addPluginToServerlessFile()).to.be.fulfilled.then(() => {
-        expect(serverless.utils.readFileSync(serverlessYmlFilePath, 'utf8')).to.deep.equal(
-          Object.assign({}, serverlessYml, {
-            plugins: ['serverless-existing-plugin', 'serverless-plugin-1'],
-          })
-        );
-      });
-    });
-
-    it('should add the plugin to serverless file path for a .yaml file', () => {
-      const serverlessYamlFilePath = path.join(serviceDir, 'serverless.yaml');
-      pluginInstall.serverless.configurationFilename = 'serverless.yaml';
-      const serverlessYml = {
-        service: 'plugin-service',
-        provider: 'aws',
-      };
-      serverless.utils.writeFileSync(serverlessYamlFilePath, yaml.dump(serverlessYml));
-      pluginInstall.options.pluginName = 'serverless-plugin-1';
-      return expect(pluginInstall.addPluginToServerlessFile()).to.be.fulfilled.then(() => {
-        expect(serverless.utils.readFileSync(serverlessYamlFilePath, 'utf8')).to.deep.equal(
-          Object.assign({}, serverlessYml, { plugins: ['serverless-plugin-1'] })
-        );
-      });
-    });
-
-    it('should add the plugin to serverless file path for a .json file', () => {
-      const serverlessJsonFilePath = path.join(serviceDir, 'serverless.json');
-      pluginInstall.serverless.configurationFilename = 'serverless.json';
-      const serverlessJson = {
-        service: 'plugin-service',
-        provider: 'aws',
-      };
-      serverless.utils.writeFileSync(serverlessJsonFilePath, serverlessJson);
-      pluginInstall.options.pluginName = 'serverless-plugin-1';
-      return expect(pluginInstall.addPluginToServerlessFile())
-        .to.be.fulfilled.then(() => {
-          expect(serverless.utils.readFileSync(serverlessJsonFilePath, 'utf8')).to.deep.equal(
-            Object.assign({}, serverlessJson, { plugins: ['serverless-plugin-1'] })
-          );
-        })
-        .then(() => {
-          pluginInstall.options.pluginName = 'serverless-plugin-2';
-          return expect(pluginInstall.addPluginToServerlessFile()).to.be.fulfilled.then(() => {
-            expect(serverless.utils.readFileSync(serverlessJsonFilePath, 'utf8')).to.deep.equal(
-              Object.assign({}, serverlessJson, {
-                plugins: ['serverless-plugin-1', 'serverless-plugin-2'],
-              })
-            );
-          });
-        });
-    });
-
-    it('should not modify serverless .js file', () => {
-      const serverlessJsFilePath = path.join(serviceDir, 'serverless.js');
-      pluginInstall.serverless.configurationFilename = 'serverless.js';
-      const serverlessJson = {
-        service: 'plugin-service',
-        provider: 'aws',
-        plugins: [],
-      };
-      serverless.utils.writeFileSync(
-        serverlessJsFilePath,
-        `module.exports = ${JSON.stringify(serverlessJson)};`
-      );
-      pluginInstall.options.pluginName = 'serverless-plugin-1';
-      return expect(pluginInstall.addPluginToServerlessFile()).to.be.fulfilled.then(() => {
-        // use require to load serverless.js
-        // eslint-disable-next-line global-require
-        expect(require(serverlessJsFilePath).plugins).to.be.deep.equal([]);
-      });
-    });
-
-    it('should not modify serverless .ts file', () => {
-      const serverlessTsFilePath = path.join(serviceDir, 'serverless.ts');
-      pluginInstall.serverless.configurationFilename = 'serverless.ts';
-      const serverlessJson = {
-        service: 'plugin-service',
-        provider: 'aws',
-        plugins: [],
-      };
-      serverless.utils.writeFileSync(
-        serverlessTsFilePath,
-        `module.exports = ${JSON.stringify(serverlessJson)};`
-      );
-      pluginInstall.options.pluginName = 'serverless-plugin-1';
-      return expect(pluginInstall.addPluginToServerlessFile()).to.be.fulfilled.then(() => {
-        // use require to load serverless.js
-        // eslint-disable-next-line global-require
-        expect(require(serverlessTsFilePath).plugins).to.be.deep.equal([]);
-      });
-    });
-
-    describe('if plugins object is not array', () => {
-      it('should add the plugin to the service file', () => {
-        // serverless.yml
-        const serverlessYml = {
-          service: 'plugin-service',
-          provider: 'aws',
-          plugins: {
-            localPath: 'test',
-            modules: [],
-          },
-        };
-        serverless.utils.writeFileSync(serverlessYmlFilePath, yaml.dump(serverlessYml));
-
-        pluginInstall.options.pluginName = 'serverless-plugin-1';
-
-        return expect(pluginInstall.addPluginToServerlessFile()).to.be.fulfilled.then(() => {
-          expect(serverless.utils.readFileSync(serverlessYmlFilePath, 'utf8')).to.deep.equal(
-            Object.assign({}, serverlessYml, {
-              plugins: {
-                localPath: 'test',
-                modules: [pluginInstall.options.pluginName],
-              },
-            })
-          );
-        });
-      });
-
-      it('should add the plugin to serverless file path for a .json file', () => {
-        const serverlessJsonFilePath = path.join(serviceDir, 'serverless.json');
-        pluginInstall.serverless.configurationFilename = 'serverless.json';
-        const serverlessJson = {
-          service: 'plugin-service',
-          provider: 'aws',
-          plugins: {
-            localPath: 'test',
-            modules: [],
-          },
-        };
-        serverless.utils.writeFileSync(serverlessJsonFilePath, serverlessJson);
-        pluginInstall.options.pluginName = 'serverless-plugin-1';
-        return expect(pluginInstall.addPluginToServerlessFile())
-          .to.be.fulfilled.then(() => {
-            expect(serverless.utils.readFileSync(serverlessJsonFilePath, 'utf8')).to.deep.equal(
-              Object.assign({}, serverlessJson, {
-                plugins: {
-                  localPath: 'test',
-                  modules: [pluginInstall.options.pluginName],
-                },
-              })
-            );
-          })
-          .then(() => {
-            pluginInstall.options.pluginName = 'serverless-plugin-2';
-            return expect(pluginInstall.addPluginToServerlessFile()).to.be.fulfilled.then(() => {
-              expect(serverless.utils.readFileSync(serverlessJsonFilePath, 'utf8')).to.deep.equal(
-                Object.assign({}, serverlessJson, {
-                  plugins: {
-                    localPath: 'test',
-                    modules: ['serverless-plugin-1', 'serverless-plugin-2'],
-                  },
-                })
-              );
-            });
-          });
-      });
-    });
-  });
-
-  describe('#installPeerDependencies()', () => {
-    let serviceDir;
-    let servicePackageJsonFilePath;
-    let pluginPath;
-    let pluginPackageJsonFilePath;
-    let pluginName;
-    let npmInstallStub;
-    let savedCwd;
-
-    beforeEach(() => {
-      pluginName = 'some-plugin';
-      pluginInstall.options.pluginName = pluginName;
-      serviceDir = getTmpDirPath();
-      fse.ensureDirSync(serviceDir);
-      pluginInstall.serverless.serviceDir = serviceDir;
-      servicePackageJsonFilePath = path.join(serviceDir, 'package.json');
-      fse.writeJsonSync(servicePackageJsonFilePath, {
-        devDependencies: {},
-      });
-      pluginPath = path.join(serviceDir, 'node_modules', pluginName);
-      fse.ensureDirSync(pluginPath);
-      pluginPackageJsonFilePath = path.join(pluginPath, 'package.json');
-      npmInstallStub = sinon.stub(childProcess, 'execAsync').returns(BbPromise.resolve());
-      savedCwd = process.cwd();
-      process.chdir(serviceDir);
-    });
-
-    afterEach(() => {
-      childProcess.execAsync.restore();
-      process.chdir(savedCwd);
-    });
-
-    it('should install peerDependencies if an installed plugin has ones', () => {
-      fse.writeJsonSync(pluginPackageJsonFilePath, {
-        peerDependencies: {
-          'some-package': '*',
-        },
-      });
-      return expect(pluginInstall.installPeerDependencies()).to.be.fulfilled.then(() => {
-        expect(
-          npmInstallStub.calledWithExactly('npm install --save-dev some-package@"*"', {
-            stdio: 'ignore',
-          })
-        ).to.equal(true);
-      });
-    });
-
-    it('should not install peerDependencies if an installed plugin does not have ones', () => {
-      fse.writeJsonSync(pluginPackageJsonFilePath, {});
-      return expect(pluginInstall.installPeerDependencies()).to.be.fulfilled.then(() => {
-        expect(fse.readJsonSync(servicePackageJsonFilePath)).to.be.deep.equal({
-          devDependencies: {},
-        });
-        expect(npmInstallStub.calledWithExactly('npm install', { stdio: 'ignore' })).to.equal(
-          false
-        );
-      });
-    });
-  });
-});
diff --git a/test/unit/lib/plugins/plugin/lib/utils.test.js b/test/unit/lib/plugins/plugin/lib/utils.test.js
index c70c64f8474..4ba25dfd6e2 100644
--- a/test/unit/lib/plugins/plugin/lib/utils.test.js
+++ b/test/unit/lib/plugins/plugin/lib/utils.test.js
@@ -4,18 +4,17 @@ const chai = require('chai');
 const sinon = require('sinon');
 const BbPromise = require('bluebird');
 const proxyquire = require('proxyquire');
-const chalk = require('chalk');
-const PluginInstall = require('../../../../../../lib/plugins/plugin/install');
-const Serverless = require('../../../../../../lib/Serverless');
-const CLI = require('../../../../../../lib/classes/CLI');
+const PluginList = require('../../../../../../lib/plugins/plugin/list');
+const Serverless = require('../../../../../../lib/serverless');
+const CLI = require('../../../../../../lib/classes/cli');
 const { expect } = require('chai');
+const observeOutput = require('@serverless/test/observe-output');
 
 chai.use(require('chai-as-promised'));
 
 describe('PluginUtils', () => {
   let pluginUtils;
   let serverless;
-  let consoleLogStub;
   const plugins = [
     {
       name: 'serverless-plugin-1',
@@ -35,38 +34,10 @@ describe('PluginUtils', () => {
   ];
 
   beforeEach(() => {
-    serverless = new Serverless();
+    serverless = new Serverless({ commands: [], options: {} });
     serverless.cli = new CLI(serverless);
     const options = {};
-    pluginUtils = new PluginInstall(serverless, options);
-    consoleLogStub = sinon.stub(serverless.cli, 'consoleLog').returns();
-  });
-
-  afterEach(() => {
-    serverless.cli.consoleLog.restore();
-  });
-
-  describe('#validate()', () => {
-    it('should throw an error if the the cwd is not a Serverless service', () => {
-      pluginUtils.serverless.serviceDir = false;
-
-      expect(() => {
-        pluginUtils.validate();
-      }).to.throw(Error);
-    });
-
-    it('should resolve if the cwd is a Serverless service', (done) => {
-      pluginUtils.serverless.serviceDir = true;
-
-      pluginUtils.validate().then(() => done());
-    });
-  });
-
-  describe('#getServerlessFilePath()', () => {
-    it('should reject if no configuration file exists', () =>
-      expect(pluginUtils.getServerlessFilePath.bind(pluginUtils)).to.throw(
-        'Could not find any serverless service definition file.'
-      ));
+    pluginUtils = new PluginList(serverless, options);
   });
 
   describe('#getPlugins()', () => {
@@ -95,46 +66,18 @@ describe('PluginUtils', () => {
     });
   });
 
-  describe('#getPluginInfo()', () => {
-    it('should return the plugins name', () => {
-      expect(pluginUtils.getPluginInfo('some-plugin')).to.deep.equal(['some-plugin']);
-    });
-
-    it('should return the plugins name and version', () => {
-      expect(pluginUtils.getPluginInfo('some-plugin@0.1.0')).to.deep.equal([
-        'some-plugin',
-        '0.1.0',
-      ]);
-    });
-
-    it('should support scoped names', () => {
-      expect(pluginUtils.getPluginInfo('@acme/some-plugin')).to.deep.equal(['@acme/some-plugin']);
-    });
-  });
-
   describe('#display()', () => {
-    it('should display the plugins if present', () => {
+    it('should display the plugins if present', async () => {
+      const output = await observeOutput(() => pluginUtils.display(plugins));
       let expectedMessage = '';
-      expectedMessage += `${chalk.yellow.underline('serverless-existing-plugin')}`;
-      expectedMessage += ' - Serverless Existing plugin\n';
-      expectedMessage += `${chalk.yellow.underline('serverless-plugin-1')}`;
-      expectedMessage += ' - Serverless Plugin 1\n';
-      expectedMessage += `${chalk.yellow.underline('serverless-plugin-2')}`;
-      expectedMessage += ' - Serverless Plugin 2\n';
-      expectedMessage = expectedMessage.slice(0, -2);
-      return expect(pluginUtils.display(plugins)).to.be.fulfilled.then((message) => {
-        expect(consoleLogStub.calledTwice).to.equal(true);
-        expect(message).to.equal(expectedMessage);
-      });
-    });
-
-    it('should print a message when no plugins are available to display', () => {
-      const expectedMessage = 'There are no plugins available to display';
-
-      return pluginUtils.display([]).then((message) => {
-        expect(consoleLogStub.calledOnce).to.equal(true);
-        expect(message).to.equal(expectedMessage);
-      });
+      expectedMessage += 'serverless-existing-plugin Serverless Existing plugin\n';
+      expectedMessage += 'serverless-plugin-1 Serverless Plugin 1\n';
+      expectedMessage += 'serverless-plugin-2 Serverless Plugin 2\n\n';
+      expectedMessage += 'Install a plugin by running:\n';
+      expectedMessage += '  serverless plugin install --name ...\n\n';
+      expectedMessage +=
+        'It will be automatically downloaded and added to package.json and serverless.yml\n';
+      expect(output).to.equal(expectedMessage);
     });
   });
 });
diff --git a/test/unit/lib/plugins/plugin/list.test.js b/test/unit/lib/plugins/plugin/list.test.js
index 5df677f9c3e..d65853a6762 100644
--- a/test/unit/lib/plugins/plugin/list.test.js
+++ b/test/unit/lib/plugins/plugin/list.test.js
@@ -4,8 +4,8 @@ const chai = require('chai');
 const sinon = require('sinon');
 const BbPromise = require('bluebird');
 const PluginList = require('../../../../../lib/plugins/plugin/list');
-const Serverless = require('../../../../../lib/Serverless');
-const CLI = require('../../../../../lib/classes/CLI');
+const Serverless = require('../../../../../lib/serverless');
+const CLI = require('../../../../../lib/classes/cli');
 chai.use(require('chai-as-promised'));
 const expect = require('chai').expect;
 
@@ -14,7 +14,7 @@ describe('PluginList', () => {
   let serverless;
 
   beforeEach(() => {
-    serverless = new Serverless();
+    serverless = new Serverless({ commands: [], options: {} });
     serverless.cli = new CLI(serverless);
     const options = {};
     pluginList = new PluginList(serverless, options);
diff --git a/test/unit/lib/plugins/plugin/search.test.js b/test/unit/lib/plugins/plugin/search.test.js
index 99e12c8abb0..8273275878a 100644
--- a/test/unit/lib/plugins/plugin/search.test.js
+++ b/test/unit/lib/plugins/plugin/search.test.js
@@ -4,15 +4,14 @@ const chai = require('chai');
 const sinon = require('sinon');
 const BbPromise = require('bluebird');
 const PluginSearch = require('../../../../../lib/plugins/plugin/search');
-const Serverless = require('../../../../../lib/Serverless');
-const CLI = require('../../../../../lib/classes/CLI');
+const Serverless = require('../../../../../lib/serverless');
+const CLI = require('../../../../../lib/classes/cli');
 chai.use(require('chai-as-promised'));
 const expect = require('chai').expect;
 
 describe('PluginSearch', () => {
   let pluginSearch;
   let serverless;
-  let consoleLogStub;
 
   const plugins = [
     {
@@ -33,15 +32,10 @@ describe('PluginSearch', () => {
   ];
 
   beforeEach(() => {
-    serverless = new Serverless();
+    serverless = new Serverless({ commands: [], options: {} });
     serverless.cli = new CLI(serverless);
     const options = {};
     pluginSearch = new PluginSearch(serverless, options);
-    consoleLogStub = sinon.stub(serverless.cli, 'consoleLog').returns();
-  });
-
-  afterEach(() => {
-    serverless.cli.consoleLog.restore();
   });
 
   describe('#constructor()', () => {
@@ -98,7 +92,6 @@ describe('PluginSearch', () => {
       pluginSearch.options.query = 'serverless-plugin-1';
 
       return expect(pluginSearch.search()).to.be.fulfilled.then(() => {
-        expect(consoleLogStub.calledOnce).to.equal(true);
         expect(getPluginsStub.calledOnce).to.equal(true);
         expect(displayStub.calledOnce).to.equal(true);
       });
diff --git a/test/unit/lib/plugins/plugin/uninstall.test.js b/test/unit/lib/plugins/plugin/uninstall.test.js
deleted file mode 100644
index 29632a0dfa9..00000000000
--- a/test/unit/lib/plugins/plugin/uninstall.test.js
+++ /dev/null
@@ -1,528 +0,0 @@
-'use strict';
-
-const chai = require('chai');
-const sinon = require('sinon');
-const BbPromise = require('bluebird');
-const yaml = require('js-yaml');
-const path = require('path');
-const childProcess = BbPromise.promisifyAll(require('child_process'));
-const fse = require('fs-extra');
-const PluginUninstall = require('../../../../../lib/plugins/plugin/uninstall');
-const Serverless = require('../../../../../lib/Serverless');
-const CLI = require('../../../../../lib/classes/CLI');
-const { expect } = require('chai');
-const { getTmpDirPath } = require('../../../../utils/fs');
-
-chai.use(require('chai-as-promised'));
-
-describe('PluginUninstall', () => {
-  let pluginUninstall;
-  let serverless;
-  let consoleLogStub;
-  let serverlessErrorStub;
-
-  const plugins = [
-    {
-      name: 'serverless-plugin-1',
-      description: 'Serverless Plugin 1',
-      githubUrl: 'https://github.com/serverless/serverless-plugin-1',
-    },
-    {
-      name: 'serverless-plugin-2',
-      description: 'Serverless Plugin 2',
-      githubUrl: 'https://github.com/serverless/serverless-plugin-2',
-    },
-    {
-      name: 'serverless-existing-plugin',
-      description: 'Serverless Existing plugin',
-      githubUrl: 'https://github.com/serverless/serverless-existing-plugin',
-    },
-  ];
-
-  beforeEach(() => {
-    serverless = new Serverless();
-    serverless.cli = new CLI(serverless);
-    const options = {};
-    pluginUninstall = new PluginUninstall(serverless, options);
-    consoleLogStub = sinon.stub(serverless.cli, 'consoleLog').returns();
-    serverlessErrorStub = sinon.stub(serverless.classes, 'Error').throws();
-  });
-
-  afterEach(() => {
-    serverless.cli.consoleLog.restore();
-    serverless.classes.Error.restore();
-  });
-
-  describe('#constructor()', () => {
-    let uninstallStub;
-
-    beforeEach(() => {
-      uninstallStub = sinon.stub(pluginUninstall, 'uninstall').returns(BbPromise.resolve());
-    });
-
-    afterEach(() => {
-      pluginUninstall.uninstall.restore();
-    });
-
-    it('should have the sub-command "uninstall"', () => {
-      expect(pluginUninstall.commands.plugin.commands.uninstall).to.not.equal(undefined);
-    });
-
-    it('should have the lifecycle event "uninstall" for the "uninstall" sub-command', () => {
-      expect(pluginUninstall.commands.plugin.commands.uninstall.lifecycleEvents).to.deep.equal([
-        'uninstall',
-      ]);
-    });
-
-    it('should have a required option "name" for the "uninstall" sub-command', () => {
-      // eslint-disable-next-line no-unused-expressions
-      expect(pluginUninstall.commands.plugin.commands.uninstall.options.name.required).to.be.true;
-    });
-
-    it('should have a "plugin:uninstall:uninstall" hook', () => {
-      expect(pluginUninstall.hooks['plugin:uninstall:uninstall']).to.not.equal(undefined);
-    });
-
-    it('should run promise chain in order for "plugin:uninstall:uninstall" hook', () =>
-      expect(pluginUninstall.hooks['plugin:uninstall:uninstall']()).to.be.fulfilled.then(() => {
-        expect(uninstallStub.calledOnce).to.equal(true);
-      }));
-  });
-
-  describe('#uninstall()', () => {
-    let serviceDir;
-    let serverlessYmlFilePath;
-    let pluginUninstallStub;
-    let validateStub;
-    let getPluginsStub;
-    let savedCwd;
-    let removePluginFromServerlessFileStub;
-    let uninstallPeerDependenciesStub;
-
-    beforeEach(() => {
-      serviceDir = getTmpDirPath();
-      pluginUninstall.serverless.serviceDir = serviceDir;
-      fse.ensureDirSync(serviceDir);
-      serverlessYmlFilePath = path.join(serviceDir, 'serverless.yml');
-      validateStub = sinon.stub(pluginUninstall, 'validate').returns(BbPromise.resolve());
-      pluginUninstallStub = sinon
-        .stub(pluginUninstall, 'pluginUninstall')
-        .returns(BbPromise.resolve());
-      removePluginFromServerlessFileStub = sinon
-        .stub(pluginUninstall, 'removePluginFromServerlessFile')
-        .returns(BbPromise.resolve());
-      uninstallPeerDependenciesStub = sinon
-        .stub(pluginUninstall, 'uninstallPeerDependencies')
-        .returns(BbPromise.resolve());
-      getPluginsStub = sinon
-        .stub(pluginUninstall, 'getPlugins')
-        .returns(BbPromise.resolve(plugins));
-      // save the cwd so that we can restore it later
-      savedCwd = process.cwd();
-      process.chdir(serviceDir);
-    });
-
-    afterEach(() => {
-      pluginUninstall.validate.restore();
-      pluginUninstall.getPlugins.restore();
-      pluginUninstall.pluginUninstall.restore();
-      pluginUninstall.removePluginFromServerlessFile.restore();
-      pluginUninstall.uninstallPeerDependencies.restore();
-      process.chdir(savedCwd);
-    });
-
-    it('should uninstall the plugin if it can be found in the registry', () => {
-      // serverless.yml
-      const serverlessYml = {
-        service: 'plugin-service',
-        provider: 'aws',
-      };
-      serverless.utils.writeFileSync(serverlessYmlFilePath, yaml.dump(serverlessYml));
-
-      pluginUninstall.options.name = 'serverless-plugin-1';
-
-      return expect(pluginUninstall.uninstall()).to.be.fulfilled.then(() => {
-        expect(validateStub.calledOnce).to.equal(true);
-        expect(getPluginsStub.calledOnce).to.equal(true);
-        expect(pluginUninstallStub.calledOnce).to.equal(true);
-        expect(consoleLogStub.called).to.equal(true);
-        expect(serverlessErrorStub.calledOnce).to.equal(false);
-        expect(removePluginFromServerlessFileStub.calledOnce).to.equal(true);
-        expect(uninstallPeerDependenciesStub.calledOnce).to.equal(true);
-      });
-    });
-
-    it('should uninstall the plugin even if it can not be found in the registry', () => {
-      // serverless.yml
-      const serverlessYml = {
-        service: 'plugin-service',
-        provider: 'aws',
-      };
-      serverless.utils.writeFileSync(serverlessYmlFilePath, yaml.dump(serverlessYml));
-
-      pluginUninstall.options.name = 'serverless-not-in-registry-plugin';
-
-      return expect(pluginUninstall.uninstall()).to.be.fulfilled.then(() => {
-        expect(validateStub.calledOnce).to.equal(true);
-        expect(getPluginsStub.calledOnce).to.equal(true);
-        expect(pluginUninstallStub.calledOnce).to.equal(true);
-        expect(consoleLogStub.called).to.equal(true);
-        expect(serverlessErrorStub.calledOnce).to.equal(false);
-        expect(removePluginFromServerlessFileStub.calledOnce).to.equal(true);
-        expect(uninstallPeerDependenciesStub.calledOnce).to.equal(true);
-      });
-    });
-
-    it('should drop the version if specify', () => {
-      const serverlessYml = {
-        service: 'plugin-service',
-        provider: 'aws',
-      };
-      serverless.utils.writeFileSync(serverlessYmlFilePath, yaml.dump(serverlessYml));
-      pluginUninstall.options.name = 'serverless-plugin-1@1.0';
-      return expect(pluginUninstall.uninstall()).to.be.fulfilled.then(() => {
-        expect(pluginUninstall.options.pluginName).to.be.equal('serverless-plugin-1');
-      });
-    });
-  });
-
-  describe('#pluginUninstall()', () => {
-    let serviceDir;
-    let packageJsonFilePath;
-    let npmUninstallStub;
-    let savedCwd;
-
-    beforeEach(() => {
-      pluginUninstall.options.pluginName = 'serverless-plugin-1';
-      serviceDir = getTmpDirPath();
-      pluginUninstall.serverless.serviceDir = serviceDir;
-      fse.ensureDirSync(serviceDir);
-      packageJsonFilePath = path.join(serviceDir, 'package.json');
-      npmUninstallStub = sinon.stub(childProcess, 'execAsync').returns(BbPromise.resolve());
-      // save the cwd so that we can restore it later
-      savedCwd = process.cwd();
-      process.chdir(serviceDir);
-    });
-
-    afterEach(() => {
-      childProcess.execAsync.restore();
-      process.chdir(savedCwd);
-    });
-
-    it('should uninstall the plugin if it has not been uninstalled yet', () => {
-      const packageJson = {
-        name: 'test-service',
-        description: '',
-        version: '0.1.0',
-        dependencies: {},
-        devDependencies: {
-          'serverless-plugin-1': '^1.0.0',
-        },
-      };
-
-      serverless.utils.writeFileSync(packageJsonFilePath, packageJson);
-
-      return expect(pluginUninstall.pluginUninstall()).to.be.fulfilled.then(() => {
-        expect(consoleLogStub.called).to.equal(true);
-        expect(
-          npmUninstallStub.calledWithExactly('npm uninstall --save-dev serverless-plugin-1', {
-            stdio: 'ignore',
-          })
-        ).to.equal(true);
-        expect(serverlessErrorStub.calledOnce).to.equal(false);
-      });
-    });
-  });
-
-  describe('#removePluginFromServerlessFile()', () => {
-    let serviceDir;
-    let serverlessYmlFilePath;
-
-    beforeEach(() => {
-      serviceDir = getTmpDirPath();
-      pluginUninstall.serverless.serviceDir = pluginUninstall.serverless.serviceDir = serviceDir;
-      pluginUninstall.serverless.configurationFilename = 'serverless.yml';
-      serverlessYmlFilePath = path.join(serviceDir, 'serverless.yml');
-    });
-
-    it('should only remove the given plugin from the service', () => {
-      // serverless.yml
-      const serverlessYml = {
-        service: 'plugin-service',
-        provider: 'aws',
-        plugins: ['serverless-existing-plugin', 'serverless-plugin-1'],
-      };
-      serverless.utils.writeFileSync(serverlessYmlFilePath, yaml.dump(serverlessYml));
-
-      pluginUninstall.options.pluginName = 'serverless-plugin-1';
-
-      return expect(pluginUninstall.removePluginFromServerlessFile()).to.be.fulfilled.then(() => {
-        expect(serverless.utils.readFileSync(serverlessYmlFilePath, 'utf8').plugins).to.deep.equal([
-          'serverless-existing-plugin',
-        ]);
-      });
-    });
-
-    it('should remove the plugin from the service if it is the only one', () => {
-      // serverless.yml
-      const serverlessYml = {
-        service: 'plugin-service',
-        provider: 'aws',
-        plugins: ['serverless-plugin-1'],
-      };
-      serverless.utils.writeFileSync(serverlessYmlFilePath, yaml.dump(serverlessYml));
-
-      pluginUninstall.options.pluginName = 'serverless-plugin-1';
-
-      return expect(pluginUninstall.removePluginFromServerlessFile()).to.be.fulfilled.then(() => {
-        expect(serverless.utils.readFileSync(serverlessYmlFilePath, 'utf8')).to.not.have.property(
-          'plugins'
-        );
-      });
-    });
-
-    it('should remove the plugin from serverless file path for a .yaml file', () => {
-      const serverlessYamlFilePath = path.join(serviceDir, 'serverless.yaml');
-      pluginUninstall.serverless.configurationFilename = 'serverless.yaml';
-      const serverlessYml = {
-        service: 'plugin-service',
-        provider: 'aws',
-        plugins: ['serverless-plugin-1'],
-      };
-      serverless.utils.writeFileSync(serverlessYamlFilePath, yaml.dump(serverlessYml));
-      pluginUninstall.options.pluginName = 'serverless-plugin-1';
-      return expect(pluginUninstall.removePluginFromServerlessFile()).to.be.fulfilled.then(() => {
-        expect(serverless.utils.readFileSync(serverlessYamlFilePath, 'utf8')).to.not.have.property(
-          'plugins'
-        );
-      });
-    });
-
-    it('should remove the plugin from serverless file path for a .json file', () => {
-      const serverlessJsonFilePath = path.join(serviceDir, 'serverless.json');
-      pluginUninstall.serverless.configurationFilename = 'serverless.json';
-      const serverlessJson = {
-        service: 'plugin-service',
-        provider: 'aws',
-        plugins: ['serverless-plugin-1', 'serverless-plugin-2'],
-      };
-      serverless.utils.writeFileSync(serverlessJsonFilePath, serverlessJson);
-      pluginUninstall.options.pluginName = 'serverless-plugin-1';
-      return expect(pluginUninstall.removePluginFromServerlessFile())
-        .to.be.fulfilled.then(() => {
-          expect(
-            serverless.utils.readFileSync(serverlessJsonFilePath, 'utf8').plugins
-          ).to.deep.equal(['serverless-plugin-2']);
-          pluginUninstall.options.pluginName = 'serverless-plugin-2';
-        })
-        .then(() =>
-          expect(pluginUninstall.removePluginFromServerlessFile()).to.be.fulfilled.then(() => {
-            expect(
-              serverless.utils.readFileSync(serverlessJsonFilePath, 'utf8')
-            ).to.not.have.property('plugins');
-          })
-        )
-        .then(() =>
-          expect(pluginUninstall.removePluginFromServerlessFile()).to.be.fulfilled.then(() => {
-            expect(
-              serverless.utils.readFileSync(serverlessJsonFilePath, 'utf8')
-            ).to.not.have.property('plugins');
-          })
-        );
-    });
-
-    it('should not modify serverless .js file', () => {
-      const serverlessJsFilePath = path.join(serviceDir, 'serverless.js');
-      pluginUninstall.serverless.configurationFilename = 'serverless.js';
-      const serverlessJson = {
-        service: 'plugin-service',
-        provider: 'aws',
-        plugins: ['serverless-plugin-1', 'serverless-plugin-2'],
-      };
-      serverless.utils.writeFileSync(
-        serverlessJsFilePath,
-        `module.exports = ${JSON.stringify(serverlessJson)};`
-      );
-      pluginUninstall.options.pluginName = 'serverless-plugin-1';
-      return expect(pluginUninstall.removePluginFromServerlessFile()).to.be.fulfilled.then(() => {
-        // use require to load serverless.js
-        // eslint-disable-next-line global-require
-        expect(require(serverlessJsFilePath).plugins).to.be.deep.equal(serverlessJson.plugins);
-      });
-    });
-
-    it('should not modify serverless .ts file', () => {
-      const serverlessTsFilePath = path.join(serviceDir, 'serverless.ts');
-      pluginUninstall.serverless.configurationFilename = 'serverless.ts';
-      const serverlessJson = {
-        service: 'plugin-service',
-        provider: 'aws',
-        plugins: ['serverless-plugin-1', 'serverless-plugin-2'],
-      };
-      serverless.utils.writeFileSync(
-        serverlessTsFilePath,
-        `module.exports = ${JSON.stringify(serverlessJson)};`
-      );
-      pluginUninstall.options.pluginName = 'serverless-plugin-1';
-      return expect(pluginUninstall.removePluginFromServerlessFile()).to.be.fulfilled.then(() => {
-        // use require to load serverless.js
-        // eslint-disable-next-line global-require
-        expect(require(serverlessTsFilePath).plugins).to.be.deep.equal(serverlessJson.plugins);
-      });
-    });
-
-    describe('if plugins object is not array', () => {
-      it('should only remove the given plugin from the service', () => {
-        // serverless.yml
-        const serverlessYml = {
-          service: 'plugin-service',
-          provider: 'aws',
-          plugins: {
-            localPath: 'test',
-            modules: ['serverless-existing-plugin', 'serverless-plugin-1'],
-          },
-        };
-        serverless.utils.writeFileSync(serverlessYmlFilePath, yaml.dump(serverlessYml));
-
-        pluginUninstall.options.pluginName = 'serverless-plugin-1';
-
-        return expect(pluginUninstall.removePluginFromServerlessFile()).to.be.fulfilled.then(() => {
-          expect(
-            serverless.utils.readFileSync(serverlessYmlFilePath, 'utf8').plugins
-          ).to.deep.equal({
-            localPath: 'test',
-            modules: ['serverless-existing-plugin'],
-          });
-        });
-      });
-
-      it('should remove the plugin from the service if it is the only one', () => {
-        // serverless.yml
-        const serverlessYml = {
-          service: 'plugin-service',
-          provider: 'aws',
-          plugins: {
-            localPath: 'test',
-            modules: ['serverless-plugin-1'],
-          },
-        };
-        serverless.utils.writeFileSync(serverlessYmlFilePath, yaml.dump(serverlessYml));
-
-        pluginUninstall.options.pluginName = 'serverless-plugin-1';
-
-        return expect(pluginUninstall.removePluginFromServerlessFile()).to.be.fulfilled.then(() => {
-          expect(
-            serverless.utils.readFileSync(serverlessYmlFilePath, 'utf8').plugins
-          ).to.deep.equal({
-            localPath: 'test',
-          });
-        });
-      });
-
-      it('should remove the plugin from serverless file path for a .json file', () => {
-        const serverlessJsonFilePath = path.join(serviceDir, 'serverless.json');
-        pluginUninstall.serverless.configurationFilename = 'serverless.json';
-        const serverlessJson = {
-          service: 'plugin-service',
-          provider: 'aws',
-          plugins: {
-            localPath: 'test',
-            modules: ['serverless-plugin-1', 'serverless-plugin-2'],
-          },
-        };
-        serverless.utils.writeFileSync(serverlessJsonFilePath, serverlessJson);
-        pluginUninstall.options.pluginName = 'serverless-plugin-1';
-        return expect(pluginUninstall.removePluginFromServerlessFile())
-          .to.be.fulfilled.then(() => {
-            expect(
-              serverless.utils.readFileSync(serverlessJsonFilePath, 'utf8').plugins
-            ).to.deep.equal({
-              localPath: 'test',
-              modules: ['serverless-plugin-2'],
-            });
-            pluginUninstall.options.pluginName = 'serverless-plugin-2';
-          })
-          .then(() =>
-            expect(pluginUninstall.removePluginFromServerlessFile()).to.be.fulfilled.then(() => {
-              expect(
-                serverless.utils.readFileSync(serverlessJsonFilePath, 'utf8').plugins
-              ).to.deep.equal({
-                localPath: 'test',
-              });
-            })
-          )
-          .then(() =>
-            expect(pluginUninstall.removePluginFromServerlessFile()).to.be.fulfilled.then(() => {
-              expect(
-                serverless.utils.readFileSync(serverlessJsonFilePath, 'utf8').plugins
-              ).to.deep.equal({
-                localPath: 'test',
-              });
-            })
-          );
-      });
-    });
-  });
-
-  describe('#uninstallPeerDependencies()', () => {
-    let serviceDir;
-    let pluginPath;
-    let pluginPackageJsonFilePath;
-    let pluginName;
-    let npmUninstallStub;
-    let savedCwd;
-
-    beforeEach(() => {
-      pluginName = 'some-plugin';
-      pluginUninstall.options.pluginName = pluginName;
-      serviceDir = getTmpDirPath();
-      pluginUninstall.serverless.serviceDir = serviceDir;
-      pluginPath = path.join(serviceDir, 'node_modules', pluginName);
-      fse.ensureDirSync(pluginPath);
-      pluginPackageJsonFilePath = path.join(pluginPath, 'package.json');
-      npmUninstallStub = sinon.stub(childProcess, 'execAsync').returns(BbPromise.resolve());
-      savedCwd = process.cwd();
-      process.chdir(serviceDir);
-    });
-
-    afterEach(() => {
-      childProcess.execAsync.restore();
-      process.chdir(savedCwd);
-    });
-
-    it('should uninstall peerDependencies if an installed plugin has ones', () => {
-      fse.writeJsonSync(pluginPackageJsonFilePath, {
-        peerDependencies: {
-          'some-plugin': '*',
-        },
-      });
-      return expect(pluginUninstall.uninstallPeerDependencies()).to.be.fulfilled.then(() => {
-        expect(
-          npmUninstallStub.calledWithExactly(`npm uninstall --save-dev ${pluginName}`, {
-            stdio: 'ignore',
-          })
-        ).to.equal(true);
-      });
-    });
-
-    it('should not uninstall peerDependencies if an installed plugin does not have ones', () => {
-      fse.writeJsonSync(pluginPackageJsonFilePath, {});
-      return expect(pluginUninstall.uninstallPeerDependencies()).to.be.fulfilled.then(() => {
-        expect(
-          npmUninstallStub.calledWithExactly(`npm uninstall --save-dev ${pluginName}`, {
-            stdio: 'ignore',
-          })
-        ).to.equal(false);
-      });
-    });
-
-    it('should do nothing if an uninstalled plugin does not have package.json', () =>
-      expect(pluginUninstall.uninstallPeerDependencies()).to.be.fulfilled.then(() => {
-        expect(
-          npmUninstallStub.calledWithExactly(`npm uninstall --save-dev ${pluginName}`, {
-            stdio: 'ignore',
-          })
-        ).to.equal(false);
-      }));
-  });
-});
diff --git a/test/unit/lib/plugins/print.test.js b/test/unit/lib/plugins/print.test.js
index 5cfdca5bc43..877b7ea8eb2 100644
--- a/test/unit/lib/plugins/print.test.js
+++ b/test/unit/lib/plugins/print.test.js
@@ -1,12 +1,6 @@
 'use strict';
 
-const os = require('os');
 const chai = require('chai');
-const sinon = require('sinon');
-const Serverless = require('../../../../lib/Serverless');
-const CLI = require('../../../../lib/classes/CLI');
-const PrintPlugin = require('../../../../lib/plugins/print.js');
-const yaml = require('js-yaml');
 
 const runServerless = require('../../../utils/run-serverless');
 
@@ -14,332 +8,13 @@ chai.use(require('chai-as-promised'));
 
 const expect = chai.expect;
 
-describe('Print', () => {
-  let print;
-  let serverless;
-
-  beforeEach(() => {
-    serverless = new Serverless();
-    serverless.variables.options = {
-      stage: 'dev',
-      region: 'us-east-1',
-    };
-    serverless.cli = new CLI(serverless);
-    serverless.processedInput = { options: {} };
-    print = new PrintPlugin(serverless);
-    print.serverless.cli = {
-      consoleLog: sinon.spy(),
-    };
-  });
-
-  it('should print standard config', () => {
-    serverless.configurationInput = {
-      service: 'my-service',
-      provider: {
-        name: 'aws',
-      },
-    };
-
-    return print.print().then(() => {
-      const message = print.serverless.cli.consoleLog.args.join();
-
-      expect(print.serverless.cli.consoleLog.called).to.be.equal(true);
-      expect(yaml.load(message)).to.eql(serverless.configurationInput);
-    });
-  });
-
-  it('should print standard config in JSON', () => {
-    serverless.configurationInput = {
-      service: 'my-service',
-      provider: {
-        name: 'aws',
-      },
-    };
-
-    print.options = { format: 'json' };
-    return print.print().then(() => {
-      const message = print.serverless.cli.consoleLog.args.join();
-
-      expect(print.serverless.cli.consoleLog.called).to.be.equal(true);
-      expect(JSON.parse(message)).to.eql(serverless.configurationInput);
-    });
-  });
-
-  it('should apply paths to standard config in JSON', () => {
-    serverless.configurationInput = {
-      service: 'my-service',
-      provider: {
-        name: 'aws',
-      },
-    };
-
-    print.options = { format: 'json', path: 'service' };
-    return print.print().then(() => {
-      const message = print.serverless.cli.consoleLog.args.join();
-
-      expect(print.serverless.cli.consoleLog.called).to.be.equal(true);
-      expect(JSON.parse(message)).to.eql(serverless.configurationInput.service);
-    });
-  });
-
-  it('should apply paths to standard config in text', () => {
-    serverless.configurationInput = {
-      service: 'my-service',
-      provider: {
-        name: 'aws',
-      },
-    };
-
-    print.options = { path: 'provider.name', format: 'text' };
-    return print.print().then(() => {
-      const message = print.serverless.cli.consoleLog.args.join();
-
-      expect(print.serverless.cli.consoleLog.called).to.be.equal(true);
-      expect(message).to.eql(serverless.configurationInput.provider.name);
-    });
-  });
-
-  it('should print arrays in text', () => {
-    serverless.configurationInput = {
-      service: 'my-service',
-      provider: {
-        name: 'aws',
-      },
-    };
-
-    print.options = { transform: 'keys', format: 'text' };
-    return print.print().then(() => {
-      const message = print.serverless.cli.consoleLog.args.join();
-
-      expect(print.serverless.cli.consoleLog.called).to.be.equal(true);
-      expect(message).to.eql(`service${os.EOL}provider`);
-    });
-  });
-
-  it('should apply a keys-transform to standard config in JSON', () => {
-    serverless.configurationInput = {
-      service: 'my-service',
-      provider: {
-        name: 'aws',
-      },
-    };
-
-    print.options = { format: 'json', transform: 'keys' };
-    return print.print().then(() => {
-      const message = print.serverless.cli.consoleLog.args.join();
-
-      expect(print.serverless.cli.consoleLog.called).to.be.equal(true);
-      expect(JSON.parse(message)).to.eql(Object.keys(serverless.configurationInput));
-    });
-  });
-
-  it('should not allow a non-existing path', () => {
-    serverless.configurationInput = {
-      service: 'my-service',
-      provider: {
-        name: 'aws',
-      },
-    };
-
-    print.options = { path: 'provider.foobar' };
-    return expect(print.print()).to.be.rejected;
-  });
-
-  it('should not allow an object as "text"', () => {
-    serverless.configurationInput = {
-      service: 'my-service',
-      provider: {
-        name: 'aws',
-      },
-    };
-
-    print.options = { format: 'text' };
-    return expect(print.print()).to.be.rejected;
-  });
-
-  it('should not allow an unknown transform', () => {
-    serverless.configurationInput = {
-      service: 'my-service',
-      provider: {
-        name: 'aws',
-      },
-    };
-
-    print.options = { transform: 'foobar' };
-    return expect(print.print()).to.be.rejected;
-  });
-
-  it('should not allow an unknown format', () => {
-    serverless.configurationInput = {
-      service: 'my-service',
-      provider: {
-        name: 'aws',
-      },
-    };
-
-    print.options = { format: 'foobar' };
-    return expect(print.print()).to.be.rejected;
-  });
-
-  it('should print special service object and provider string configs', () => {
-    serverless.configurationInput = {
-      service: {
-        name: 'my-service',
-      },
-      provider: 'aws',
-    };
-
-    return print.print().then(() => {
-      const message = print.serverless.cli.consoleLog.args.join();
-
-      expect(print.serverless.cli.consoleLog.called).to.be.equal(true);
-      expect(yaml.load(message)).to.eql(serverless.configurationInput);
-    });
-  });
-
-  it('should resolve command line variables', () => {
-    serverless.configurationInput = {
-      service: 'my-service',
-      provider: {
-        name: 'aws',
-        stage: '${opt:stage}',
-      },
-    };
-
-    serverless.processedInput = {
-      commands: ['print'],
-      options: { stage: 'dev', region: undefined },
-    };
-
-    const expected = {
-      service: 'my-service',
-      provider: {
-        name: 'aws',
-        stage: 'dev',
-      },
-    };
-
-    return print.print().then(() => {
-      const message = print.serverless.cli.consoleLog.args.join();
-
-      expect(print.serverless.cli.consoleLog.called).to.be.equal(true);
-      expect(yaml.load(message)).to.eql(expected);
-    });
-  });
-
-  it('should resolve using custom variable syntax', () => {
-    serverless.configurationInput = {
-      service: 'my-service',
-      provider: {
-        name: 'aws',
-        stage: '${{opt:stage}}',
-        variableSyntax: '\\${{([ ~:a-zA-Z0-9._@\\\'",\\-\\/\\(\\)*?]+?)}}',
-      },
-    };
-    serverless.service.provider.variableSyntax = '\\${{([ ~:a-zA-Z0-9._@\\\'",\\-\\/\\(\\)*?]+?)}}';
-
-    serverless.processedInput = {
-      commands: ['print'],
-      options: { stage: 'dev', region: undefined },
-    };
-
-    const expected = {
-      service: 'my-service',
-      provider: {
-        name: 'aws',
-        stage: 'dev',
-        variableSyntax: '\\${{([ ~:a-zA-Z0-9._@\\\'",\\-\\/\\(\\)*?]+?)}}',
-      },
-    };
-
-    return print.print().then(() => {
-      const message = print.serverless.cli.consoleLog.args.join();
-
-      expect(print.serverless.cli.consoleLog.called).to.be.equal(true);
-      expect(yaml.load(message)).to.eql(expected);
-    });
-  });
-
-  it('should resolve custom variables', () => {
-    serverless.configurationInput = {
-      service: 'my-service',
-      custom: { region: 'us-east-1' },
-      provider: {
-        name: 'aws',
-        stage: '${opt:stage}',
-        region: '${self:custom.region}',
-      },
-    };
-
-    serverless.processedInput = {
-      commands: ['print'],
-      options: { stage: 'dev', region: undefined },
-    };
-    serverless.service.custom = { region: 'us-east-1' };
-
-    const expected = {
-      service: 'my-service',
-      custom: {
-        region: 'us-east-1',
-      },
-      provider: {
-        name: 'aws',
-        stage: 'dev',
-        region: 'us-east-1',
-      },
-    };
-
-    return print.print().then(() => {
-      const message = print.serverless.cli.consoleLog.args.join();
-
-      expect(print.serverless.cli.consoleLog.called).to.be.equal(true);
-      expect(yaml.load(message)).to.eql(expected);
-    });
-  });
-
-  describe('should resolve fallback', () => {
-    [
-      { value: 'hello_123@~:/+', description: 'ascii chars' },
-      { value: '①⑴⒈⒜Ⓐⓐⓟ ..▉가Ὠ', description: 'unicode chars' },
-    ].forEach((testCase) => {
-      it(testCase.description, () => {
-        serverless.configurationInput = {
-          custom: {
-            me: `\${self:none, '${testCase.value}'}`,
-          },
-          provider: {},
-        };
-
-        serverless.processedInput = {
-          commands: ['print'],
-          options: {},
-        };
-
-        const expected = {
-          custom: {
-            me: testCase.value,
-          },
-          provider: {},
-        };
-
-        return print.print().then(() => {
-          const message = print.serverless.cli.consoleLog.args.join();
-
-          expect(print.serverless.cli.consoleLog.called).to.be.equal(true);
-          expect(yaml.load(message)).to.eql(expected);
-        });
-      });
-    });
-  });
-});
-
 describe('test/unit/lib/plugins/print.test.js', () => {
   it('correctly prints config', async () => {
-    const { stdoutData } = await runServerless({
+    const { output } = await runServerless({
       fixture: 'aws',
       command: 'print',
     });
 
-    expect(stdoutData).to.include('name: aws');
+    expect(output).to.include('name: aws');
   });
 });
diff --git a/test/unit/lib/plugins/remove.test.js b/test/unit/lib/plugins/remove.test.js
index 0e07d73db20..25ba1f1a542 100644
--- a/test/unit/lib/plugins/remove.test.js
+++ b/test/unit/lib/plugins/remove.test.js
@@ -2,7 +2,7 @@
 
 const chai = require('chai');
 const Remove = require('../../../../lib/plugins/remove');
-const Serverless = require('../../../../lib/Serverless');
+const Serverless = require('../../../../lib/serverless');
 
 const expect = chai.expect;
 
@@ -11,7 +11,7 @@ describe('Remove', () => {
   let serverless;
 
   beforeEach(() => {
-    serverless = new Serverless();
+    serverless = new Serverless({ commands: [], options: {} });
     remove = new Remove(serverless);
   });
 
diff --git a/test/unit/lib/plugins/rollback.test.js b/test/unit/lib/plugins/rollback.test.js
index 6983fcc5a47..5157b8755d6 100644
--- a/test/unit/lib/plugins/rollback.test.js
+++ b/test/unit/lib/plugins/rollback.test.js
@@ -2,14 +2,14 @@
 
 const expect = require('chai').expect;
 const Rollback = require('../../../../lib/plugins/rollback');
-const Serverless = require('../../../../lib/Serverless');
+const Serverless = require('../../../../lib/serverless');
 
 describe('Rollback', () => {
   let rollback;
   let serverless;
 
   beforeEach(() => {
-    serverless = new Serverless();
+    serverless = new Serverless({ commands: [], options: {} });
     rollback = new Rollback(serverless);
   });
 
diff --git a/test/unit/lib/plugins/slstats.test.js b/test/unit/lib/plugins/slstats.test.js
index 8126d70717c..4bcbb837bd3 100644
--- a/test/unit/lib/plugins/slstats.test.js
+++ b/test/unit/lib/plugins/slstats.test.js
@@ -3,7 +3,7 @@
 const expect = require('chai').expect;
 const sinon = require('sinon');
 const SlStats = require('../../../../lib/plugins/slstats');
-const Serverless = require('../../../../lib/Serverless');
+const Serverless = require('../../../../lib/serverless');
 const config = require('@serverless/utils/config');
 
 describe('SlStats', () => {
@@ -11,7 +11,7 @@ describe('SlStats', () => {
   let serverless;
 
   beforeEach(() => {
-    serverless = new Serverless();
+    serverless = new Serverless({ commands: ['print'], options: {}, serviceDir: null });
     return serverless.init().then(() => {
       slStats = new SlStats(serverless);
     });
@@ -63,26 +63,5 @@ describe('SlStats', () => {
       slStats.toggleStats();
       expect(setStub.calledOnce).to.equal(false);
     });
-
-    it('should catch the error if enabling fails', () => {
-      // here we assume that the tracking fails
-      setStub.throws();
-
-      slStats.options = { enable: true };
-
-      expect(() => slStats.toggleStats()).to.throw(/of statistics failed/);
-      expect(setStub.calledOnce).to.equal(true);
-      expect(setStub.calledWithExactly('trackingDisabled', false)).to.be.true;
-    });
-
-    it('should catch the error if enabling fails', () => {
-      // here we assume that the config setting fails
-      setStub.throws('error while updating config file');
-      slStats.options = { disable: true };
-
-      expect(() => slStats.toggleStats()).to.throw(/of statistics failed/);
-      expect(setStub.calledOnce).to.equal(true);
-      expect(setStub.calledWithExactly('trackingDisabled', true)).to.be.true;
-    });
   });
 });
diff --git a/test/unit/lib/serverless.test.js b/test/unit/lib/serverless.test.js
new file mode 100644
index 00000000000..38d550d8612
--- /dev/null
+++ b/test/unit/lib/serverless.test.js
@@ -0,0 +1,177 @@
+'use strict';
+
+const chai = require('chai');
+
+chai.use(require('chai-as-promised'));
+
+const { expect } = chai;
+
+const Serverless = require('../../../lib/serverless');
+const semverRegex = require('semver-regex');
+
+const YamlParser = require('../../../lib/classes/yaml-parser');
+const PluginManager = require('../../../lib/classes/plugin-manager');
+const Utils = require('../../../lib/classes/utils');
+const Service = require('../../../lib/classes/service');
+const ConfigSchemaHandler = require('../../../lib/classes/config-schema-handler');
+const CLI = require('../../../lib/classes/cli');
+const ServerlessError = require('../../../lib/serverless-error');
+const runServerless = require('../../utils/run-serverless');
+
+describe('Serverless', () => {
+  let serverless;
+
+  beforeEach(() => {
+    serverless = new Serverless({ commands: ['print'], options: {}, serviceDir: null });
+  });
+
+  describe('#constructor()', () => {
+    it('should set an empty providers object', () => {
+      expect(serverless.providers).to.deep.equal({});
+    });
+
+    it('should set the Serverless version', () => {
+      expect(serverless.version.length).to.be.at.least(1);
+    });
+
+    it('should set the YamlParser class instance', () => {
+      expect(serverless.yamlParser).to.be.instanceof(YamlParser);
+    });
+
+    it('should set the PluginManager class instance', () => {
+      expect(serverless.pluginManager).to.be.instanceof(PluginManager);
+    });
+
+    it('should set the Utils class instance', () => {
+      expect(serverless.utils).to.be.instanceof(Utils);
+    });
+
+    it('should set the Service class instance', () => {
+      expect(serverless.service).to.be.instanceof(Service);
+    });
+
+    it('should set the ConfigSchemaHandler class instance', () => {
+      expect(serverless.configSchemaHandler).to.be.instanceof(ConfigSchemaHandler);
+    });
+
+    it('should have a config object', () => {
+      expect(serverless.config).to.not.equal(undefined);
+    });
+
+    it('should have a classes object', () => {
+      expect(serverless.classes).to.not.equal(undefined);
+    });
+
+    it('should store the CLI class inside the classes object', () => {
+      expect(serverless.classes.CLI).to.deep.equal(CLI);
+    });
+
+    it('should store the YamlParser class inside the classes object', () => {
+      expect(serverless.classes.YamlParser).to.deep.equal(YamlParser);
+    });
+
+    it('should store the PluginManager class inside the classes object', () => {
+      expect(serverless.classes.PluginManager).to.deep.equal(PluginManager);
+    });
+
+    it('should store the Utils class inside the classes object', () => {
+      expect(serverless.classes.Utils).to.deep.equal(Utils);
+    });
+
+    it('should store the Service class inside the classes object', () => {
+      expect(serverless.classes.Service).to.deep.equal(Service);
+    });
+
+    it('should store the ConfigSchemaHandler class inside the classes object', () => {
+      expect(serverless.classes.ConfigSchemaHandler).to.deep.equal(ConfigSchemaHandler);
+    });
+
+    it('should store the Error class inside the classes object', () => {
+      expect(serverless.classes.Error).to.deep.equal(ServerlessError);
+    });
+  });
+
+  describe('#init()', () => {
+    it('should set an instanceId', () =>
+      serverless.init().then(() => {
+        expect(serverless.instanceId).to.match(/\d/);
+      }));
+
+    it('should create a new CLI instance', () =>
+      serverless.init().then(() => {
+        expect(serverless.cli).to.be.instanceof(CLI);
+      }));
+
+    it('should allow a custom CLI instance', () => {
+      class CustomCLI extends CLI {}
+      serverless.classes.CLI = CustomCLI;
+
+      return serverless.init().then(() => {
+        expect(serverless.cli).to.be.instanceof(CLI);
+        expect(serverless.cli.constructor.name).to.equal('CustomCLI');
+      });
+    });
+
+    // note: we just test that the processedInput variable is set (not the content of it)
+    // the test for the correct input is done in the CLI class test file
+    it('should receive the processed input form the CLI instance', () =>
+      serverless.init().then(() => {
+        expect(serverless.processedInput).to.not.deep.equal({});
+      }));
+  });
+
+  describe('#setProvider()', () => {
+    class ProviderMock {}
+
+    it('should set the provider object in the provider object', () => {
+      const myProvider = new ProviderMock();
+
+      serverless.setProvider('myProvider', myProvider);
+
+      expect(serverless.providers.myProvider).to.equal(myProvider);
+    });
+  });
+
+  describe('#getProvider()', () => {
+    class ProviderMock {}
+    let myProvider;
+
+    beforeEach(() => {
+      myProvider = new ProviderMock();
+      serverless.setProvider('myProvider', myProvider);
+    });
+
+    it('should return the provider object', () => {
+      const retrivedProvider = serverless.getProvider('myProvider');
+
+      expect(retrivedProvider).to.deep.equal(myProvider);
+    });
+  });
+
+  describe('#getVersion()', () => {
+    it('should get the correct Serverless version', () => {
+      expect(semverRegex().test(serverless.getVersion())).to.equal(true);
+    });
+  });
+});
+
+describe('test/unit/lib/serverless.test.js', () => {
+  describe('Legacy API interface', () => {
+    let serverless;
+
+    before(async () => {
+      ({ serverless } = await runServerless({
+        fixture: 'aws',
+        command: 'package',
+      }));
+    });
+
+    it('Ensure that instance is setup', async () => {
+      expect(serverless.variables).to.have.property('service');
+    });
+
+    it('Ensure config.servicePath', async () => {
+      expect(serverless.config).to.have.property('servicePath');
+    });
+  });
+});
diff --git a/test/unit/lib/utils/create-from-local-template.test.js b/test/unit/lib/utils/create-from-local-template.test.js
new file mode 100644
index 00000000000..4abe6c35f5e
--- /dev/null
+++ b/test/unit/lib/utils/create-from-local-template.test.js
@@ -0,0 +1,63 @@
+'use strict';
+
+const path = require('path');
+const chai = require('chai');
+const fsp = require('fs').promises;
+const { load: yamlParse } = require('js-yaml');
+const createFromLocalTemplate = require('../../../../lib/utils/create-from-local-template');
+const { getTmpDirPath } = require('../../../utils/fs');
+
+const templatesPath = path.resolve(__dirname, '../../../../lib/plugins/create/templates');
+
+chai.use(require('chai-as-promised'));
+
+const expect = chai.expect;
+
+describe('test/unit/lib/utils/create-from-local-template.test.js', () => {
+  describe('Without `projectName` provided', () => {
+    it('should create from template referenced locally', async () => {
+      const tmpDirPath = path.join(getTmpDirPath(), 'some-service');
+      await createFromLocalTemplate({
+        templatePath: path.join(templatesPath, 'aws-nodejs'),
+        projectDir: tmpDirPath,
+      });
+      const stats = await fsp.lstat(path.join(tmpDirPath, 'serverless.yml'));
+      expect(stats.isFile()).to.be.true;
+    });
+  });
+
+  describe('When `templatePath` does not exist', () => {
+    it('should result in an error', async () => {
+      const tmpDirPath = path.join(getTmpDirPath(), 'some-service');
+      await expect(
+        createFromLocalTemplate({
+          templatePath: path.join(templatesPath, 'nonexistent'),
+          projectDir: tmpDirPath,
+        })
+      ).to.eventually.be.rejected.and.have.property('code', 'INVALID_TEMPLATE_PATH');
+    });
+  });
+
+  describe('With `projectName` provided', () => {
+    let tmpDirPath;
+
+    before(async () => {
+      tmpDirPath = path.join(getTmpDirPath(), 'some-service');
+      await createFromLocalTemplate({
+        templatePath: path.join(templatesPath, 'fn-nodejs'),
+        projectDir: tmpDirPath,
+        projectName: 'testproj',
+      });
+    });
+
+    it('should set service name in serverless.yml', async () =>
+      expect(
+        yamlParse(await fsp.readFile(path.join(tmpDirPath, 'serverless.yml'))).service
+      ).to.equal('testproj'));
+
+    it('should set name in package.json', async () =>
+      expect(JSON.parse(await fsp.readFile(path.join(tmpDirPath, 'package.json'))).name).to.equal(
+        'testproj'
+      ));
+  });
+});
diff --git a/test/unit/lib/utils/createFromTemplate.test.js b/test/unit/lib/utils/create-from-template.test.js
similarity index 96%
rename from test/unit/lib/utils/createFromTemplate.test.js
rename to test/unit/lib/utils/create-from-template.test.js
index 36e57912ab6..efd098eb1e4 100644
--- a/test/unit/lib/utils/createFromTemplate.test.js
+++ b/test/unit/lib/utils/create-from-template.test.js
@@ -4,7 +4,7 @@ const path = require('path');
 const chai = require('chai');
 const { existsSync, outputJsonSync, readFileSync } = require('fs-extra');
 const { load: yamlParse } = require('js-yaml');
-const installTemplate = require('../../../../lib/utils/createFromTemplate');
+const installTemplate = require('../../../../lib/utils/create-from-template');
 const { getTmpDirPath } = require('../../../utils/fs');
 
 chai.use(require('chai-as-promised'));
diff --git a/test/unit/lib/utils/deepSortObjectByKey.test.js b/test/unit/lib/utils/deep-sort-object-by-key.test.js
similarity index 95%
rename from test/unit/lib/utils/deepSortObjectByKey.test.js
rename to test/unit/lib/utils/deep-sort-object-by-key.test.js
index 4bdeb8e73ff..7ffba12374b 100644
--- a/test/unit/lib/utils/deepSortObjectByKey.test.js
+++ b/test/unit/lib/utils/deep-sort-object-by-key.test.js
@@ -1,7 +1,7 @@
 'use strict';
 
 const expect = require('chai').expect;
-const deepSortObjectByKey = require('../../../../lib/utils/deepSortObjectByKey');
+const deepSortObjectByKey = require('../../../../lib/utils/deep-sort-object-by-key');
 
 describe('deepSortObjectByKey', () => {
   it('handles plain object', () => {
diff --git a/test/unit/lib/utils/downloadTemplateFromRepo.test.js b/test/unit/lib/utils/download-template-from-repo.test.js
similarity index 88%
rename from test/unit/lib/utils/downloadTemplateFromRepo.test.js
rename to test/unit/lib/utils/download-template-from-repo.test.js
index fd67ee46765..a334b304969 100644
--- a/test/unit/lib/utils/downloadTemplateFromRepo.test.js
+++ b/test/unit/lib/utils/download-template-from-repo.test.js
@@ -11,8 +11,8 @@ const chai = require('chai');
 const { expect } = chai;
 const { getTmpDirPath } = require('../../../utils/fs');
 
-const writeFileSync = require('../../../../lib/utils/fs/writeFileSync');
-const readFileSync = require('../../../../lib/utils/fs/readFileSync');
+const writeFileSync = require('../../../../lib/utils/fs/write-file-sync');
+const readFileSync = require('../../../../lib/utils/fs/read-file-sync');
 
 chai.use(require('chai-as-promised'));
 
@@ -48,7 +48,7 @@ describe('downloadTemplateFromRepo', () => {
     downloadStub = sinon.stub().resolves();
 
     const downloadTemplateFromRepoModule = proxyquire(
-      '../../../../lib/utils/downloadTemplateFromRepo',
+      '../../../../lib/utils/download-template-from-repo',
       {
         'node-fetch': (url) => {
           if (url.indexOf('mybitbucket.server.ltd') > -1) {
@@ -57,7 +57,7 @@ describe('downloadTemplateFromRepo', () => {
 
           return BbPromise.reject(Error('unknown server type'));
         },
-        'download': downloadStub,
+        '@serverless/utils/download': downloadStub,
         'child-process-ext/spawn': spawnStub,
       }
     );
@@ -73,13 +73,15 @@ describe('downloadTemplateFromRepo', () => {
 
   describe('downloadTemplateFromRepo', () => {
     it('should reject an error if the passed URL option is not a valid URL', () => {
-      return expect(downloadTemplateFromRepo('invalidUrl')).to.be.rejectedWith(Error);
+      return expect(
+        downloadTemplateFromRepo('invalidUrl')
+      ).to.be.eventually.rejected.and.have.property('code', 'INVALID_TEMPLATE_URL');
     });
 
     it('should reject an error if the passed URL is not a valid GitHub URL', () => {
       return expect(
         downloadTemplateFromRepo('http://no-git-hub-url.com/foo/bar')
-      ).to.be.rejectedWith(Error);
+      ).to.be.eventually.rejected.and.have.property('code', 'INVALID_TEMPLATE_PROVIDER');
     });
 
     it('should reject an error if a directory with the same service name is already present', () => {
@@ -88,7 +90,7 @@ describe('downloadTemplateFromRepo', () => {
 
       return expect(
         downloadTemplateFromRepo('https://github.com/johndoe/existing-service')
-      ).to.be.rejectedWith(Error);
+      ).to.be.eventually.rejected.and.have.property('code', 'TARGET_FOLDER_ALREADY_EXISTS');
     });
 
     it('should download the service based on a regular .git URL', () => {
@@ -223,23 +225,31 @@ describe('downloadTemplateFromRepo', () => {
       const serviceDirName = path.join(serviceDir, 'rest-api-with-dynamodb');
       fse.mkdirsSync(serviceDirName);
 
-      return expect(downloadTemplateFromRepo(null, url)).to.be.rejectedWith(Error);
+      return expect(
+        downloadTemplateFromRepo(null, url)
+      ).to.be.eventually.rejected.and.have.property('code', 'MISSING_TEMPLATE_URL');
     });
   });
 
   describe('parseRepoURL', () => {
     it('should reject an error if no URL is provided', () => {
-      return expect(parseRepoURL()).to.be.rejectedWith(Error);
+      return expect(parseRepoURL()).to.be.eventually.rejected.and.have.property(
+        'code',
+        'MISSING_TEMPLATE_URL'
+      );
     });
 
     it('should reject an error if URL is not valid', () => {
-      return expect(parseRepoURL('non_valid_url')).to.be.rejectedWith(Error);
+      return expect(parseRepoURL('non_valid_url')).to.be.eventually.rejected.and.have.property(
+        'code',
+        'INVALID_TEMPLATE_URL'
+      );
     });
 
     it('should throw an error if URL is not of valid provider', () => {
-      return expect(parseRepoURL('https://kostasbariotis.com/repo/owner')).to.be.rejectedWith(
-        Error
-      );
+      return expect(
+        parseRepoURL('https://kostasbariotis.com/repo/owner')
+      ).to.be.eventually.rejected.and.have.property('code', 'INVALID_TEMPLATE_PROVIDER');
     });
 
     it('should parse a valid GitHub URL', () => {
@@ -252,7 +262,8 @@ describe('downloadTemplateFromRepo', () => {
             downloadUrl: 'https://github.com/serverless/serverless/archive/master.zip',
             isSubdirectory: false,
             pathToDirectory: '',
-            auth: '',
+            username: '',
+            password: '',
           });
         }
       );
@@ -269,7 +280,8 @@ describe('downloadTemplateFromRepo', () => {
           downloadUrl: 'https://github.com/serverless/serverless/archive/master.zip',
           isSubdirectory: true,
           pathToDirectory: 'assets',
-          auth: '',
+          username: '',
+          password: '',
         });
       });
     });
@@ -285,7 +297,8 @@ describe('downloadTemplateFromRepo', () => {
           downloadUrl: 'https://github.mydomain.com/serverless/serverless/archive/master.zip',
           isSubdirectory: false,
           pathToDirectory: '',
-          auth: '',
+          username: '',
+          password: '',
         });
       });
     });
@@ -301,7 +314,8 @@ describe('downloadTemplateFromRepo', () => {
           downloadUrl: 'https://github.mydomain.com/serverless/serverless/archive/master.zip',
           isSubdirectory: true,
           pathToDirectory: 'assets',
-          auth: '',
+          username: '',
+          password: '',
         });
       });
     });
@@ -316,7 +330,8 @@ describe('downloadTemplateFromRepo', () => {
           branch: 'master',
           downloadUrl: 'https://github.com/serverless/serverless/archive/master.zip',
           isSubdirectory: false,
-          auth: 'username:password',
+          username: 'username',
+          password: 'password',
           pathToDirectory: '',
         });
       });
@@ -331,7 +346,8 @@ describe('downloadTemplateFromRepo', () => {
           downloadUrl: 'https://bitbucket.org/atlassian/localstack/get/master.zip',
           isSubdirectory: false,
           pathToDirectory: '',
-          auth: '',
+          username: '',
+          password: '',
         });
       });
     });
@@ -347,7 +363,8 @@ describe('downloadTemplateFromRepo', () => {
           downloadUrl: 'https://bitbucket.org/atlassian/localstack/get/mvn.zip',
           isSubdirectory: true,
           pathToDirectory: `localstack${path.sep}dashboard`,
-          auth: '',
+          username: '',
+          password: '',
         });
       });
     });
@@ -364,7 +381,8 @@ describe('downloadTemplateFromRepo', () => {
             'https://mybitbucket.server.ltd/rest/api/latest/projects/myproject/repos/myrepo/archive?at=refs%2Fheads%2Fdevelop&format=zip',
           isSubdirectory: false,
           pathToDirectory: '',
-          auth: 'user:pass',
+          username: 'user',
+          password: 'pass',
         });
       });
     });
@@ -379,7 +397,8 @@ describe('downloadTemplateFromRepo', () => {
             'https://gitlab.com/serverless/serverless/-/archive/master/serverless-master.zip',
           isSubdirectory: false,
           pathToDirectory: '',
-          auth: '',
+          username: '',
+          password: '',
         });
       });
     });
@@ -395,7 +414,8 @@ describe('downloadTemplateFromRepo', () => {
               'https://gitlab.com/serverless/serverless/-/archive/dev/serverless-dev.zip',
             isSubdirectory: true,
             pathToDirectory: 'subdir',
-            auth: '',
+            username: '',
+            password: '',
           });
         }
       );
diff --git a/test/unit/lib/utils/getEnsureArtifact.test.js b/test/unit/lib/utils/ensure-artifact.test.js
similarity index 88%
rename from test/unit/lib/utils/getEnsureArtifact.test.js
rename to test/unit/lib/utils/ensure-artifact.test.js
index 49b2011e8e6..6e70ae184fd 100644
--- a/test/unit/lib/utils/getEnsureArtifact.test.js
+++ b/test/unit/lib/utils/ensure-artifact.test.js
@@ -2,10 +2,10 @@
 
 const { expect } = require('chai');
 
-const ensureArtifact = require('../../../../lib/utils/ensureArtifact');
+const ensureArtifact = require('../../../../lib/utils/ensure-artifact');
 
 const path = require('path');
-const fs = require('fs');
+const fsp = require('fs').promises;
 const fse = require('fs-extra');
 const crypto = require('crypto');
 
@@ -18,7 +18,7 @@ describe('#ensureArtifact', () => {
   const generateFunc = async (cachePath) => {
     testArtifactPath = path.resolve(cachePath, testArtifactName);
     ++invokedCount;
-    await fs.promises.writeFile(testArtifactPath, '');
+    await fsp.writeFile(testArtifactPath, '');
   };
 
   it('Should generate artifact if missing', async () => {
diff --git a/test/unit/lib/utils/ensureExists.test.js b/test/unit/lib/utils/ensure-exists.test.js
similarity index 85%
rename from test/unit/lib/utils/ensureExists.test.js
rename to test/unit/lib/utils/ensure-exists.test.js
index 9485f28feac..b1bc6b471fa 100644
--- a/test/unit/lib/utils/ensureExists.test.js
+++ b/test/unit/lib/utils/ensure-exists.test.js
@@ -3,11 +3,11 @@
 const chai = require('chai');
 const sinon = require('sinon');
 
-const ensureExists = require('../../../../lib/utils/ensureExists');
+const ensureExists = require('../../../../lib/utils/ensure-exists');
 const { getTmpDirPath } = require('../../../utils/fs');
 
 const path = require('path');
-const fs = require('fs');
+const fsp = require('fs').promises;
 const crypto = require('crypto');
 
 const expect = chai.expect;
@@ -26,7 +26,7 @@ describe('test/unit/lib/utils/ensureExists.test.js', () => {
 
   it('Should not call generate if file exists', async () => {
     const testFileName = `test-${crypto.randomBytes(2).toString('hex')}`;
-    await fs.promises.writeFile(path.resolve(testCacheDir, testFileName), '');
+    await fsp.writeFile(path.resolve(testCacheDir, testFileName), '');
     const generateStub = sinon.stub().resolves();
     await ensureExists(path.resolve(testCacheDir, testFileName), generateStub);
     expect(generateStub.calledOnce).to.be.false;
diff --git a/test/unit/lib/utils/filesize.test.js b/test/unit/lib/utils/filesize.test.js
new file mode 100644
index 00000000000..589b13cd97a
--- /dev/null
+++ b/test/unit/lib/utils/filesize.test.js
@@ -0,0 +1,42 @@
+'use strict';
+
+const { expect } = require('chai');
+const filesize = require('../../../../lib/utils/filesize');
+
+describe('test/unit/lib/utils/filesize.test.js', () => {
+  it('should display sizes below 1kb literally', () => {
+    expect(filesize(1)).to.equal('1 B');
+    expect(filesize(10)).to.equal('10 B');
+    expect(filesize(12)).to.equal('12 B');
+    expect(filesize(100)).to.equal('100 B');
+    expect(filesize(123)).to.equal('123 B');
+    expect(filesize(987)).to.equal('987 B');
+  });
+
+  it('expect to display round values without decimals', () => {
+    expect(filesize(1000)).to.equal('1 kB');
+    expect(filesize(3000)).to.equal('3 kB');
+    expect(filesize(1000 * 1000)).to.equal('1 MB');
+    expect(filesize(4000 * 1000)).to.equal('4 MB');
+    expect(filesize(1000 * 1000 * 1000)).to.equal('1 GB');
+    expect(filesize(4000 * 1000 * 1000)).to.equal('4 GB');
+  });
+
+  it('expect to display not round values below 9 with decimals', () => {
+    expect(filesize(1123)).to.equal('1.1 kB');
+    expect(filesize(8123)).to.equal('8.1 kB');
+    expect(filesize(1234848)).to.equal('1.2 MB');
+    expect(filesize(8123494)).to.equal('8.1 MB');
+    expect(filesize(1123484848)).to.equal('1.1 GB');
+    expect(filesize(8123494934)).to.equal('8.1 GB');
+  });
+
+  it('expect to display not round values above 9 without decimals', () => {
+    expect(filesize(12123)).to.equal('12 kB');
+    expect(filesize(9123)).to.equal('9 kB');
+    expect(filesize(12234848)).to.equal('12 MB');
+    expect(filesize(9234949)).to.equal('9 MB');
+    expect(filesize(12348484848)).to.equal('12 GB');
+    expect(filesize(9349493432)).to.equal('9 GB');
+  });
+});
diff --git a/test/unit/lib/utils/fs/copyDirContentsSync.test.js b/test/unit/lib/utils/fs/copy-dir-contents-sync.test.js
similarity index 98%
rename from test/unit/lib/utils/fs/copyDirContentsSync.test.js
rename to test/unit/lib/utils/fs/copy-dir-contents-sync.test.js
index 491b919829a..86676cd9e27 100644
--- a/test/unit/lib/utils/fs/copyDirContentsSync.test.js
+++ b/test/unit/lib/utils/fs/copy-dir-contents-sync.test.js
@@ -4,9 +4,9 @@ const expect = require('chai').expect;
 const fs = require('fs');
 const fse = require('fs-extra');
 const path = require('path');
-const copyDirContentsSync = require('../../../../../lib/utils/fs/copyDirContentsSync');
-const fileExistsSync = require('../../../../../lib/utils/fs/fileExistsSync');
-const writeFileSync = require('../../../../../lib/utils/fs/writeFileSync');
+const copyDirContentsSync = require('../../../../../lib/utils/fs/copy-dir-contents-sync');
+const fileExistsSync = require('../../../../../lib/utils/fs/file-exists-sync');
+const writeFileSync = require('../../../../../lib/utils/fs/write-file-sync');
 const skipOnDisabledSymlinksInWindows = require('@serverless/test/skip-on-disabled-symlinks-in-windows');
 
 describe('#copyDirContentsSync()', () => {
diff --git a/test/unit/lib/utils/fs/createZipFile.test.js b/test/unit/lib/utils/fs/create-zip-file.test.js
similarity index 98%
rename from test/unit/lib/utils/fs/createZipFile.test.js
rename to test/unit/lib/utils/fs/create-zip-file.test.js
index 0432557daaf..6c46139d49f 100644
--- a/test/unit/lib/utils/fs/createZipFile.test.js
+++ b/test/unit/lib/utils/fs/create-zip-file.test.js
@@ -2,7 +2,7 @@
 
 const path = require('path');
 const chai = require('chai');
-const createZipFile = require('../../../../../lib/utils/fs/createZipFile');
+const createZipFile = require('../../../../../lib/utils/fs/create-zip-file');
 const { createTmpFile, listZipFiles } = require('../../../../utils/fs');
 
 // Configure chai
diff --git a/test/unit/lib/utils/fs/fileExistsSync.test.js b/test/unit/lib/utils/fs/file-exists-sync.test.js
similarity index 64%
rename from test/unit/lib/utils/fs/fileExistsSync.test.js
rename to test/unit/lib/utils/fs/file-exists-sync.test.js
index 67dc1c7ab39..7a0c554a9c5 100644
--- a/test/unit/lib/utils/fs/fileExistsSync.test.js
+++ b/test/unit/lib/utils/fs/file-exists-sync.test.js
@@ -3,7 +3,8 @@
 const path = require('path');
 const expect = require('chai').expect;
 const fse = require('fs-extra');
-const fileExistsSync = require('../../../../../lib/utils/fs/fileExistsSync');
+const skipOnDisabledSymlinksInWindows = require('@serverless/test/skip-on-disabled-symlinks-in-windows');
+const fileExistsSync = require('../../../../../lib/utils/fs/file-exists-sync');
 
 describe('#fileExistsSync()', () => {
   describe('When reading a file', () => {
@@ -19,22 +20,37 @@ describe('#fileExistsSync()', () => {
   });
 
   describe('When reading a symlink to a file', () => {
-    it('should detect if the file exists', () => {
-      fse.symlinkSync(__filename, 'sym');
+    it('should detect if the file exists', function () {
+      try {
+        fse.symlinkSync(__filename, 'sym');
+      } catch (error) {
+        skipOnDisabledSymlinksInWindows(error, this);
+        throw error;
+      }
       const found = fileExistsSync('sym');
       expect(found).to.equal(true);
       fse.unlinkSync('sym');
     });
 
-    it("should detect if the file doesn't exist w/ bad symlink", () => {
-      fse.symlinkSync('oops', 'invalid-sym');
+    it("should detect if the file doesn't exist w/ bad symlink", function () {
+      try {
+        fse.symlinkSync('oops', 'invalid-sym');
+      } catch (error) {
+        skipOnDisabledSymlinksInWindows(error, this);
+        throw error;
+      }
       const found = fileExistsSync('invalid-sym');
       expect(found).to.equal(false);
       fse.unlinkSync('invalid-sym');
     });
 
-    it("should detect if the file doesn't exist w/ symlink to dir", () => {
-      fse.symlinkSync(__dirname, 'dir-sym');
+    it("should detect if the file doesn't exist w/ symlink to dir", function () {
+      try {
+        fse.symlinkSync(__dirname, 'dir-sym');
+      } catch (error) {
+        skipOnDisabledSymlinksInWindows(error, this);
+        throw error;
+      }
       const found = fileExistsSync('dir-sym');
       expect(found).to.equal(false);
       fse.unlinkSync('dir-sym');
diff --git a/test/unit/lib/utils/fs/fileExists.test.js b/test/unit/lib/utils/fs/file-exists.test.js
similarity index 88%
rename from test/unit/lib/utils/fs/fileExists.test.js
rename to test/unit/lib/utils/fs/file-exists.test.js
index 7e7f3b5c6cf..bc7823a2737 100644
--- a/test/unit/lib/utils/fs/fileExists.test.js
+++ b/test/unit/lib/utils/fs/file-exists.test.js
@@ -2,7 +2,7 @@
 
 const path = require('path');
 const chai = require('chai');
-const fileExists = require('../../../../../lib/utils/fs/fileExists');
+const fileExists = require('../../../../../lib/utils/fs/file-exists');
 
 // Configure chai
 chai.use(require('chai-as-promised'));
diff --git a/test/unit/lib/utils/fs/getTmpDirPath.test.js b/test/unit/lib/utils/fs/get-tmp-dir-path.test.js
similarity index 75%
rename from test/unit/lib/utils/fs/getTmpDirPath.test.js
rename to test/unit/lib/utils/fs/get-tmp-dir-path.test.js
index 7ca06638d10..929b52b7404 100644
--- a/test/unit/lib/utils/fs/getTmpDirPath.test.js
+++ b/test/unit/lib/utils/fs/get-tmp-dir-path.test.js
@@ -1,7 +1,7 @@
 'use strict';
 
 const expect = require('chai').expect;
-const getTmpDirPath = require('../../../../../lib/utils/fs/getTmpDirPath');
+const getTmpDirPath = require('../../../../../lib/utils/fs/get-tmp-dir-path');
 
 describe('#getTmpDirPath()', () => {
   it('should return a scoped tmp dir path', () => {
diff --git a/test/unit/lib/utils/fs/readFileSync.test.js b/test/unit/lib/utils/fs/read-file-sync.test.js
similarity index 93%
rename from test/unit/lib/utils/fs/readFileSync.test.js
rename to test/unit/lib/utils/fs/read-file-sync.test.js
index a98cc2977c8..2f447f993c4 100644
--- a/test/unit/lib/utils/fs/readFileSync.test.js
+++ b/test/unit/lib/utils/fs/read-file-sync.test.js
@@ -1,8 +1,8 @@
 'use strict';
 
 const expect = require('chai').expect;
-const writeFileSync = require('../../../../../lib/utils/fs/writeFileSync');
-const readFileSync = require('../../../../../lib/utils/fs/readFileSync');
+const writeFileSync = require('../../../../../lib/utils/fs/write-file-sync');
+const readFileSync = require('../../../../../lib/utils/fs/read-file-sync');
 const { getTmpFilePath } = require('../../../../utils/fs');
 
 describe('#readFileSync()', () => {
diff --git a/test/unit/lib/utils/fs/readFile.test.js b/test/unit/lib/utils/fs/read-file.test.js
similarity index 91%
rename from test/unit/lib/utils/fs/readFile.test.js
rename to test/unit/lib/utils/fs/read-file.test.js
index 428a9a5daf3..45c306abf6a 100644
--- a/test/unit/lib/utils/fs/readFile.test.js
+++ b/test/unit/lib/utils/fs/read-file.test.js
@@ -1,8 +1,8 @@
 'use strict';
 
 const chai = require('chai');
-const writeFile = require('../../../../../lib/utils/fs/writeFile');
-const readFile = require('../../../../../lib/utils/fs/readFile');
+const writeFile = require('../../../../../lib/utils/fs/write-file');
+const readFile = require('../../../../../lib/utils/fs/read-file');
 const { getTmpFilePath } = require('../../../../utils/fs');
 
 // Configure chai
diff --git a/test/unit/lib/utils/fs/safe-move-file.test.js b/test/unit/lib/utils/fs/safe-move-file.test.js
new file mode 100644
index 00000000000..0f498870cc8
--- /dev/null
+++ b/test/unit/lib/utils/fs/safe-move-file.test.js
@@ -0,0 +1,137 @@
+'use strict';
+
+const fse = require('fs-extra');
+const sinon = require('sinon');
+const chai = require('chai');
+const provisionTempDir = require('@serverless/test/provision-tmp-dir');
+const { join } = require('path');
+const { expect } = require('chai');
+const fsp = require('fs').promises;
+const fs = require('fs');
+const sinonChai = require('sinon-chai');
+const safeMoveFile = require('../../../../../lib/utils/fs/safe-move-file');
+
+chai.use(sinonChai);
+
+/**
+ * Returns and Error object that resembles the EXDEV errors that are thrown
+ * when you try to rename across device boundaries.
+ *
+ * @returns an Error object that resembles the EXDEV errors are thrown
+ */
+const createFakeExDevError = () => {
+  // Properties captured by using fs.renameSync in the Node v12.20.1 REPL
+  const fakeCrossDeviceError = new Error(
+    "Error: EXDEV: cross-device link not permitted, rename '/foo/bar' -> '/bar/baz'"
+  );
+  // This is the important property that safeMoveFile looks for
+  // to fallback to copy then rename behaviour
+  fakeCrossDeviceError.code = 'EXDEV';
+
+  // These other properties aren't used but it doesn't hurt to have an accurate error object
+  fakeCrossDeviceError.errno = -18;
+  fakeCrossDeviceError.syscall = 'rename';
+  fakeCrossDeviceError.path = '/foo/bar';
+  fakeCrossDeviceError.dest = '/bar/baz';
+  return fakeCrossDeviceError;
+};
+
+/**
+ * The name of the file that will be moved
+ */
+const artifactName = 'foo-bar.zip';
+
+describe('test/unit/lib/utils/fs/safeMoveFile.test.js', () => {
+  let sourceDir;
+  let destinationDir;
+  let sourceFile;
+  let destinationFile;
+
+  let renameStub;
+
+  beforeEach(async () => {
+    sourceDir = await provisionTempDir();
+    destinationDir = await provisionTempDir();
+    sourceFile = join(sourceDir, artifactName);
+    destinationFile = join(destinationDir, artifactName);
+
+    renameStub = sinon.stub(fsp, 'rename');
+    // Allow the fs calls to act as normal until we want to force the rename to fail
+    renameStub.callThrough();
+
+    // Write a test file to rename
+    await fsp.writeFile(sourceFile, 'source data');
+  });
+
+  afterEach(async () => {
+    // Clean up test directories after each test so they don't interfere with each other
+    await fse.remove(destinationDir);
+    await fse.remove(sourceDir);
+    // Reset stubbed methods
+    fsp.rename.restore();
+  });
+
+  /**
+   * Run the test suite with the provided post assertion function.
+   * The post assertion function will be called after each test scenario is executed
+   * so that the test scenarios can be reused.
+   *
+   * @param {*} postAssertion the function that is called after every test scenario
+   */
+  const runTestScenariosWithPostAssertion = (postAssertion) => {
+    describe('when file at target path does not exist', () => {
+      it('should move file to target destination', async () => {
+        await safeMoveFile(sourceFile, destinationFile);
+
+        const sourceExists = fs.existsSync(sourceFile);
+        const destinationExists = fs.existsSync(destinationFile);
+
+        expect(sourceExists).to.be.false;
+        expect(destinationExists).to.be.true;
+
+        postAssertion();
+      });
+    });
+
+    describe('when file at target path already exists', () => {
+      beforeEach(async () => {
+        // Create an existing file that is at the destination
+        fse.ensureFileSync(destinationFile);
+        fse.writeFileSync(destinationFile, 'existing destination data');
+      });
+
+      it('should overwrite the file at the target destination', async () => {
+        await safeMoveFile(sourceFile, destinationFile);
+
+        // Check that the file was actually overwritten
+        const cachedData = fse.readFileSync(destinationFile).toString();
+        expect(cachedData).not.to.eq('existing destination data');
+
+        const sourceExists = await fs.existsSync(sourceFile);
+        expect(sourceExists).to.be.false;
+
+        postAssertion();
+      });
+    });
+  };
+
+  describe('when file is moved in context of same device', () => {
+    runTestScenariosWithPostAssertion(() => {
+      // Happy path: Only rename is called
+      expect(renameStub).to.have.be.calledOnce;
+    });
+  });
+
+  describe('when file is moved to different device', () => {
+    beforeEach(async () => {
+      const error = createFakeExDevError();
+      renameStub.onFirstCall().rejects(error);
+    });
+
+    runTestScenariosWithPostAssertion(() => {
+      // Rename is called twice because the first call will fail due to the cross device rename
+      // The second call is across the same device
+      expect(renameStub).to.have.been.calledTwice;
+    });
+  });
+});
diff --git a/test/unit/lib/utils/fs/walkDirSync.test.js b/test/unit/lib/utils/fs/walk-dir-sync.test.js
similarity index 95%
rename from test/unit/lib/utils/fs/walkDirSync.test.js
rename to test/unit/lib/utils/fs/walk-dir-sync.test.js
index e6bcbf2ec80..8bc9ac52d4e 100644
--- a/test/unit/lib/utils/fs/walkDirSync.test.js
+++ b/test/unit/lib/utils/fs/walk-dir-sync.test.js
@@ -2,8 +2,8 @@
 
 const fs = require('fs');
 const path = require('path');
-const writeFileSync = require('../../../../../lib/utils/fs/writeFileSync');
-const walkDirSync = require('../../../../../lib/utils/fs/walkDirSync');
+const writeFileSync = require('../../../../../lib/utils/fs/write-file-sync');
+const walkDirSync = require('../../../../../lib/utils/fs/walk-dir-sync');
 const { expect } = require('chai');
 const { getTmpDirPath } = require('../../../../utils/fs');
 const skipOnDisabledSymlinksInWindows = require('@serverless/test/skip-on-disabled-symlinks-in-windows');
diff --git a/test/unit/lib/utils/fs/writeFileSync.test.js b/test/unit/lib/utils/fs/write-file-sync.test.js
similarity index 83%
rename from test/unit/lib/utils/fs/writeFileSync.test.js
rename to test/unit/lib/utils/fs/write-file-sync.test.js
index 65ba0e0a05b..9edb3099638 100644
--- a/test/unit/lib/utils/fs/writeFileSync.test.js
+++ b/test/unit/lib/utils/fs/write-file-sync.test.js
@@ -1,9 +1,9 @@
 'use strict';
 
-const fse = require('fs-extra');
-const Serverless = require('../../../../../lib/Serverless');
-const writeFileSync = require('../../../../../lib/utils/fs/writeFileSync');
-const readFileSync = require('../../../../../lib/utils/fs/readFileSync');
+const fsp = require('fs').promises;
+const Serverless = require('../../../../../lib/serverless');
+const writeFileSync = require('../../../../../lib/utils/fs/write-file-sync');
+const readFileSync = require('../../../../../lib/utils/fs/read-file-sync');
 const { expect } = require('chai');
 const { getTmpFilePath } = require('../../../../utils/fs');
 
@@ -11,7 +11,7 @@ describe('#writeFileSync()', () => {
   let serverless;
 
   beforeEach(() => {
-    serverless = new Serverless();
+    serverless = new Serverless({ commands: [], options: {} });
   });
 
   it('should write a .json file synchronously', () => {
@@ -57,7 +57,7 @@ describe('#writeFileSync()', () => {
 
     writeFileSync(tmpFilePath, bar, true);
 
-    return fse.readFile(tmpFilePath, 'utf8').then((contents) => {
+    return fsp.readFile(tmpFilePath, 'utf8').then((contents) => {
       expect(contents).to.equal(expected);
     });
   });
diff --git a/test/unit/lib/utils/fs/writeFile.test.js b/test/unit/lib/utils/fs/write-file.test.js
similarity index 80%
rename from test/unit/lib/utils/fs/writeFile.test.js
rename to test/unit/lib/utils/fs/write-file.test.js
index 433e0a1abd8..7f3a0f0d308 100644
--- a/test/unit/lib/utils/fs/writeFile.test.js
+++ b/test/unit/lib/utils/fs/write-file.test.js
@@ -1,10 +1,10 @@
 'use strict';
 
-const fse = require('fs-extra');
-const Serverless = require('../../../../../lib/Serverless');
+const fsp = require('fs').promises;
+const Serverless = require('../../../../../lib/serverless');
 const chai = require('chai');
-const writeFile = require('../../../../../lib/utils/fs/writeFile');
-const readFile = require('../../../../../lib/utils/fs/readFile');
+const writeFile = require('../../../../../lib/utils/fs/write-file');
+const readFile = require('../../../../../lib/utils/fs/read-file');
 const { getTmpFilePath } = require('../../../../utils/fs');
 
 // Configure chai
@@ -17,7 +17,7 @@ describe('#writeFile()', function () {
   this.timeout(0);
 
   beforeEach(() => {
-    serverless = new Serverless();
+    serverless = new Serverless({ commands: [], options: {} });
   });
 
   it('should write a .json file asynchronously', () => {
@@ -50,7 +50,7 @@ describe('#writeFile()', function () {
     const expected = '{\n  "foo": {\n    "$ref": "$"\n  }\n}';
 
     return writeFile(tmpFilePath, bar, true).then(() =>
-      expect(fse.readFile(tmpFilePath, 'utf8')).to.eventually.equal(expected)
+      expect(fsp.readFile(tmpFilePath, 'utf8')).to.eventually.equal(expected)
     );
   });
 });
diff --git a/test/unit/lib/utils/getCommandSuggestion.test.js b/test/unit/lib/utils/getCommandSuggestion.test.js
deleted file mode 100644
index 9a377a1fe51..00000000000
--- a/test/unit/lib/utils/getCommandSuggestion.test.js
+++ /dev/null
@@ -1,29 +0,0 @@
-'use strict';
-
-const expect = require('chai').expect;
-const getCommandSuggestion = require('../../../../lib/utils/getCommandSuggestion');
-const Serverless = require('../../../../lib/Serverless');
-
-describe('#getCommandSuggestion', () => {
-  let serverless;
-
-  before(() => {
-    serverless = new Serverless();
-    return serverless.init();
-  });
-
-  it('should return "package" as a suggested command if you input "pekage"', () => {
-    const suggestedCommand = getCommandSuggestion('pekage', serverless.cli.loadedCommands);
-    expect(suggestedCommand).to.be.equal('package');
-  });
-
-  it('should return "deploy" as a suggested command if you input "deploi"', () => {
-    const suggestedCommand = getCommandSuggestion('deploi', serverless.cli.loadedCommands);
-    expect(suggestedCommand).to.be.equal('deploy');
-  });
-
-  it('should return "invoke" as a suggested command if you input "lnvoke"', () => {
-    const suggestedCommand = getCommandSuggestion('lnvoke', serverless.cli.loadedCommands);
-    expect(suggestedCommand).to.be.equal('invoke');
-  });
-});
diff --git a/test/unit/lib/utils/log-deprecation.test.js b/test/unit/lib/utils/log-deprecation.test.js
new file mode 100644
index 00000000000..b90a9738cf2
--- /dev/null
+++ b/test/unit/lib/utils/log-deprecation.test.js
@@ -0,0 +1,33 @@
+'use strict';
+
+const sandbox = require('sinon');
+const expect = require('chai').expect;
+const overrideEnv = require('process-utils/override-env');
+const ServerlessError = require('../../../../lib/serverless-error');
+
+describe('test/unit/lib/utils/logDeprecation.test.js', () => {
+  let restoreEnv;
+
+  beforeEach(() => {
+    delete require.cache[require.resolve('../../../../lib/utils/log-deprecation')];
+    ({ restoreEnv } = overrideEnv({
+      whitelist: ['APPDATA', 'HOME', 'PATH', 'TEMP', 'TMP', 'TMPDIR', 'USERPROFILE'],
+    }));
+  });
+
+  afterEach(() => {
+    sandbox.restore();
+    restoreEnv();
+  });
+
+  it('should throw on deprecation if error notifications mode set in service config', () => {
+    const logDeprecation = require('../../../../lib/utils/log-deprecation');
+    expect(() =>
+      logDeprecation('CODE1', 'Start using deprecation log', {
+        serviceConfig: { deprecationNotificationMode: 'error' },
+      })
+    )
+      .to.throw(ServerlessError)
+      .with.property('code', 'REJECTED_DEPRECATION_CODE1');
+  });
+});
diff --git a/test/unit/lib/utils/logDeprecation.test.js b/test/unit/lib/utils/logDeprecation.test.js
deleted file mode 100644
index cc798040923..00000000000
--- a/test/unit/lib/utils/logDeprecation.test.js
+++ /dev/null
@@ -1,107 +0,0 @@
-'use strict';
-
-const sandbox = require('sinon');
-const expect = require('chai').expect;
-const mockRequire = require('mock-require');
-const overrideEnv = require('process-utils/override-env');
-const overrideStdoutWrite = require('process-utils/override-stdout-write');
-const runServerless = require('../../../utils/run-serverless');
-
-describe('#logDeprecation()', () => {
-  let restoreEnv;
-  let originalEnv;
-  let logDeprecation;
-
-  beforeEach(() => {
-    logDeprecation = mockRequire.reRequire('../../../../lib/utils/logDeprecation');
-    ({ originalEnv, restoreEnv } = overrideEnv());
-  });
-
-  afterEach(() => {
-    sandbox.restore();
-    restoreEnv();
-  });
-
-  it('Should log deprecation message if not disabled and first time', () => {
-    let stdoutData = '';
-    overrideStdoutWrite(
-      (data) => (stdoutData += data),
-      () => logDeprecation('CODE1', 'Start using deprecation log')
-    );
-    expect(stdoutData).to.include('Start using deprecation log');
-
-    expect(stdoutData).to.include('Deprecation warning');
-    expect(stdoutData).to.include('https://www.serverless.com/framework/docs/deprecations/#CODE1');
-  });
-
-  it('Should not log deprecation if disabled in env.SLS_DEPRECATION_DISABLE', () => {
-    process.env.SLS_DEPRECATION_DISABLE = 'CODE1';
-    logDeprecation = mockRequire.reRequire('../../../../lib/utils/logDeprecation');
-    let stdoutData = '';
-    overrideStdoutWrite(
-      (data) => (stdoutData += data),
-      () => logDeprecation('CODE1', 'Start using deprecation log')
-    );
-    expect(stdoutData).to.equal('');
-  });
-
-  it('Should not log deprecation if disabled in serviceConfig', () => {
-    // We need original process env variables for npm-conf
-    Object.assign(process.env, originalEnv);
-    return runServerless({
-      fixture: 'function',
-      configExt: { disabledDeprecations: ['CODE1'] },
-      command: 'package',
-    }).then(({ serverless }) => {
-      const serviceConfig = serverless.service;
-      let stdoutData = '';
-      overrideStdoutWrite(
-        (data) => (stdoutData += data),
-        () => logDeprecation('CODE1', 'Start using deprecation log', { serviceConfig })
-      );
-      expect(stdoutData).to.equal('');
-    });
-  });
-
-  it('Should not log deprecation if disabled by wildcard in env', () => {
-    process.env.SLS_DEPRECATION_DISABLE = '*';
-    logDeprecation = mockRequire.reRequire('../../../../lib/utils/logDeprecation');
-    let stdoutData = '';
-    overrideStdoutWrite(
-      (data) => (stdoutData += data),
-      () => logDeprecation('CODE1', 'Start using deprecation log')
-    );
-    expect(stdoutData).to.equal('');
-  });
-
-  it('Should not log deprecation if disabled by wildcard in service config', () => {
-    Object.assign(process.env, originalEnv);
-    return runServerless({
-      fixture: 'function',
-      configExt: { disabledDeprecations: '*' },
-      command: 'package',
-    }).then(({ serverless }) => {
-      const serviceConfig = serverless.service;
-      let stdoutData = '';
-      overrideStdoutWrite(
-        (data) => (stdoutData += data),
-        () => logDeprecation('CODE1', 'Start using deprecation log', { serviceConfig })
-      );
-      expect(stdoutData).to.equal('');
-    });
-  });
-
-  it('Should not log deprecation twice', () => {
-    let stdoutData = '';
-    overrideStdoutWrite(
-      (data) => (stdoutData += data),
-      () => {
-        logDeprecation('CODE1', 'Start using deprecation log');
-        expect(stdoutData).to.include('Start using deprecation log');
-        stdoutData = '';
-        logDeprecation('CODE1', 'Start using deprecation log');
-      }
-    );
-    expect(stdoutData).to.equal('');
-  });
-});
diff --git a/test/unit/lib/utils/renameService.test.js b/test/unit/lib/utils/rename-service.test.js
similarity index 96%
rename from test/unit/lib/utils/renameService.test.js
rename to test/unit/lib/utils/rename-service.test.js
index 45cda8431da..71cc0a59832 100644
--- a/test/unit/lib/utils/renameService.test.js
+++ b/test/unit/lib/utils/rename-service.test.js
@@ -1,12 +1,12 @@
 'use strict';
 
-const Serverless = require('../../../../lib/Serverless');
+const Serverless = require('../../../../lib/serverless');
 const fse = require('fs-extra');
 const path = require('path');
 const { expect } = require('chai');
 const { getTmpDirPath } = require('../../../utils/fs');
 
-const { renameService } = require('../../../../lib/utils/renameService');
+const { renameService } = require('../../../../lib/utils/rename-service');
 
 describe('renameService', () => {
   let serverless;
@@ -23,7 +23,7 @@ describe('renameService', () => {
 
     serviceDir = tmpDir;
 
-    serverless = new Serverless();
+    serverless = new Serverless({ commands: ['print'], options: {}, serviceDir: null });
     return serverless.init();
   });
 
@@ -201,6 +201,8 @@ describe('renameService', () => {
   });
 
   it('should fail to set new service name in serverless.yml', () => {
-    expect(() => renameService('new-service-name', serviceDir)).to.throw(Error);
+    expect(() => renameService('new-service-name', serviceDir))
+      .to.throw()
+      .and.have.property('code', 'MISSING_SERVICE_FILE');
   });
 });
diff --git a/test/unit/lib/utils/report-deprecated-properties.test.js b/test/unit/lib/utils/report-deprecated-properties.test.js
deleted file mode 100644
index 7d614f762fb..00000000000
--- a/test/unit/lib/utils/report-deprecated-properties.test.js
+++ /dev/null
@@ -1,69 +0,0 @@
-'use strict';
-
-const expect = require('chai').expect;
-const report = require('../../../../lib/utils/report-deprecated-properties');
-const { triggeredDeprecations } = require('../../../../lib/utils/logDeprecation');
-const overrideStdoutWrite = require('process-utils/override-stdout-write');
-
-describe('report-deprecated-properties', () => {
-  let stdoutData = '';
-  afterEach(() => {
-    stdoutData = '';
-    triggeredDeprecations.clear();
-  });
-
-  const serviceConfig = {
-    provider: {
-      role: 'role-a',
-      iamRoleStatements: ['something'],
-      apiGateway: {
-        isDodgy: true,
-      },
-    },
-  };
-
-  it('should warn about deprecated usage', () => {
-    overrideStdoutWrite(
-      (data) => (stdoutData += data),
-      () =>
-        report(
-          'MY_CODE',
-          {
-            'provider.role': 'provider.iam.role',
-            'provider.cfnRole': 'provider.iam.deploymentRole',
-            'provider.iamRoleStatements': 'provider.iam.role.statements',
-            'provider.apiGateway.isDodgy': 'provider.apiGateway.legitOption',
-          },
-          { serviceConfig }
-        )
-    );
-    expect(triggeredDeprecations).to.include('MY_CODE');
-    expect(stdoutData).to.include(
-      'Starting with version 3.0.0, following properties will be replaced'
-    );
-    expect(stdoutData).to.include('"provider.role" -> "provider.iam.role"');
-    expect(stdoutData).to.include('"provider.iamRoleStatements" -> "provider.iam.role.statements"');
-    expect(stdoutData).to.include(
-      '"provider.apiGateway.isDodgy" -> "provider.apiGateway.legitOption"'
-    );
-    expect(stdoutData).not.to.include('"provider.cfnRole" -> "provider.iam.role.deploymentRole"');
-  });
-
-  it('no deprecated usage', () => {
-    overrideStdoutWrite(
-      (data) => (stdoutData += data),
-      () =>
-        report(
-          'MY_CODE',
-          {
-            'provider.bad': 'provider.good',
-            'provider.veryBad': 'provider.veryGood',
-          },
-          { serviceConfig }
-        )
-    );
-
-    expect(triggeredDeprecations).not.to.include('MY_CODE');
-    expect(stdoutData).to.be.equal('');
-  });
-});
diff --git a/test/unit/lib/utils/resolve-region.test.js b/test/unit/lib/utils/resolve-region.test.js
new file mode 100644
index 00000000000..ca34000c89f
--- /dev/null
+++ b/test/unit/lib/utils/resolve-region.test.js
@@ -0,0 +1,29 @@
+'use strict';
+
+const chai = require('chai');
+
+const expect = chai.expect;
+const resolveRegion = require('../../../../lib/utils/resolve-region');
+
+describe('test/unit/lib/utils/resolve-region.test.js', () => {
+  it('should return `region` from options first if it is present', () => {
+    const result = resolveRegion({
+      configuration: { provider: { region: 'fromprovider' } },
+      options: { region: 'fromoptions' },
+    });
+    expect(result).to.equal('fromoptions');
+  });
+
+  it('should return `region` from configuration if region is not passed in options', () => {
+    const result = resolveRegion({
+      configuration: { provider: { region: 'fromprovider' } },
+      options: {},
+    });
+    expect(result).to.equal('fromprovider');
+  });
+
+  it('should return default region if both options and configuration do not have it defined', () => {
+    const result = resolveRegion({ configuration: {}, options: {} });
+    expect(result).to.equal('us-east-1');
+  });
+});
diff --git a/test/unit/lib/utils/resolve-stage.test.js b/test/unit/lib/utils/resolve-stage.test.js
new file mode 100644
index 00000000000..cf9f4f52b42
--- /dev/null
+++ b/test/unit/lib/utils/resolve-stage.test.js
@@ -0,0 +1,29 @@
+'use strict';
+
+const chai = require('chai');
+
+const expect = chai.expect;
+const resolveStage = require('../../../../lib/utils/resolve-stage');
+
+describe('test/unit/lib/utils/resolve-stage.test.js', () => {
+  it('should return `stage` from options first if it is present', () => {
+    const result = resolveStage({
+      configuration: { provider: { stage: 'fromprovider' } },
+      options: { stage: 'fromoptions' },
+    });
+    expect(result).to.equal('fromoptions');
+  });
+
+  it('should return `stage` from configuration if stage is not passed in options', () => {
+    const result = resolveStage({
+      configuration: { provider: { stage: 'fromprovider' } },
+      options: {},
+    });
+    expect(result).to.equal('fromprovider');
+  });
+
+  it('should return default stage if both options and configuration do not have it defined', () => {
+    const result = resolveStage({ configuration: {}, options: {} });
+    expect(result).to.equal('dev');
+  });
+});
diff --git a/test/unit/lib/utils/tabCompletion/isSupported.test.js b/test/unit/lib/utils/tabCompletion/isSupported.test.js
deleted file mode 100644
index b571b496b64..00000000000
--- a/test/unit/lib/utils/tabCompletion/isSupported.test.js
+++ /dev/null
@@ -1,9 +0,0 @@
-'use strict';
-
-const { expect } = require('chai');
-
-const isSuported = require('../../../../../lib/utils/tabCompletion/isSupported');
-
-describe('isTabtabCompletionSuported', () => {
-  it('Should resolve boolean', () => expect(typeof isSuported).to.equal('boolean'));
-});
diff --git a/test/unit/lib/utils/telemetry/anonymize-stacktrace-paths.test.js b/test/unit/lib/utils/telemetry/anonymize-stacktrace-paths.test.js
new file mode 100644
index 00000000000..70303c70ee5
--- /dev/null
+++ b/test/unit/lib/utils/telemetry/anonymize-stacktrace-paths.test.js
@@ -0,0 +1,177 @@
+'use strict';
+
+const expect = require('chai').expect;
+const anonymizeStacktracePaths = require('../../../../../lib/utils/telemetry/anonymize-stacktrace-paths');
+
+describe('test/unit/lib/utils/anonymize-stacktrace-paths.test.js', () => {
+  if (process.platform !== 'win32') {
+    it('Should remove common prefix up to last `serverless` occurence', () => {
+      const stacktracePaths = [
+        '/home/xxx/serverless/yyy/zzz-serverless/serverless/lib/plugins/aws/package/lib/getHashForFilePath.js:23:13',
+        '/home/xxx/serverless/yyy/zzz-serverless/serverless/lib/plugins/otherfile.js:100:10',
+        '/home/xxx/serverless/yyy/zzz-serverless/serverless/lib/plugins/another.js:100:10',
+      ];
+
+      const result = anonymizeStacktracePaths(stacktracePaths);
+      expect(result).to.deep.equal([
+        '/serverless/lib/plugins/aws/package/lib/getHashForFilePath.js:23:13',
+        '/serverless/lib/plugins/otherfile.js:100:10',
+        '/serverless/lib/plugins/another.js:100:10',
+      ]);
+    });
+
+    it('Should leave relative paths unaltered and do not consider them for common prefix', () => {
+      const stacktracePaths = [
+        '/home/xxx/serverless/yyy/zzz-serverless/serverless/lib/plugins/aws/package/lib/getHashForFilePath.js:23:13',
+        '/home/xxx/serverless/yyy/zzz-serverless/serverless/lib/plugins/otherfile.js:100:10',
+        'somefile.js:100:10',
+        'another.js:100:10',
+      ];
+
+      const result = anonymizeStacktracePaths(stacktracePaths);
+      expect(result).to.deep.equal([
+        '/serverless/lib/plugins/aws/package/lib/getHashForFilePath.js:23:13',
+        '/serverless/lib/plugins/otherfile.js:100:10',
+        'somefile.js:100:10',
+        'another.js:100:10',
+      ]);
+    });
+
+    it('Should remove common prefix if `/serverless/` or `/node_modules/` not found in path', () => {
+      const stacktracePaths = [
+        '/home/xxx/yyy/zzz-serverless/lib/plugins/aws/package/lib/getHashForFilePath.js:23:13',
+        '/home/xxx/yyy/zzz-serverless/lib/plugins/otherfile.js:100:10',
+        '/home/xxx/yyy/zzz-serverless/lib/plugins/another.js:100:10',
+      ];
+
+      const result = anonymizeStacktracePaths(stacktracePaths);
+      expect(result).to.deep.equal([
+        '/aws/package/lib/getHashForFilePath.js:23:13',
+        '/otherfile.js:100:10',
+        '/another.js:100:10',
+      ]);
+    });
+
+    it('Should remove common prefix up to last `node_modules` occurence if `serverless` not found', () => {
+      const stacktracePaths = [
+        '/home/xxx/yyy/zzz-serverless/node_modules/lib/plugins/aws/package/lib/getHashForFilePath.js:23:13',
+        '/home/xxx/yyy/zzz-serverless/node_modules/lib/plugins/otherfile.js:100:10',
+        '/home/xxx/yyy/zzz-serverless/node_modules/lib/plugins/another.js:100:10',
+      ];
+
+      const result = anonymizeStacktracePaths(stacktracePaths);
+      expect(result).to.deep.equal([
+        '/lib/plugins/aws/package/lib/getHashForFilePath.js:23:13',
+        '/lib/plugins/otherfile.js:100:10',
+        '/lib/plugins/another.js:100:10',
+      ]);
+    });
+
+    it('Should strip same following file paths', () => {
+      const stacktracePaths = [
+        '/home/xxx/yyy/zzz-serverless/node_modules/lib/plugins/aws/package/lib/getHashForFilePath.js:23:13',
+        '/home/xxx/yyy/zzz-serverless/node_modules/lib/plugins/aws/package/lib/getHashForFilePath.js:3:3',
+        '/home/xxx/yyy/zzz-serverless/node_modules/lib/plugins/otherfile.js:100:10',
+        '/home/xxx/yyy/zzz-serverless/node_modules/lib/plugins/another.js:100:10',
+        '/home/xxx/yyy/zzz-serverless/node_modules/lib/plugins/another.js:4:12',
+      ];
+
+      const result = anonymizeStacktracePaths(stacktracePaths);
+      expect(result).to.deep.equal([
+        '/lib/plugins/aws/package/lib/getHashForFilePath.js:23:13',
+        '^:3:3',
+        '/lib/plugins/otherfile.js:100:10',
+        '/lib/plugins/another.js:100:10',
+        '^:4:12',
+      ]);
+    });
+  }
+
+  it('Should handle stacktrace with only relative paths', () => {
+    const stacktracePaths = ['somefile.js:100:10', 'another.js:100:10'];
+
+    const result = anonymizeStacktracePaths(stacktracePaths);
+    expect(result).to.deep.equal(['somefile.js:100:10', 'another.js:100:10']);
+  });
+
+  if (process.platform === 'win32') {
+    it('Should remove common prefix up to last `serverless` occurence for windows-style paths', () => {
+      const stacktracePaths = [
+        'C:\\home\\xxx\\serverless\\yyy\\zzz-serverless\\serverless\\lib\\plugins\\aws\\package\\lib\\getHashForFilePath.js:23:13',
+        'C:\\home\\xxx\\serverless\\yyy\\zzz-serverless\\serverless\\lib\\plugins\\otherfile.js:100:10',
+        'C:\\home\\xxx\\serverless\\yyy\\zzz-serverless\\serverless\\lib\\plugins\\another.js:100:10',
+      ];
+
+      const result = anonymizeStacktracePaths(stacktracePaths);
+      expect(result).to.deep.equal([
+        '\\serverless\\lib\\plugins\\aws\\package\\lib\\getHashForFilePath.js:23:13',
+        '\\serverless\\lib\\plugins\\otherfile.js:100:10',
+        '\\serverless\\lib\\plugins\\another.js:100:10',
+      ]);
+    });
+
+    it('Should remove common prefix up to last `serverless` occurence for windows-style paths', () => {
+      const stacktracePaths = [
+        'C:\\home\\xxx\\serverless\\yyy\\zzz-serverless\\serverless\\lib\\plugins\\aws\\package\\lib\\getHashForFilePath.js:23:13',
+        'C:\\home\\xxx\\serverless\\yyy\\zzz-serverless\\serverless\\lib\\plugins\\otherfile.js:100:10',
+        'another.js:100:10',
+      ];
+
+      const result = anonymizeStacktracePaths(stacktracePaths);
+      expect(result).to.deep.equal([
+        '\\serverless\\lib\\plugins\\aws\\package\\lib\\getHashForFilePath.js:23:13',
+        '\\serverless\\lib\\plugins\\otherfile.js:100:10',
+        'another.js:100:10',
+      ]);
+    });
+
+    it('Should remove common prefix if `\\serverless\\` not found in path', () => {
+      const stacktracePaths = [
+        'C:\\home\\xxx\\yyy\\zzz-serverless\\lib\\plugins\\aws\\package\\lib\\getHashForFilePath.js:23:13',
+        'C:\\home\\xxx\\yyy\\zzz-serverless\\lib\\plugins\\otherfile.js:100:10',
+        'C:\\home\\xxx\\yyy\\zzz-serverless\\lib\\plugins\\another.js:100:10',
+      ];
+
+      const result = anonymizeStacktracePaths(stacktracePaths);
+      expect(result).to.deep.equal([
+        '\\aws\\package\\lib\\getHashForFilePath.js:23:13',
+        '\\otherfile.js:100:10',
+        '\\another.js:100:10',
+      ]);
+    });
+
+    it('Should remove common prefix up to last `node_modules` occurence if `serverless` not found', () => {
+      const stacktracePaths = [
+        'C:\\home\\xxx\\yyy\\zzz-serverless\\node_modules\\lib\\plugins\\aws\\package\\lib\\getHashForFilePath.js:23:13',
+        'C:\\home\\xxx\\yyy\\zzz-serverless\\node_modules\\lib\\plugins\\otherfile.js:100:10',
+        'C:\\home\\xxx\\yyy\\zzz-serverless\\node_modules\\lib\\plugins\\another.js:100:10',
+      ];
+
+      const result = anonymizeStacktracePaths(stacktracePaths);
+      expect(result).to.deep.equal([
+        '\\lib\\plugins\\aws\\package\\lib\\getHashForFilePath.js:23:13',
+        '\\lib\\plugins\\otherfile.js:100:10',
+        '\\lib\\plugins\\another.js:100:10',
+      ]);
+    });
+
+    it('Should strip same following file paths', () => {
+      const stacktracePaths = [
+        'C:\\home\\xxx\\yyy\\zzz-serverless\\node_modules\\lib\\plugins\\aws\\package\\lib\\getHashForFilePath.js:23:13',
+        'C:\\home\\xxx\\yyy\\zzz-serverless\\node_modules\\lib\\plugins\\aws\\package\\lib\\getHashForFilePath.js:3:3',
+        'C:\\home\\xxx\\yyy\\zzz-serverless\\node_modules\\lib\\plugins\\otherfile.js:100:10',
+        'C:\\home\\xxx\\yyy\\zzz-serverless\\node_modules\\lib\\plugins\\another.js:100:10',
+        'C:\\home\\xxx\\yyy\\zzz-serverless\\node_modules\\lib\\plugins\\another.js:4:12',
+      ];
+
+      const result = anonymizeStacktracePaths(stacktracePaths);
+      expect(result).to.deep.equal([
+        '\\lib\\plugins\\aws\\package\\lib\\getHashForFilePath.js:23:13',
+        '^:3:3',
+        '\\lib\\plugins\\otherfile.js:100:10',
+        '\\lib\\plugins\\another.js:100:10',
+        '^:4:12',
+      ]);
+    });
+  }
+});
diff --git a/test/unit/lib/utils/telemetry/generate-payload.test.js b/test/unit/lib/utils/telemetry/generate-payload.test.js
new file mode 100644
index 00000000000..b818def9a0c
--- /dev/null
+++ b/test/unit/lib/utils/telemetry/generate-payload.test.js
@@ -0,0 +1,666 @@
+'use strict';
+
+const { expect } = require('chai');
+const path = require('path');
+const fsp = require('fs').promises;
+const os = require('os');
+const overrideEnv = require('process-utils/override-env');
+const proxyquire = require('proxyquire');
+
+const commandsSchema = require('../../../../../lib/cli/commands-schema');
+const runServerless = require('../../../../utils/run-serverless');
+const fixtures = require('../../../../fixtures/programmatic');
+
+const versions = {
+  'serverless': require('../../../../../package').version,
+  '@serverless/dashboard-plugin': require('@serverless/dashboard-plugin/package').version,
+};
+
+const getGeneratePayload = () =>
+  proxyquire('../../../../../lib/utils/telemetry/generate-payload', {
+    '@serverless/utils/get-notifications-mode': () => 'on',
+  });
+
+describe('test/unit/lib/utils/telemetry/generatePayload.test.js', () => {
+  let isTTYCache;
+  let originalModulesCache;
+  before(() => {
+    // In order for tests below to return `commandDurationMs`
+    EvalError.$serverlessCommandStartTime = process.hrtime();
+    isTTYCache = process.stdin.isTTY;
+    process.stdin.isTTY = true;
+    originalModulesCache = Object.assign({}, require.cache);
+  });
+
+  after(() => {
+    process.stdin.isTTY = isTTYCache;
+    for (const key of Object.keys(require.cache)) delete require.cache[key];
+    Object.assign(require.cache, originalModulesCache);
+  });
+
+  beforeEach(() => {
+    for (const key of Object.keys(require.cache)) delete require.cache[key];
+  });
+
+  it('Should resolve payload for AWS service', async () => {
+    const { servicePath: serviceDir } = await fixtures.setup('http-api', {
+      configExt: {
+        provider: {
+          runtime: 'nodejs14.x',
+        },
+        functions: {
+          withContainer: {
+            image:
+              '000000000000.dkr.ecr.sa-east-1.amazonaws.com/test-lambda-docker@sha256:6bb600b4d6e1d7cf521097177dd0c4e9ea373edb91984a505333be8ac9455d38',
+          },
+        },
+        resources: {
+          Resources: {
+            ExtraLogGroup: {
+              Type: 'AWS::Logs::LogGroup',
+              Properties: {
+                LogGroupName: '/aws/lambda/extra-log',
+              },
+            },
+            AnotherExtraLogGroup: {
+              Type: 'AWS::Logs::LogGroup',
+              Properties: {
+                LogGroupName: '/aws/lambda/extra-log-2',
+              },
+            },
+            ExtraBucket: {
+              Type: 'AWS::S3::Bucket',
+            },
+            ExtraCustom: {
+              Type: 'Custom::Matthieu',
+            },
+          },
+          extensions: {
+            FunctionLambdaFunction: {
+              Properties: {
+                Runtime: 'nodejs14.x',
+              },
+            },
+          },
+        },
+      },
+    });
+    await fsp.writeFile(
+      path.resolve(serviceDir, 'package.json'),
+      JSON.stringify({
+        dependencies: {
+          fooDep: '1',
+          barDep: '2',
+        },
+        optionalDependencies: {
+          fooOpt: '1',
+          fooDep: '1',
+        },
+        devDependencies: {
+          someDev: '1',
+          otherDev: '1',
+        },
+      })
+    );
+
+    const { serverless } = await runServerless({
+      cwd: serviceDir,
+      command: 'print',
+    });
+    const payload = getGeneratePayload()({
+      command: 'print',
+      options: {},
+      commandSchema: commandsSchema.get('print'),
+      serviceDir,
+      configuration: serverless.configurationInput,
+    });
+
+    expect(payload).to.have.property('frameworkLocalUserId');
+    delete payload.frameworkLocalUserId;
+    expect(payload).to.have.property('firstLocalInstallationTimestamp');
+    delete payload.firstLocalInstallationTimestamp;
+    expect(payload).to.have.property('timestamp');
+    delete payload.timestamp;
+    expect(payload).to.have.property('dashboard');
+    delete payload.dashboard;
+    expect(payload).to.have.property('timezone');
+    delete payload.timezone;
+    expect(payload).to.have.property('ciName');
+    delete payload.ciName;
+    expect(payload).to.have.property('commandDurationMs');
+    delete payload.commandDurationMs;
+    expect(payload).to.deep.equal({
+      cliName: 'serverless',
+      isTtyTerminal: true,
+      command: 'print',
+      commandOptionNames: [],
+      isConfigValid: true,
+      config: {
+        configValidationMode: 'error',
+        provider: {
+          name: 'aws',
+          runtime: 'nodejs14.x',
+          stage: 'dev',
+          region: 'us-east-1',
+        },
+        plugins: [],
+        functions: [
+          { runtime: 'nodejs14.x', events: [{ type: 'httpApi' }, { type: 'httpApi' }] },
+          { runtime: 'nodejs14.x', events: [{ type: 'httpApi' }] },
+          { runtime: 'nodejs14.x', events: [] },
+          { runtime: 'nodejs14.x', events: [] },
+          { runtime: '$containerimage', events: [] },
+        ],
+        resources: {
+          general: ['AWS::Logs::LogGroup', 'AWS::S3::Bucket', 'Custom'],
+        },
+        variableSources: [],
+        paramsCount: 0,
+      },
+      isAutoUpdateEnabled: false,
+      notificationsMode: 'on',
+      npmDependencies: ['fooDep', 'barDep', 'fooOpt', 'someDev', 'otherDev'],
+      triggeredDeprecations: [],
+      installationType: 'global:other',
+      hasLocalCredentials: false,
+      versions,
+    });
+  });
+
+  it('Should resolve payload for custom provider service', async () => {
+    const { serverless } = await runServerless({
+      fixture: 'custom-provider',
+      command: 'print',
+    });
+    const payload = getGeneratePayload()({
+      command: 'print',
+      options: {},
+      commandSchema: commandsSchema.get('print'),
+      serviceDir: serverless.serviceDir,
+      configuration: serverless.configurationInput,
+      serverless,
+    });
+
+    expect(payload).to.have.property('frameworkLocalUserId');
+    delete payload.frameworkLocalUserId;
+    expect(payload).to.have.property('firstLocalInstallationTimestamp');
+    delete payload.firstLocalInstallationTimestamp;
+    expect(payload).to.have.property('timestamp');
+    delete payload.timestamp;
+    expect(payload).to.have.property('dashboard');
+    delete payload.dashboard;
+    expect(payload).to.have.property('timezone');
+    delete payload.timezone;
+    expect(payload).to.have.property('ciName');
+    delete payload.ciName;
+    expect(payload).to.have.property('commandDurationMs');
+    delete payload.commandDurationMs;
+    expect(payload).to.deep.equal({
+      cliName: 'serverless',
+      isTtyTerminal: true,
+      command: 'print',
+      commandOptionNames: [],
+      isConfigValid: false, // No schema for custom provider
+      config: {
+        configValidationMode: 'warn',
+        provider: {
+          name: 'customProvider',
+          runtime: 'foo',
+          stage: 'dev',
+          region: undefined,
+        },
+        plugins: ['./custom-provider'],
+        functions: [
+          { runtime: 'foo', events: [{ type: 'someEvent' }] },
+          { runtime: 'bar', events: [] },
+        ],
+        resources: undefined,
+        variableSources: [],
+        paramsCount: 0,
+      },
+      isAutoUpdateEnabled: false,
+      notificationsMode: 'on',
+      npmDependencies: [],
+      triggeredDeprecations: [],
+      hasLocalCredentials: false,
+      installationType: 'global:other',
+      versions,
+    });
+  });
+
+  it('Should resolve service-agnostic payload', async () => {
+    const payload = getGeneratePayload()({
+      command: 'config',
+      options: {},
+      commandSchema: commandsSchema.get('config'),
+      serviceDir: process.cwd(),
+      configuration: { service: 'foo', provider: 'aws' },
+    });
+
+    expect(payload).to.have.property('frameworkLocalUserId');
+    delete payload.frameworkLocalUserId;
+    expect(payload).to.have.property('firstLocalInstallationTimestamp');
+    delete payload.firstLocalInstallationTimestamp;
+    expect(payload).to.have.property('timestamp');
+    delete payload.timestamp;
+    expect(payload).to.have.property('dashboard');
+    delete payload.dashboard;
+    expect(payload).to.have.property('timezone');
+    delete payload.timezone;
+    expect(payload).to.have.property('ciName');
+    delete payload.ciName;
+    expect(payload).to.have.property('commandDurationMs');
+    delete payload.commandDurationMs;
+    expect(payload).to.deep.equal({
+      cliName: 'serverless',
+      isTtyTerminal: true,
+      command: 'config',
+      commandOptionNames: [],
+      isAutoUpdateEnabled: false,
+      notificationsMode: 'on',
+      triggeredDeprecations: [],
+      installationType: 'global:other',
+      versions,
+    });
+  });
+
+  it('Should resolve service-agnostic payload for command with `serviceDependencyMode: "optional"`', () => {
+    const payload = getGeneratePayload()({
+      command: '',
+      options: {},
+      commandSchema: commandsSchema.get(''),
+      serviceDir: process.cwd(),
+      configuration: { service: 'foo', provider: 'aws' },
+    });
+
+    expect(payload).to.have.property('frameworkLocalUserId');
+    delete payload.frameworkLocalUserId;
+    expect(payload).to.have.property('firstLocalInstallationTimestamp');
+    delete payload.firstLocalInstallationTimestamp;
+    expect(payload).to.have.property('timestamp');
+    delete payload.timestamp;
+    expect(payload).to.have.property('dashboard');
+    delete payload.dashboard;
+    expect(payload).to.have.property('timezone');
+    delete payload.timezone;
+    expect(payload).to.have.property('ciName');
+    delete payload.ciName;
+    expect(payload).to.have.property('commandDurationMs');
+    delete payload.commandDurationMs;
+    expect(payload).to.deep.equal({
+      command: '',
+      commandOptionNames: [],
+      cliName: 'serverless',
+      isTtyTerminal: true,
+      isConfigValid: null,
+      config: {
+        configValidationMode: 'warn',
+        variableSources: [],
+        provider: {
+          name: 'aws',
+          runtime: 'nodejs12.x',
+          stage: 'dev',
+          region: 'us-east-1',
+        },
+        plugins: [],
+        functions: [],
+        resources: { general: [] },
+        paramsCount: 0,
+      },
+      isAutoUpdateEnabled: false,
+      triggeredDeprecations: [],
+      installationType: 'global:other',
+      notificationsMode: 'on',
+      npmDependencies: [],
+      hasLocalCredentials: false,
+      versions,
+    });
+  });
+
+  it('Should correctly resolve payload with missing service configuration', () => {
+    const payload = getGeneratePayload()({
+      command: 'plugin list',
+      options: {},
+      commandSchema: commandsSchema.get('plugin list'),
+    });
+
+    expect(payload).to.have.property('frameworkLocalUserId');
+    delete payload.frameworkLocalUserId;
+    expect(payload).to.have.property('firstLocalInstallationTimestamp');
+    delete payload.firstLocalInstallationTimestamp;
+    expect(payload).to.have.property('timestamp');
+    delete payload.timestamp;
+    expect(payload).to.have.property('dashboard');
+    delete payload.dashboard;
+    expect(payload).to.have.property('timezone');
+    delete payload.timezone;
+    expect(payload).to.have.property('ciName');
+    delete payload.ciName;
+    expect(payload).to.have.property('commandDurationMs');
+    delete payload.commandDurationMs;
+    expect(payload).to.deep.equal({
+      cliName: 'serverless',
+      isTtyTerminal: true,
+      command: 'plugin list',
+      commandOptionNames: [],
+      isAutoUpdateEnabled: false,
+      notificationsMode: 'on',
+      triggeredDeprecations: [],
+      installationType: 'global:other',
+      versions,
+    });
+  });
+
+  it('Should resolve payload with predefined local config', async () => {
+    await fsp.writeFile(
+      path.resolve(os.homedir(), '.serverlessrc'),
+      JSON.stringify({
+        frameworkId: '123',
+        userId: 'some-user-id',
+        meta: {
+          created_at: 1616151998,
+        },
+      })
+    );
+
+    const payload = getGeneratePayload()({
+      command: 'config',
+      options: {},
+      commandSchema: commandsSchema.get('config'),
+      serviceDir: process.cwd(),
+      configuration: { service: 'foo', provider: 'aws' },
+    });
+    expect(payload.dashboard.userId).to.equal('some-user-id');
+    expect(payload.frameworkLocalUserId).to.equal('123');
+    expect(payload.firstLocalInstallationTimestamp).to.equal(1616151998);
+  });
+
+  it('Should not include userId from local config if SERVERLESS_ACCESS_KEY used', async () => {
+    await fsp.writeFile(
+      path.resolve(os.homedir(), '.serverlessrc'),
+      JSON.stringify({
+        frameworkId: '123',
+        userId: 'some-user-id',
+      })
+    );
+
+    let payload;
+
+    overrideEnv({ variables: { SERVERLESS_ACCESS_KEY: 'some-key' } }, () => {
+      payload = getGeneratePayload()({
+        command: 'config',
+        options: {},
+        commandSchema: commandsSchema.get('config'),
+        serviceDir: process.cwd(),
+        configuration: { service: 'foo', provider: 'aws' },
+      });
+    });
+    expect(payload.dashboard.userId).to.be.null;
+    expect(payload.frameworkLocalUserId).to.equal('123');
+  });
+
+  it('Should correctly detect Serverless CI/CD', () => {
+    let payload;
+
+    overrideEnv({ variables: { SERVERLESS_CI_CD: 'true' } }, () => {
+      payload = getGeneratePayload()({
+        command: 'config',
+        options: {},
+        commandSchema: commandsSchema.get('config'),
+        serviceDir: process.cwd(),
+        configuration: { service: 'foo', provider: 'aws' },
+      });
+    });
+    expect(payload.ciName).to.equal('Serverless CI/CD');
+  });
+
+  it('Should correctly detect Seed CI/CD', () => {
+    let payload;
+
+    overrideEnv({ variables: { SEED_APP_NAME: 'some-app' } }, () => {
+      payload = getGeneratePayload()({
+        command: 'config',
+        options: {},
+        commandSchema: commandsSchema.get('config'),
+        serviceDir: process.cwd(),
+        configuration: { service: 'foo', provider: 'aws' },
+      });
+    });
+    expect(payload.ciName).to.equal('Seed');
+  });
+
+  it('Should correctly resolve `commandOptionNames` property', () => {
+    const payload = getGeneratePayload()({
+      command: 'print',
+      options: {
+        region: 'eu-west-1',
+        format: 'json',
+        path: 'provider.name',
+      },
+      commandSchema: commandsSchema.get('print'),
+      serviceDir: process.cwd(),
+      configuration: { service: 'foo', provider: 'aws' },
+    });
+
+    expect(new Set(payload.commandOptionNames)).to.deep.equal(
+      new Set(['region', 'format', 'path'])
+    );
+  });
+
+  it('Should correctly resolve `constructs` property', () => {
+    const payload = getGeneratePayload()({
+      command: 'print',
+      commandSchema: commandsSchema.get('print'),
+      options: {},
+      serviceDir: process.cwd(),
+      configuration: {
+        service: 'foo',
+        provider: 'aws',
+        constructs: {
+          jobs: {
+            type: 'queue',
+            worker: {
+              handler: 'some.handler',
+            },
+          },
+          another: {
+            type: 'queue',
+            worker: {
+              handler: 'other.handler',
+            },
+          },
+        },
+        plugins: ['serverless-lift'],
+      },
+    });
+    expect(payload.config.constructs).to.deep.equal([
+      {
+        type: 'queue',
+      },
+      {
+        type: 'queue',
+      },
+    ]);
+  });
+
+  it('Should correctly resolve `configValidationMode` property', () => {
+    const payload = getGeneratePayload()({
+      command: 'print',
+      commandSchema: commandsSchema.get('print'),
+      options: {},
+      serviceDir: process.cwd(),
+      configuration: {
+        service: 'foo',
+        provider: 'aws',
+        configValidationMode: 'off',
+      },
+    });
+    expect(payload.config.configValidationMode).to.equal('off');
+  });
+
+  it('Should correctly resolve `hasLocalCredentials` property for AWS provider', () => {
+    let payload;
+    overrideEnv(
+      { variables: { AWS_ACCESS_KEY_ID: 'someaccesskey', AWS_SECRET_ACCESS_KEY: 'secretkey' } },
+      () => {
+        payload = getGeneratePayload()({
+          command: 'print',
+          options: {},
+          commandSchema: commandsSchema.get('print'),
+          serviceDir: process.cwd(),
+          configuration: { service: 'foo', provider: 'aws' },
+        });
+      }
+    );
+
+    expect(payload.hasLocalCredentials).to.equal(true);
+  });
+
+  it('Should correctly resolve `hasLocalCredentials` property for non-AWS provider', () => {
+    let payload;
+    overrideEnv(
+      { variables: { AWS_ACCESS_KEY_ID: 'someaccesskey', AWS_SECRET_ACCESS_KEY: 'secretkey' } },
+      () => {
+        payload = getGeneratePayload()({
+          command: 'print',
+          options: {},
+          commandSchema: commandsSchema.get('print'),
+          serviceDir: process.cwd(),
+          configuration: { service: 'foo', provider: 'other' },
+        });
+      }
+    );
+
+    expect(payload.hasLocalCredentials).to.equal(false);
+  });
+
+  it('Should correctly resolve `commandUsage` property', () => {
+    const payload = getGeneratePayload()({
+      command: 'print',
+      options: {},
+      commandSchema: commandsSchema.get('print'),
+      serviceDir: process.cwd(),
+      configuration: { service: 'foo', provider: 'aws' },
+      commandUsage: [
+        {
+          name: 'firstStep',
+          history: [
+            {
+              key: 'firstQuestion',
+              value: 'answer',
+              timestamp: 1626220800000,
+            },
+            {
+              key: 'otherQuestion',
+              value: 'otherAnswer',
+              timestamp: 1626220800000,
+            },
+          ],
+        },
+      ],
+    });
+
+    expect(payload.commandUsage).to.deep.equal([
+      {
+        name: 'firstStep',
+        history: [
+          {
+            key: 'firstQuestion',
+            value: 'answer',
+            timestamp: 1626220800000,
+          },
+          {
+            key: 'otherQuestion',
+            value: 'otherAnswer',
+            timestamp: 1626220800000,
+          },
+        ],
+      },
+    ]);
+  });
+
+  it('Should correctly resolve `variableSources` property', () => {
+    const payload = getGeneratePayload()({
+      command: 'print',
+      options: {},
+      commandSchema: commandsSchema.get('print'),
+      serviceDir: process.cwd(),
+      configuration: { service: 'foo', provider: 'aws' },
+      commandUsage: [],
+      variableSources: new Set(['ssm', 'opt']),
+    });
+
+    expect(payload.config.variableSources).to.deep.equal(['ssm', 'opt']);
+  });
+
+  it('Should correctly resolve projectId property', async () => {
+    const { serverless } = await runServerless({
+      fixture: 'http-api',
+      command: 'print',
+      configExt: {
+        service: 'to-ensure-unique-serivce-name',
+      },
+    });
+    serverless.getProvider('aws').accountId = '1234567890';
+    const payload = getGeneratePayload()({
+      command: 'deploy',
+      options: {},
+      commandSchema: commandsSchema.get('deploy'),
+      serviceDir: serverless.serviceDir,
+      configuration: serverless.configurationInput,
+      serverless,
+    });
+
+    expect(payload.projectId).to.deep.equal('35dsFwCaexwLHppAP4uDsjKW4ci54q1AKcN5JTNaDtw=');
+  });
+
+  it('Should correctly resolve `didCreateService` property', async () => {
+    const { serverless } = await runServerless({
+      fixture: 'http-api',
+      command: 'print',
+      configExt: {
+        service: 'to-ensure-unique-serivce-name',
+      },
+    });
+    serverless.getProvider('aws').didCreateService = true;
+    const payload = getGeneratePayload()({
+      command: '',
+      options: {},
+      commandSchema: commandsSchema.get('deploy'),
+      serviceDir: serverless.serviceDir,
+      configuration: serverless.configurationInput,
+      serverless,
+    });
+
+    expect(payload.didCreateService).to.be.true;
+  });
+
+  it('Should correctly resolve `params` property', () => {
+    const payload = getGeneratePayload()({
+      command: 'print',
+      options: {},
+      commandSchema: commandsSchema.get('print'),
+      serviceDir: process.cwd(),
+      configuration: {
+        service: 'foo',
+        provider: 'aws',
+        params: {
+          prod: {
+            val: '1',
+            other: '2',
+          },
+          staging: {
+            val: 'dev',
+            stagingonly: '1',
+          },
+          dev: {
+            devonly: 123,
+          },
+        },
+      },
+      commandUsage: [],
+    });
+
+    expect(payload.config.paramsCount).to.equal(4);
+  });
+});
diff --git a/test/unit/lib/utils/telemetry/generatePayload.test.js b/test/unit/lib/utils/telemetry/generatePayload.test.js
deleted file mode 100644
index 74a24e7ef03..00000000000
--- a/test/unit/lib/utils/telemetry/generatePayload.test.js
+++ /dev/null
@@ -1,329 +0,0 @@
-'use strict';
-
-const { expect } = require('chai');
-const path = require('path');
-const fs = require('fs');
-const os = require('os');
-const overrideEnv = require('process-utils/override-env');
-
-const generatePayload = require('../../../../../lib/utils/telemetry/generatePayload');
-const runServerless = require('../../../../utils/run-serverless');
-const fixtures = require('../../../../fixtures/programmatic');
-
-const versions = {
-  'serverless': require('../../../../../package').version,
-  '@serverless/enterprise-plugin': require('@serverless/enterprise-plugin/package').version,
-};
-
-describe('lib/utils/telemetry/generatePayload', () => {
-  it('Should resolve payload for AWS service', async () => {
-    const { servicePath: serviceDir } = await fixtures.setup('httpApi', {
-      configExt: {
-        functions: {
-          withContainer: {
-            image:
-              '000000000000.dkr.ecr.sa-east-1.amazonaws.com/test-lambda-docker@sha256:6bb600b4d6e1d7cf521097177dd0c4e9ea373edb91984a505333be8ac9455d38',
-          },
-        },
-      },
-    });
-    await fs.promises.writeFile(
-      path.resolve(serviceDir, 'package.json'),
-      JSON.stringify({
-        dependencies: {
-          fooDep: '1',
-          barDep: '2',
-        },
-        optionalDependencies: {
-          fooOpt: '1',
-          fooDep: '1',
-        },
-        devDependencies: {
-          someDev: '1',
-          otherDev: '1',
-        },
-      })
-    );
-
-    const { serverless } = await runServerless({
-      cwd: serviceDir,
-      command: 'print',
-    });
-    const payload = await generatePayload(serverless);
-
-    expect(payload).to.have.property('frameworkLocalUserId');
-    delete payload.frameworkLocalUserId;
-    expect(payload).to.have.property('firstLocalInstallationTimestamp');
-    delete payload.firstLocalInstallationTimestamp;
-    expect(payload).to.have.property('timestamp');
-    delete payload.timestamp;
-    expect(payload).to.have.property('dashboard');
-    delete payload.dashboard;
-    expect(payload).to.have.property('timezone');
-    delete payload.timezone;
-    expect(payload).to.have.property('ciName');
-    delete payload.ciName;
-    expect(payload).to.deep.equal({
-      cliName: 'serverless',
-      command: 'print',
-      config: {
-        provider: {
-          name: 'aws',
-          runtime: 'nodejs12.x',
-          stage: 'dev',
-          region: 'us-east-1',
-        },
-        plugins: [],
-        functions: [
-          { runtime: 'nodejs12.x', events: [{ type: 'httpApi' }, { type: 'httpApi' }] },
-          { runtime: 'nodejs12.x', events: [{ type: 'httpApi' }] },
-          { runtime: 'nodejs12.x', events: [] },
-          { runtime: 'nodejs12.x', events: [] },
-          { runtime: '$containerimage', events: [] },
-        ],
-      },
-      isAutoUpdateEnabled: false,
-      isTabAutocompletionInstalled: false,
-      npmDependencies: ['fooDep', 'barDep', 'fooOpt', 'someDev', 'otherDev'],
-      triggeredDeprecations: [],
-      installationType: 'global:other',
-      versions,
-    });
-  });
-
-  it('Should resolve payload for custom provider service', async () => {
-    const { serverless } = await runServerless({
-      fixture: 'customProvider',
-      command: 'print',
-    });
-    const payload = await generatePayload(serverless);
-
-    expect(payload).to.have.property('frameworkLocalUserId');
-    delete payload.frameworkLocalUserId;
-    expect(payload).to.have.property('firstLocalInstallationTimestamp');
-    delete payload.firstLocalInstallationTimestamp;
-    expect(payload).to.have.property('timestamp');
-    delete payload.timestamp;
-    expect(payload).to.have.property('dashboard');
-    delete payload.dashboard;
-    expect(payload).to.have.property('timezone');
-    delete payload.timezone;
-    expect(payload).to.have.property('ciName');
-    delete payload.ciName;
-    expect(payload).to.deep.equal({
-      cliName: 'serverless',
-      command: 'print',
-      config: {
-        provider: {
-          name: 'customProvider',
-          runtime: 'foo',
-          stage: 'dev',
-          region: undefined,
-        },
-        plugins: ['./customProvider'],
-        functions: [
-          { runtime: 'foo', events: [{ type: 'someEvent' }] },
-          { runtime: 'bar', events: [] },
-        ],
-      },
-      isAutoUpdateEnabled: false,
-      isTabAutocompletionInstalled: false,
-      npmDependencies: [],
-      triggeredDeprecations: [],
-      installationType: 'global:other',
-      versions,
-    });
-  });
-
-  it('Should recognize local fallback', async () => {
-    const { serverless } = await runServerless({
-      fixture: 'locallyInstalledServerless',
-      command: 'print',
-      modulesCacheStub: {},
-    });
-    const payload = await generatePayload(serverless);
-
-    expect(payload).to.have.property('frameworkLocalUserId');
-    delete payload.frameworkLocalUserId;
-    expect(payload).to.have.property('firstLocalInstallationTimestamp');
-    delete payload.firstLocalInstallationTimestamp;
-    expect(payload).to.have.property('timestamp');
-    delete payload.timestamp;
-    expect(payload).to.have.property('dashboard');
-    delete payload.dashboard;
-    expect(payload).to.have.property('timezone');
-    delete payload.timezone;
-    expect(payload).to.have.property('ciName');
-    delete payload.ciName;
-    expect(payload).to.deep.equal({
-      cliName: 'serverless',
-      command: 'print',
-      config: {
-        provider: {
-          name: 'aws',
-          runtime: 'nodejs12.x',
-          stage: 'dev',
-          region: 'us-east-1',
-        },
-        plugins: [],
-        functions: [],
-      },
-      isAutoUpdateEnabled: false,
-      isTabAutocompletionInstalled: false,
-      npmDependencies: [],
-      triggeredDeprecations: [],
-      installationType: 'local:fallback',
-      versions,
-    });
-  });
-
-  it('Should resolve service-agnostic payload', async () => {
-    const { serverless } = await runServerless({
-      fixture: 'aws',
-      command: 'config',
-    });
-    const payload = await generatePayload(serverless);
-
-    expect(payload).to.have.property('frameworkLocalUserId');
-    delete payload.frameworkLocalUserId;
-    expect(payload).to.have.property('firstLocalInstallationTimestamp');
-    delete payload.firstLocalInstallationTimestamp;
-    expect(payload).to.have.property('timestamp');
-    delete payload.timestamp;
-    expect(payload).to.have.property('dashboard');
-    delete payload.dashboard;
-    expect(payload).to.have.property('timezone');
-    delete payload.timezone;
-    expect(payload).to.have.property('ciName');
-    delete payload.ciName;
-    expect(payload).to.deep.equal({
-      cliName: 'serverless',
-      command: 'config',
-      isAutoUpdateEnabled: false,
-      isTabAutocompletionInstalled: false,
-      triggeredDeprecations: [],
-      installationType: 'global:other',
-      versions,
-    });
-  });
-
-  it('Should resolve service-agnostic payload for command with `serviceDependencyMode`', async () => {
-    const { serverless } = await runServerless({
-      fixture: 'httpApi',
-      command: 'help',
-    });
-    const payload = await generatePayload(serverless);
-
-    expect(payload).to.have.property('frameworkLocalUserId');
-    delete payload.frameworkLocalUserId;
-    expect(payload).to.have.property('firstLocalInstallationTimestamp');
-    delete payload.firstLocalInstallationTimestamp;
-    expect(payload).to.have.property('timestamp');
-    delete payload.timestamp;
-    expect(payload).to.have.property('dashboard');
-    delete payload.dashboard;
-    expect(payload).to.have.property('timezone');
-    delete payload.timezone;
-    expect(payload).to.have.property('ciName');
-    delete payload.ciName;
-    expect(payload).to.deep.equal({
-      command: 'help',
-      cliName: 'serverless',
-      config: {
-        provider: {
-          name: 'aws',
-          runtime: 'nodejs12.x',
-          stage: 'dev',
-          region: 'us-east-1',
-        },
-        plugins: [],
-        functions: [
-          { runtime: 'nodejs12.x', events: [{ type: 'httpApi' }, { type: 'httpApi' }] },
-          { runtime: 'nodejs12.x', events: [{ type: 'httpApi' }] },
-          { runtime: 'nodejs12.x', events: [] },
-          { runtime: 'nodejs12.x', events: [] },
-        ],
-      },
-      isAutoUpdateEnabled: false,
-      isTabAutocompletionInstalled: false,
-      triggeredDeprecations: [],
-      installationType: 'global:other',
-      npmDependencies: [],
-      versions,
-    });
-  });
-
-  it('Should resolve payload with predefined local config', async () => {
-    const { serverless } = await runServerless({
-      fixture: 'customProvider',
-      command: 'config',
-    });
-
-    await fs.promises.writeFile(
-      path.resolve(os.homedir(), '.serverlessrc'),
-      JSON.stringify({
-        frameworkId: '123',
-        userId: 'some-user-id',
-        meta: {
-          created_at: 1616151998,
-        },
-      })
-    );
-
-    const payload = await generatePayload(serverless);
-    expect(payload.dashboard.userId).to.equal('some-user-id');
-    expect(payload.frameworkLocalUserId).to.equal('123');
-    expect(payload.firstLocalInstallationTimestamp).to.equal(1616151998);
-  });
-
-  it('Should not include userId from local config if SERVERLESS_ACCESS_KEY used', async () => {
-    const { serverless } = await runServerless({
-      fixture: 'customProvider',
-      command: 'config',
-    });
-
-    await fs.promises.writeFile(
-      path.resolve(os.homedir(), '.serverlessrc'),
-      JSON.stringify({
-        frameworkId: '123',
-        userId: 'some-user-id',
-      })
-    );
-
-    let payload;
-
-    await overrideEnv({ variables: { SERVERLESS_ACCESS_KEY: 'some-key' } }, async () => {
-      payload = await generatePayload(serverless);
-    });
-    expect(payload.dashboard.userId).to.be.null;
-    expect(payload.frameworkLocalUserId).to.equal('123');
-  });
-
-  it('Should correctly detect Serverless CI/CD', async () => {
-    const { serverless } = await runServerless({
-      fixture: 'customProvider',
-      command: 'config',
-    });
-
-    let payload;
-
-    await overrideEnv({ variables: { SERVERLESS_CI_CD: 'true' } }, async () => {
-      payload = await generatePayload(serverless);
-    });
-    expect(payload.ciName).to.equal('Serverless CI/CD');
-  });
-
-  it('Should correctly detect Seed CI/CD', async () => {
-    const { serverless } = await runServerless({
-      fixture: 'customProvider',
-      command: 'config',
-    });
-
-    let payload;
-
-    await overrideEnv({ variables: { SEED_APP_NAME: 'some-app' } }, async () => {
-      payload = await generatePayload(serverless);
-    });
-    expect(payload.ciName).to.equal('Seed');
-  });
-});
diff --git a/test/unit/lib/utils/telemetry/index.test.js b/test/unit/lib/utils/telemetry/index.test.js
index 1a39460c89d..50b4bc36477 100644
--- a/test/unit/lib/utils/telemetry/index.test.js
+++ b/test/unit/lib/utils/telemetry/index.test.js
@@ -1,6 +1,7 @@
 'use strict';
 
 const path = require('path');
+const fsp = require('fs').promises;
 const fse = require('fs-extra');
 const proxyquire = require('proxyquire');
 const { expect } = require('chai');
@@ -25,7 +26,7 @@ describe('test/unit/lib/utils/telemetry/index.test.js', () => {
   before(() => {
     ({ storeLocally, send } = proxyquire('../../../../../lib/utils/telemetry/index.js', {
       '@serverless/utils/analytics-and-notfications-url': telemetryUrl,
-      './areDisabled': false,
+      './are-disabled': false,
       'node-fetch': async (url, options) => {
         usedUrl = url;
         usedOptions = options;
@@ -54,16 +55,16 @@ describe('test/unit/lib/utils/telemetry/index.test.js', () => {
   afterEach(async () => {
     usedOptions = null;
     usedUrl = null;
-    const dirFilenames = await fse.readdir(cacheDirPath);
+    const dirFilenames = await fsp.readdir(cacheDirPath);
     await Promise.all(
-      dirFilenames.map(async (filename) => fse.unlink(path.join(cacheDirPath, filename)))
+      dirFilenames.map(async (filename) => fsp.unlink(path.join(cacheDirPath, filename)))
     );
   });
 
   it('`storeLocally` should persist an event in cacheDir', async () => {
     const payload = { test: 'payloadvalue' };
-    await storeLocally(payload);
-    const dirFilenames = await fse.readdir(cacheDirPath);
+    storeLocally(payload);
+    const dirFilenames = await fsp.readdir(cacheDirPath);
     expect(dirFilenames.length).to.equal(1);
     const persistedEvent = await fse.readJson(path.join(cacheDirPath, dirFilenames[0]));
     expect(persistedEvent.payload).to.deep.equal(payload);
@@ -75,12 +76,12 @@ describe('test/unit/lib/utils/telemetry/index.test.js', () => {
     await cacheEvent();
     await send();
     expect(usedUrl).to.equal(telemetryUrl);
-    const dirFilenames = await fse.readdir(cacheDirPath);
+    const dirFilenames = await fsp.readdir(cacheDirPath);
     expect(dirFilenames.filter(isFilename).length).to.equal(1);
 
     expectedState = 'success';
     await send();
-    const dirFilenamesAfterSend = await fse.readdir(cacheDirPath);
+    const dirFilenamesAfterSend = await fsp.readdir(cacheDirPath);
     expect(dirFilenamesAfterSend.filter(isFilename).length).to.equal(0);
 
     // Check that one event was send with request
@@ -90,10 +91,10 @@ describe('test/unit/lib/utils/telemetry/index.test.js', () => {
   it('Should ditch stale events at `send`', async () => {
     await Promise.all([cacheEvent(0), cacheEvent(0), cacheEvent(), cacheEvent(), cacheEvent(0)]);
     expectedState = 'success';
-    const dirFilenames = await fse.readdir(cacheDirPath);
+    const dirFilenames = await fsp.readdir(cacheDirPath);
     expect(dirFilenames.filter(isFilename).length).to.equal(5);
     await send();
-    const dirFilenamesAfterSend = await fse.readdir(cacheDirPath);
+    const dirFilenamesAfterSend = await fsp.readdir(cacheDirPath);
     expect(dirFilenamesAfterSend.filter(isFilename).length).to.equal(0);
     // Check if only two events were send with request
     expect(JSON.parse(usedOptions.body)).to.have.lengthOf(2);
@@ -103,7 +104,7 @@ describe('test/unit/lib/utils/telemetry/index.test.js', () => {
     expectedState = 'responseBodyError';
     await cacheEvent();
     await send();
-    const dirFilenames = await fse.readdir(cacheDirPath);
+    const dirFilenames = await fsp.readdir(cacheDirPath);
     expect(dirFilenames.filter(isFilename).length).to.equal(0);
   });
 
diff --git a/test/unit/lib/utils/telemetry/resolve-error-location.test.js b/test/unit/lib/utils/telemetry/resolve-error-location.test.js
new file mode 100644
index 00000000000..f7baf402974
--- /dev/null
+++ b/test/unit/lib/utils/telemetry/resolve-error-location.test.js
@@ -0,0 +1,138 @@
+'use strict';
+
+const expect = require('chai').expect;
+
+const resolveErrorLocation = require('../../../../../lib/utils/telemetry/resolve-error-location');
+const tokenizeException = require('../../../../../lib/utils/tokenize-exception');
+
+describe('test/unit/lib/utils/telemetry/resolve-error-location.test.js', () => {
+  it('should be null when stack missing', () => {
+    const err = new Error('test');
+    delete err.stack;
+    const result = resolveErrorLocation(tokenizeException(err));
+    expect(result).to.equal('<not accessible due to non-error exception>');
+  });
+
+  it('should be null for error with code and one-line stacktrace', () => {
+    const err = new Error('test');
+    err.code = 'ERR_CODE';
+    err.stack = 'Oneline stacktrace';
+    const result = resolveErrorLocation(tokenizeException(err));
+    expect(result).to.equal('<not available>');
+  });
+
+  it('should be null if no matching lines found', () => {
+    const err = new Error('test');
+    err.stack = 'no matching\nlines in\nstacktrace';
+    const result = resolveErrorLocation(tokenizeException(err));
+    expect(result).to.equal('<not reflected in stack>');
+  });
+
+  it('should not capture non-stacktrace paths', () => {
+    const err = new Error('test');
+    err.stack =
+      'Could not find a version that satisfies the requirement flask (from versions: none) No matching distribution found for flask.';
+    const result = resolveErrorLocation(tokenizeException(err));
+    expect(result).to.equal('<not reflected in stack>');
+  });
+
+  if (process.platform !== 'win32') {
+    it('should correctly handle paths not enclosed in parentheses', () => {
+      const err = new Error('test');
+      err.stack =
+        'Error: spawn E2BIG\n' +
+        '    at ChildProcess.spawn (node:internal/child_process:403:11)\n' +
+        '    at Object.spawn (node:child_process:573:9)\n' +
+        '    at /home/xxx/api/node_modules/bestzip/lib/bestzip.js:75:29\n' +
+        '    at /home/xxx/api/node_modules/async/dist/async.js:1802:20\n';
+
+      const result = resolveErrorLocation(tokenizeException(err));
+      expect(result).to.equal(
+        [
+          'node:internal/child_process:403:11',
+          'node:child_process:573:9',
+          '/bestzip/lib/bestzip.js:75:29',
+          '/async/dist/async.js:1802:20',
+        ].join('\n')
+      );
+    });
+
+    it('should return at most 7 lines', () => {
+      const err = new Error('test');
+      err.stack =
+        'Error:\n' +
+        '    at Context.it (/home/xxx/serverless/test/unit/lib/utils/resolve-error-location.test.js:10:17)\n' +
+        '    at callFn (/home/xxx/serverless/node_modules/mocha/lib/runnable.js:366:21)\n' +
+        '    at Test.Runnable.run (/home/xxx/serverless/node_modules/mocha/lib/runnable.js:354:5)\n' +
+        '    at Runner.runTest (/home/xxx/serverless/node_modules/mocha/lib/runner.js:677:10)\n' +
+        '    at next (/home/xxx/serverless/node_modules/mocha/lib/runner.js:801:12)\n' +
+        '    at next (/home/xxx/serverless/node_modules/mocha/lib/runner.js:802:12)\n' +
+        '    at next (/home/xxx/serverless/node_modules/mocha/lib/runner.js:803:12)\n' +
+        '    at next (/home/xxx/serverless/node_modules/mocha/lib/runner.js:804:12)\n' +
+        '    at next (/home/xxx/serverless/node_modules/mocha/lib/runner.js:805:12)\n' +
+        '    at next (/home/xxx/serverless/node_modules/mocha/lib/runner.js:594:14)\n';
+      const result = resolveErrorLocation(tokenizeException(err));
+      expect(result).to.equal(
+        [
+          '/test/unit/lib/utils/resolve-error-location.test.js:10:17',
+          '/node_modules/mocha/lib/runnable.js:366:21',
+          '^:354:5',
+          '/node_modules/mocha/lib/runner.js:677:10',
+          '^:801:12',
+          '^:802:12',
+          '^:803:12',
+        ].join('\n')
+      );
+    });
+  }
+
+  if (process.platform === 'win32') {
+    it('should correctly handle paths not enclosed in parentheses', () => {
+      const err = new Error('test');
+      err.stack =
+        'Error: spawn E2BIG\r\n' +
+        '    at ChildProcess.spawn (node:internal/child_process:403:11)\r\n' +
+        '    at Object.spawn (node:child_process:573:9)\r\n' +
+        '    at C:\\home\\xxx\\api\\node_modules\\bestzip\\lib\\bestzip.js:75:29\r\n' +
+        '    at C:\\home\\xxx\\api\\node_modules\\async\\dist\\async.js:1802:20\r\n';
+
+      const result = resolveErrorLocation(tokenizeException(err));
+      expect(result).to.equal(
+        [
+          'node:internal/child_process:403:11',
+          'node:child_process:573:9',
+          '/bestzip/lib/bestzip.js:75:29',
+          '/async/dist/async.js:1802:20',
+        ].join('\n')
+      );
+    });
+
+    it('should return at most 7 lines and use `/` path separator', () => {
+      const err = new Error('test');
+      err.stack =
+        'Error:\n' +
+        '    at Context.it (C:\\home\\xxx\\serverless\\test\\unit\\lib\\utils\\resolve-error-location.test.js:10:17)\r\n' +
+        '    at callFn (C:\\home\\xxx\\serverless\\node_modules\\mocha\\lib\\runnable.js:366:21)\r\n' +
+        '    at Test.Runnable.run (C:\\home\\xxx\\serverless\\node_modules\\mocha\\lib\\runnable.js:354:5)\r\n' +
+        '    at Runner.runTest (C:\\home\\xxx\\serverless\\node_modules\\mocha\\lib\\runner.js:677:10)\r\n' +
+        '    at next (C:\\home\\xxx\\serverless\\node_modules\\mocha\\lib\\runner.js:801:12)\r\n' +
+        '    at next (C:\\home\\xxx\\serverless\\node_modules\\mocha\\lib\\runner.js:802:12)\r\n' +
+        '    at next (C:\\home\\xxx\\serverless\\node_modules\\mocha\\lib\\runner.js:803:12)\r\n' +
+        '    at next (C:\\home\\xxx\\serverless\\node_modules\\mocha\\lib\\runner.js:804:12)\r\n' +
+        '    at next (C:\\home\\xxx\\serverless\\node_modules\\mocha\\lib\\runner.js:805:12)\r\n' +
+        '    at next (C:\\home\\xxx\\serverless\\node_modules\\mocha\\lib\\runner.js:594:14)\r\n';
+      const result = resolveErrorLocation(tokenizeException(err));
+      expect(result).to.equal(
+        [
+          '/test/unit/lib/utils/resolve-error-location.test.js:10:17',
+          '/node_modules/mocha/lib/runnable.js:366:21',
+          '^:354:5',
+          '/node_modules/mocha/lib/runner.js:677:10',
+          '^:801:12',
+          '^:802:12',
+          '^:803:12',
+        ].join('\n')
+      );
+    });
+  }
+});
diff --git a/test/unit/lib/utils/tokenize-exception.test.js b/test/unit/lib/utils/tokenize-exception.test.js
index 81d43d84b75..941d590c6e3 100644
--- a/test/unit/lib/utils/tokenize-exception.test.js
+++ b/test/unit/lib/utils/tokenize-exception.test.js
@@ -7,12 +7,16 @@ const tokenizeError = require('../../../../lib/utils/tokenize-exception');
 
 describe('test/unit/lib/utils/tokenize-exception.test.js', () => {
   it('Should tokenize user error', () => {
-    const errorTokens = tokenizeError(new ServerlessError('Some error'));
+    const errorTokens = tokenizeError(
+      new ServerlessError('Some error', 'ERR_CODE', { decoratedMessage: 'decorated' })
+    );
     expect(errorTokens.title).to.equal('Serverless Error');
     expect(errorTokens.name).to.equal('ServerlessError');
     expect(errorTokens.stack).to.include('tokenize-exception.test.js:');
     expect(errorTokens.message).to.equal('Some error');
     expect(errorTokens.isUserError).to.equal(true);
+    expect(errorTokens.code).to.equal('ERR_CODE');
+    expect(errorTokens.decoratedMessage).to.equal('decorated');
   });
 
   it('Should tokenize programmer error', () => {
diff --git a/test/unit/lib/utils/yamlAstParser.test.js b/test/unit/lib/utils/yaml-ast-parser.test.js
similarity index 97%
rename from test/unit/lib/utils/yamlAstParser.test.js
rename to test/unit/lib/utils/yaml-ast-parser.test.js
index d6a09011767..1dd1d0b5cf8 100644
--- a/test/unit/lib/utils/yamlAstParser.test.js
+++ b/test/unit/lib/utils/yaml-ast-parser.test.js
@@ -2,9 +2,9 @@
 
 const path = require('path');
 const chai = require('chai');
-const writeFileSync = require('../../../../lib/utils/fs/writeFileSync');
-const readFileSync = require('../../../../lib/utils/fs/readFileSync');
-const yamlAstParser = require('../../../../lib/utils/yamlAstParser');
+const writeFileSync = require('../../../../lib/utils/fs/write-file-sync');
+const readFileSync = require('../../../../lib/utils/fs/read-file-sync');
+const yamlAstParser = require('../../../../lib/utils/yaml-ast-parser');
 const chaiAsPromised = require('chai-as-promised');
 const { getTmpDirPath } = require('../../../utils/fs');
 
diff --git a/test/unit/scripts/serverless.test.js b/test/unit/scripts/serverless.test.js
index e0a695f202a..956db6cbd3e 100644
--- a/test/unit/scripts/serverless.test.js
+++ b/test/unit/scripts/serverless.test.js
@@ -3,12 +3,13 @@
 const { expect } = require('chai');
 
 const path = require('path');
-const fs = require('fs').promises;
+const fsp = require('fs').promises;
 const spawn = require('child-process-ext/spawn');
 const stripAnsi = require('strip-ansi');
 const { version } = require('../../../package');
 const programmaticFixturesEngine = require('../../fixtures/programmatic');
 
+const serverlessBinPath = path.resolve(__dirname, '../../../bin/serverless.js');
 const serverlessPath = path.resolve(__dirname, '../../../scripts/serverless.js');
 const programmaticFixturesPath = path.resolve(__dirname, '../../fixtures/programmatic');
 const cliFixturesPath = path.resolve(__dirname, '../../fixtures/cli');
@@ -23,22 +24,22 @@ describe('test/unit/scripts/serverless.test.js', () => {
     const output = String(
       (
         await spawn('node', [serverlessPath, '--help'], {
-          cwd: path.resolve(cliFixturesPath, 'configSyntaxError'),
+          cwd: path.resolve(cliFixturesPath, 'config-syntax-error'),
         })
       ).stdoutBuffer
     );
-    expect(output).to.include('You can run commands with');
+    expect(output).to.include('serverless <command> <options>');
   });
 
   it('should report with an error invalid configuration', async () => {
     try {
       await spawn('node', [serverlessPath, 'print'], {
-        cwd: path.resolve(cliFixturesPath, 'configSyntaxError'),
+        cwd: path.resolve(cliFixturesPath, 'config-syntax-error'),
       });
       throw new Error('Unexpected');
     } catch (error) {
       expect(error.code).to.equal(1);
-      expect(String(error.stdoutBuffer)).to.include('Your Environment Information');
+      expect(String(error.stdoutBuffer)).to.include('Environment: ');
     }
   });
 
@@ -50,42 +51,42 @@ describe('test/unit/scripts/serverless.test.js', () => {
       throw new Error('Unexpected');
     } catch (error) {
       expect(error.code).to.equal(1);
-      expect(String(error.stdoutBuffer)).to.include('Your Environment Information');
+      expect(String(error.stdoutBuffer)).to.include('Environment: ');
     }
   });
 
   it('should handle uncaught exceptions', async () => {
     try {
       await spawn('node', [serverlessPath, 'print'], {
-        cwd: path.resolve(cliFixturesPath, 'uncaughtException'),
+        cwd: path.resolve(cliFixturesPath, 'uncaught-exception'),
       });
       throw new Error('Unexpected');
     } catch (error) {
       expect(error.code).to.equal(1);
-      expect(String(error.stdoutBuffer)).to.include('Your Environment Information');
+      expect(String(error.stdoutBuffer)).to.include('Environment: ');
     }
   });
 
   it('should handle local serverless installation', async () => {
     const output = String(
       (
-        await spawn('node', [serverlessPath, '--help'], {
-          cwd: (await programmaticFixturesEngine.setup('locallyInstalledServerless')).servicePath,
+        await spawn('node', [serverlessBinPath, '--help'], {
+          cwd: (await programmaticFixturesEngine.setup('locally-installed-serverless')).servicePath,
         })
-      ).stdoutBuffer
+      ).stderrBuffer
     );
-    expect(output).to.include('Running "serverless" installed locally');
+    expect(output).to.include('Running "serverless" from node_modules');
   });
 
   it('should handle no service related commands', async () => {
     const output = String(
       (
         await spawn('node', [serverlessPath, 'plugin', 'list'], {
-          cwd: path.resolve(cliFixturesPath, 'configSyntaxError'),
+          cwd: path.resolve(cliFixturesPath, 'config-syntax-error'),
         })
       ).stdoutBuffer
     );
-    expect(output).to.include('To install a plugin run');
+    expect(output).to.include('Install a plugin by running');
   });
 
   it('should resolve variables', async () => {
@@ -100,12 +101,24 @@ describe('test/unit/scripts/serverless.test.js', () => {
     ).to.include('nestedInPrototype: bar-in-prototype');
   });
 
+  it('should support multi service project', async () => {
+    expect(
+      String(
+        (
+          await spawn('node', [serverlessPath, 'print'], {
+            cwd: path.resolve(programmaticFixturesPath, 'multi-service/service-a'),
+          })
+        ).stdoutBuffer
+      )
+    ).to.include('self: bar');
+  });
+
   it('should rejected unresolved "provider" section', async () => {
     try {
       await spawn('node', [serverlessPath, 'print'], {
         cwd: (
           await programmaticFixturesEngine.setup('aws', {
-            configExt: { variablesResolutionMode: '20210326', provider: '${foo:bar}' },
+            configExt: { provider: '${foo:bar}' },
           })
         ).servicePath,
       });
@@ -121,7 +134,7 @@ describe('test/unit/scripts/serverless.test.js', () => {
       await spawn('node', [serverlessPath, 'print'], {
         cwd: (
           await programmaticFixturesEngine.setup('aws', {
-            configExt: { variablesResolutionMode: '20210326', provider: { stage: '${foo:bar}' } },
+            configExt: { provider: { stage: '${foo:bar}' } },
           })
         ).servicePath,
       });
@@ -141,18 +154,57 @@ describe('test/unit/scripts/serverless.test.js', () => {
         },
       },
     });
-    await fs.writeFile(path.resolve(serviceDir, '.env'), 'DEFAULT_ENV_VARIABLE=valuefromdefault');
+    await fsp.writeFile(path.resolve(serviceDir, '.env'), 'DEFAULT_ENV_VARIABLE=valuefromdefault');
     expect(
       String((await spawn('node', [serverlessPath, 'print'], { cwd: serviceDir })).stdoutBuffer)
     ).to.include('fromDefaultEnv: valuefromdefault');
   });
 
+  it('should allow not defined environment variables in provider.stage`', async () => {
+    const { servicePath: serviceDir } = await programmaticFixturesEngine.setup('aws', {
+      configExt: {
+        useDotenv: true,
+        provider: {
+          stage: "${env:FOO, 'dev'}",
+        },
+        custom: {
+          fromDefaultEnv: '${env:DEFAULT_ENV_VARIABLE}',
+        },
+      },
+    });
+    await fsp.writeFile(path.resolve(serviceDir, '.env'), 'DEFAULT_ENV_VARIABLE=valuefromdefault');
+    const printOut = String(
+      (await spawn('node', [serverlessPath, 'print'], { cwd: serviceDir })).stdoutBuffer
+    );
+    expect(printOut).to.include('fromDefaultEnv: valuefromdefault');
+    expect(printOut).to.include('stage: dev');
+  });
+
+  it('should report "env" variables resolution conflicts with exception', async () => {
+    const { servicePath: serviceDir } = await programmaticFixturesEngine.setup('aws', {
+      configExt: {
+        useDotenv: true,
+        provider: {
+          stage: "${env:FOO, 'dev'}",
+        },
+      },
+    });
+    await fsp.writeFile(path.resolve(serviceDir, '.env'), 'FOO=test');
+    try {
+      await spawn('node', [serverlessPath, 'print'], { cwd: serviceDir });
+      throw new Error('Unexpected');
+    } catch (error) {
+      expect(error.code).to.equal(1);
+      expect(String(error.stdoutBuffer)).to.include('Environment variable "FOO" which');
+    }
+  });
+
   it('should reject unresolved "plugins" property', async () => {
     try {
       await spawn('node', [serverlessPath, 'print'], {
         cwd: (
           await programmaticFixturesEngine.setup('aws', {
-            configExt: { variablesResolutionMode: '20210326', plugins: '${foo:bar}' },
+            configExt: { plugins: '${foo:bar}' },
           })
         ).servicePath,
       });
@@ -167,16 +219,16 @@ describe('test/unit/scripts/serverless.test.js', () => {
     const output = String(
       (
         await spawn('node', [serverlessPath, '--help'], {
-          cwd: path.resolve(programmaticFixturesPath, 'configInvalid'),
+          cwd: path.resolve(programmaticFixturesPath, 'config-invalid'),
         })
       ).stdoutBuffer
     );
-    expect(output).to.include('Documentation: http://slss.io/docs');
+    expect(output).to.include('serverless <command> <options>');
   });
 
   it('should print general --help to stdout', async () => {
     const output = String((await spawn('node', [serverlessPath, '--help'])).stdoutBuffer);
-    expect(output).to.include('Documentation: http://slss.io/docs');
+    expect(output).to.include('serverless <command> <options>');
   });
 
   it('should print command --help to stdout', async () => {
@@ -185,12 +237,28 @@ describe('test/unit/scripts/serverless.test.js', () => {
     expect(output).to.include('stage');
   });
 
+  it('should print not integrated command --help to stdout', async () => {
+    const output = String(
+      (await spawn('node', [serverlessPath, 'plugin', 'install', '--help'])).stdoutBuffer
+    );
+    expect(output).to.include('plugin install');
+    expect(output).to.include('stage');
+  });
+
+  it('should print interactive setup help to stdout', async () => {
+    const output = String(
+      (await spawn('node', [serverlessPath, '--help-interactive'])).stdoutBuffer
+    );
+    expect(output).to.include('Interactive CLI');
+    expect(output).to.not.include('Main commands');
+  });
+
   it('should show help when running container command', async () => {
     // Note: Arbitrarily picked "plugin" command for testing
     const output = stripAnsi(
       String((await spawn('node', [serverlessPath, 'plugin'])).stdoutBuffer)
     );
-    expect(output).to.include('plugin install .......');
+    expect(output).to.include('plugin install');
   });
 
   it('should crash in required option is missing', async () => {
@@ -199,7 +267,7 @@ describe('test/unit/scripts/serverless.test.js', () => {
       throw new Error('Unexpected');
     } catch (error) {
       expect(error.code).to.equal(1);
-      expect(String(error.stdoutBuffer)).to.include('command requires the');
+      expect(String(error.stdoutBuffer)).to.include('command "config credentials" requires');
     }
   });
 });
diff --git a/test/utils/apiGateway.js b/test/utils/api-gateway.js
similarity index 100%
rename from test/utils/apiGateway.js
rename to test/utils/api-gateway.js
diff --git a/test/utils/awsCleanup.js b/test/utils/aws-cleanup.js
similarity index 97%
rename from test/utils/awsCleanup.js
rename to test/utils/aws-cleanup.js
index d2a7d264121..68a2f716e7e 100644
--- a/test/utils/awsCleanup.js
+++ b/test/utils/aws-cleanup.js
@@ -5,7 +5,7 @@
 
 const { logger } = require('./misc');
 const { findStacks, deleteStack, listStackResources } = require('./cloudformation');
-const { findRestApis, deleteRestApi } = require('./apiGateway');
+const { findRestApis, deleteRestApi } = require('./api-gateway');
 const { deleteBucket } = require('./s3');
 const { findUserPools, deleteUserPoolById } = require('./cognito');
 
diff --git a/test/utils/childProcess.js b/test/utils/child-process.js
similarity index 100%
rename from test/utils/childProcess.js
rename to test/utils/child-process.js
diff --git a/test/utils/cloudformation.js b/test/utils/cloudformation.js
index dc14d95c626..a3ca7fad0d3 100644
--- a/test/utils/cloudformation.js
+++ b/test/utils/cloudformation.js
@@ -3,6 +3,10 @@
 const awsRequest = require('@serverless/test/aws-request');
 
 const SHARED_INFRA_TESTS_CLOUDFORMATION_STACK = 'integration-tests-deps-stack';
+const SHARED_INFRA_TESTS_ACTIVE_MQ_CREDENTIALS_NAME =
+  'integration-tests-active-mq-broker-credentials';
+const SHARED_INFRA_TESTS_RABBITMQ_CREDENTIALS_NAME =
+  'integration-tests-rabbitmq-broker-credentials';
 
 function findStacks(name, status) {
   const params = {};
@@ -101,6 +105,8 @@ module.exports = {
   listStacks,
   getStackOutputMap,
   SHARED_INFRA_TESTS_CLOUDFORMATION_STACK,
+  SHARED_INFRA_TESTS_ACTIVE_MQ_CREDENTIALS_NAME,
+  SHARED_INFRA_TESTS_RABBITMQ_CREDENTIALS_NAME,
   isDependencyStackAvailable,
   getDependencyStackOutputMap,
 };
diff --git a/test/utils/eventBridge.js b/test/utils/event-bridge.js
similarity index 100%
rename from test/utils/eventBridge.js
rename to test/utils/event-bridge.js
diff --git a/test/utils/integration.js b/test/utils/integration.js
index 5744df926a1..4a657acdeab 100644
--- a/test/utils/integration.js
+++ b/test/utils/integration.js
@@ -3,7 +3,7 @@
 'use strict';
 
 const path = require('path');
-const fse = require('fs-extra');
+const fsp = require('fs').promises;
 const spawn = require('child-process-ext/spawn');
 const nodeFetch = require('node-fetch');
 const log = require('log').get('serverless:test');
@@ -11,15 +11,14 @@ const logFetch = require('log').get('fetch');
 const resolveAwsEnv = require('@serverless/test/resolve-aws-env');
 const { load: loadYaml } = require('js-yaml');
 
-const serverlessExec = require('../serverlessBinary');
+const serverlessExec = require('../serverless-binary');
 
 const env = resolveAwsEnv();
-env.SLS_DEBUG = '1';
 
 async function resolveServiceName(cwd) {
   const configContent = await (async () => {
     try {
-      return await fse.readFile(path.join(cwd, 'serverless.yml'));
+      return await fsp.readFile(path.join(cwd, 'serverless.yml'));
     } catch (error) {
       if (error.code === 'ENOENT') return null;
       throw error;
diff --git a/test/utils/iot.js b/test/utils/iot.js
index d74db93b652..b968d0e9450 100644
--- a/test/utils/iot.js
+++ b/test/utils/iot.js
@@ -3,7 +3,7 @@
 const awsRequest = require('@serverless/test/aws-request');
 
 function resolveIotEndpoint() {
-  return awsRequest('Iot', 'describeEndpoint').then((data) => {
+  return awsRequest('Iot', 'describeEndpoint', { endpointType: 'iot:Data-ATS' }).then((data) => {
     return data.endpointAddress;
   });
 }