diff --git a/.azure-pipelines-preproduction/package-lock.json b/.azure-pipelines-preproduction/package-lock.json
index 868605f56898..741489043b83 100644
--- a/.azure-pipelines-preproduction/package-lock.json
+++ b/.azure-pipelines-preproduction/package-lock.json
@@ -88,9 +88,9 @@
       }
     },
     "@azure/rest-api-specs-scripts": {
-      "version": "0.5.0",
-      "resolved": "https://registry.npmjs.org/@azure/rest-api-specs-scripts/-/rest-api-specs-scripts-0.5.0.tgz",
-      "integrity": "sha512-UJ7IF1P1/j3N64WNUdazc1Sutna+mqfuoBAuzAhDu9Gwunkjbo0cx2UVmcdwctHJ81OnjWRak1so0Rsn2hPVOg==",
+      "version": "0.5.1",
+      "resolved": "https://registry.npmjs.org/@azure/rest-api-specs-scripts/-/rest-api-specs-scripts-0.5.1.tgz",
+      "integrity": "sha512-Nwi4jsHMVG1Pd3hJAh5D8JxTlx6PaDpYNfDrQSG3QAvVwE5n+MK9SmHL47akDfhKJQibuPompKwgw55Gy23Reg==",
       "dev": true,
       "requires": {
         "@azure/avocado": "^0.4.1",
@@ -100,7 +100,7 @@
         "fs-extra": "^7.0.1",
         "glob": "^7.1.3",
         "js-yaml": "^3.13.1",
-        "oav": "^0.18.1",
+        "oav": "^0.19.6",
         "request": "^2.88.0"
       },
       "dependencies": {
@@ -151,21 +151,19 @@
       "dev": true
     },
     "@octokit/endpoint": {
-      "version": "5.3.2",
-      "resolved": "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-5.3.2.tgz",
-      "integrity": "sha512-gRjteEM9I6f4D8vtwU2iGUTn9RX/AJ0SVXiqBUEuYEWVGGAVjSXdT0oNmghH5lvQNWs8mwt6ZaultuG6yXivNw==",
+      "version": "5.3.5",
+      "resolved": "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-5.3.5.tgz",
+      "integrity": "sha512-f8KqzIrnzPLiezDsZZPB+K8v8YSv6aKFl7eOu59O46lmlW4HagWl1U6NWl6LmT8d1w7NsKBI3paVtzcnRGO1gw==",
       "dev": true,
       "requires": {
-        "deepmerge": "4.0.0",
         "is-plain-object": "^3.0.0",
-        "universal-user-agent": "^3.0.0",
-        "url-template": "^2.0.8"
+        "universal-user-agent": "^4.0.0"
       }
     },
     "@octokit/request": {
-      "version": "5.0.2",
-      "resolved": "https://registry.npmjs.org/@octokit/request/-/request-5.0.2.tgz",
-      "integrity": "sha512-z1BQr43g4kOL4ZrIVBMHwi68Yg9VbkRUyuAgqCp1rU3vbYa69+2gIld/+gHclw15bJWQnhqqyEb7h5a5EqgZ0A==",
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/@octokit/request/-/request-5.1.0.tgz",
+      "integrity": "sha512-I15T9PwjFs4tbWyhtFU2Kq7WDPidYMvRB7spmxoQRZfxSmiqullG+Nz+KbSmpkfnlvHwTr1e31R5WReFRKMXjg==",
       "dev": true,
       "requires": {
         "@octokit/endpoint": "^5.1.0",
@@ -174,7 +172,7 @@
         "is-plain-object": "^3.0.0",
         "node-fetch": "^2.3.0",
         "once": "^1.4.0",
-        "universal-user-agent": "^3.0.0"
+        "universal-user-agent": "^4.0.0"
       }
     },
     "@octokit/request-error": {
@@ -188,9 +186,9 @@
       }
     },
     "@octokit/rest": {
-      "version": "16.28.7",
-      "resolved": "https://registry.npmjs.org/@octokit/rest/-/rest-16.28.7.tgz",
-      "integrity": "sha512-cznFSLEhh22XD3XeqJw51OLSfyL2fcFKUO+v2Ep9MTAFfFLS1cK1Zwd1yEgQJmJoDnj4/vv3+fGGZweG+xsbIA==",
+      "version": "16.28.9",
+      "resolved": "https://registry.npmjs.org/@octokit/rest/-/rest-16.28.9.tgz",
+      "integrity": "sha512-IKGnX+Tvzt7XHhs8f4ajqxyJvYAMNX5nWfoJm4CQj8LZToMiaJgutf5KxxpxoC3y5w7JTJpW5rnWnF4TsIvCLA==",
       "dev": true,
       "requires": {
         "@octokit/request": "^5.0.0",
@@ -204,8 +202,7 @@
         "lodash.uniq": "^4.5.0",
         "octokit-pagination-methods": "^1.1.0",
         "once": "^1.4.0",
-        "universal-user-agent": "^3.0.0",
-        "url-template": "^2.0.8"
+        "universal-user-agent": "^4.0.0"
       }
     },
     "@ts-common/add-position": {
@@ -373,6 +370,12 @@
       "integrity": "sha512-SGGAhXLHDx+PK4YLNcNGa6goPf9XRWQNAUUbffkwVGGXIxmDKWyGGL4inzq2sPmExu431Ekb9aEMn9BkPqEYFA==",
       "dev": true
     },
+    "@types/jsonpath": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/@types/jsonpath/-/jsonpath-0.2.0.tgz",
+      "integrity": "sha512-v7qlPA0VpKUlEdhghbDqRoKMxFB3h3Ch688TApBJ6v+XLDdvWCGLJIYiPKGZnS6MAOie+IorCfNYVHOPIHSWwQ==",
+      "dev": true
+    },
     "@types/minimatch": {
       "version": "3.0.3",
       "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.3.tgz",
@@ -1473,12 +1476,6 @@
       "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=",
       "dev": true
     },
-    "deepmerge": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.0.0.tgz",
-      "integrity": "sha512-YZ1rOP5+kHor4hMAH+HRQnBQHg+wvS1un1hAOuIcxcBy0hzcUf6Jg2a1w65kpoOUnurOfZbERwjI1TfZxNjcww==",
-      "dev": true
-    },
     "define-properties": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz",
@@ -2229,9 +2226,9 @@
       "dev": true
     },
     "handlebars": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.1.2.tgz",
-      "integrity": "sha512-nvfrjqvt9xQ8Z/w0ijewdD/vvWDTOweBUm96NTr66Wfvo1mJenBLwcYmPs3TIBP5ruzYGD7Hx/DaM9RmhroGPw==",
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.2.0.tgz",
+      "integrity": "sha512-Kb4xn5Qh1cxAKvQnzNWZ512DhABzyFNmsaJf3OAkWNa4NkaqWcNI8Tao8Tasi0/F4JD9oyG0YxuFyvyR57d+Gw==",
       "dev": true,
       "requires": {
         "neo-async": "^2.6.0",
@@ -3582,21 +3579,22 @@
       "dev": true
     },
     "oav": {
-      "version": "0.18.6",
-      "resolved": "https://registry.npmjs.org/oav/-/oav-0.18.6.tgz",
-      "integrity": "sha512-qDMtwnEMZOCdqonzxR7ICbYcSsLkzXpcrZQHsFN9EgGXKUJ9cwPwV2zEba1+fk6WsW/id79cZWfFT0y3XBxiuA==",
+      "version": "0.19.6",
+      "resolved": "https://registry.npmjs.org/oav/-/oav-0.19.6.tgz",
+      "integrity": "sha512-JAATj7YPAm7v7ciPNn3MlnHHsd6GrTPyOJRqW6adWzUg2UQ8zor4jJuotNmsCes5Xq01MqbYOnTEwc/U+or2XA==",
       "dev": true,
       "requires": {
         "@azure/openapi-markdown": "^0.9.0",
         "@microsoft.azure/autorest-extension-base": "1.0.13",
         "@ts-common/commonmark-to-markdown": "^1.2.0",
-        "@ts-common/iterator": "^0.3.1",
-        "@ts-common/json": "^0.3.0",
-        "@ts-common/json-parser": "^0.7.0",
+        "@ts-common/iterator": "^0.3.6",
+        "@ts-common/json": "^0.3.1",
+        "@ts-common/json-parser": "^0.8.0",
         "@ts-common/property-set": "^0.1.0",
         "@ts-common/source-map": "^0.5.0",
         "@ts-common/string-map": "^0.3.0",
         "@ts-common/virtual-fs": "^0.2.0",
+        "@types/jsonpath": "^0.2.0",
         "commonmark": "^0.29.0",
         "glob": "^5.0.15",
         "globby": "^9.2.0",
@@ -3614,24 +3612,11 @@
         "vscode-jsonrpc": "^3.6.2",
         "winston": "^3.2.1",
         "yargs": "^6.6.0",
-        "yasway": "^1.8.3",
+        "yasway": "^1.8.4",
         "yuml2svg": "^4.2.1",
         "z-schema": "^4.1.0"
       },
       "dependencies": {
-        "@ts-common/json-parser": {
-          "version": "0.7.2",
-          "resolved": "https://registry.npmjs.org/@ts-common/json-parser/-/json-parser-0.7.2.tgz",
-          "integrity": "sha512-Rb0bA/maGzfjA7ZegDvfDABF+vz2norftJX80aTOLb88gLd2+SnD6gYVg3nZH9FpA5/34JXFDvMs4Fb5GuPoew==",
-          "dev": true,
-          "requires": {
-            "@ts-common/iterator": "^0.3.4",
-            "@ts-common/json": "^0.3.1",
-            "@ts-common/source-map": "^0.5.0",
-            "@ts-common/string-map": "^0.3.0",
-            "tslib": "^1.9.3"
-          }
-        },
         "ansi-regex": {
           "version": "2.1.1",
           "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
@@ -4186,9 +4171,9 @@
       "dev": true
     },
     "psl": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/psl/-/psl-1.3.0.tgz",
-      "integrity": "sha512-avHdspHO+9rQTLbv1RO+MPYeP/SzsCoxofjVnHanETfQhTJrmB0HlDoW+EiN/R+C0BZ+gERab9NY0lPN2TxNag==",
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/psl/-/psl-1.4.0.tgz",
+      "integrity": "sha512-HZzqCGPecFLyoRj5HLfuDSKYTJkAfB5thKBIkRHtGjWwY7p1dAyveIbXIq4tO0KYfDF2tHqPUgY9SDnGm00uFw==",
       "dev": true
     },
     "pump": {
@@ -5176,12 +5161,12 @@
       }
     },
     "universal-user-agent": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/universal-user-agent/-/universal-user-agent-3.0.0.tgz",
-      "integrity": "sha512-T3siHThqoj5X0benA5H0qcDnrKGXzU8TKoX15x/tQHw1hQBvIEBHjxQ2klizYsqBOO/Q+WuxoQUihadeeqDnoA==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/universal-user-agent/-/universal-user-agent-4.0.0.tgz",
+      "integrity": "sha512-eM8knLpev67iBDizr/YtqkJsF3GK8gzDc6st/WKzrTuPtcsOKW/0IdL4cnMBsU69pOx0otavLWBDGTwg+dB0aA==",
       "dev": true,
       "requires": {
-        "os-name": "^3.0.0"
+        "os-name": "^3.1.0"
       }
     },
     "universalify": {
@@ -5251,12 +5236,6 @@
       "integrity": "sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=",
       "dev": true
     },
-    "url-template": {
-      "version": "2.0.8",
-      "resolved": "https://registry.npmjs.org/url-template/-/url-template-2.0.8.tgz",
-      "integrity": "sha1-/FZaPMy/93MMd19WQflVV5FDnyE=",
-      "dev": true
-    },
     "use": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/use/-/use-3.1.1.tgz",
@@ -5700,9 +5679,9 @@
       }
     },
     "yasway": {
-      "version": "1.8.3",
-      "resolved": "https://registry.npmjs.org/yasway/-/yasway-1.8.3.tgz",
-      "integrity": "sha512-4cBs1eK6HiEe8AvwRNztRdWQnvkuermxRfFVRekk2y/fpna99AQ5b9ByDY/hwWkW80bGipAXoDMI3Ifqol2+tg==",
+      "version": "1.8.4",
+      "resolved": "https://registry.npmjs.org/yasway/-/yasway-1.8.4.tgz",
+      "integrity": "sha512-Oo6dFvmazhQU6ceazUm59BVraptSXTDhvpW2K14DcpgeyTAyUUpJjuE7HJ4qyF+Ci6blIaQq9mOVHj8pCFhEjQ==",
       "dev": true,
       "requires": {
         "@ts-common/json": "^0.3.0",
diff --git a/.azure-pipelines-preproduction/package.json b/.azure-pipelines-preproduction/package.json
index 16d902361c0a..06f6d448d064 100644
--- a/.azure-pipelines-preproduction/package.json
+++ b/.azure-pipelines-preproduction/package.json
@@ -11,7 +11,7 @@
   "license": "MIT",
   "devDependencies": {
     "@azure/avocado": "^0.6.0",
-    "@azure/rest-api-specs-scripts": "^0.5.0",
+    "@azure/rest-api-specs-scripts": "^0.5.1",
     "@ts-common/commonmark-to-markdown": "^1.2.0",
     "@ts-common/fs": "0.2.0",
     "@ts-common/iterator": "^0.3.6",
diff --git a/preproduction-azure-pipelines.yml b/preproduction-azure-pipelines.yml
index 6f6ae83a177a..a9f50e6353e8 100644
--- a/preproduction-azure-pipelines.yml
+++ b/preproduction-azure-pipelines.yml
@@ -16,3 +16,4 @@ jobs:
 - template: .azure-pipelines/BranchProtectionForPrivateRepo.yml
 - template: .azure-pipelines/Spellcheck.yml
 - template: .azure-pipelines/BreakingChange.yml
+- template: .azure-pipelines/ModelValidation.yml