diff --git a/package.json b/package.json
index 193c8219..a8f09fdc 100644
--- a/package.json
+++ b/package.json
@@ -121,6 +121,7 @@
     "i18next-http-middleware": "^3.1.0",
     "ini": "^1.3.6",
     "isomorphic-unfetch": "^3.0.0",
+    "json-schema": "0.4.0",
     "loadable-components": "^2.2.3",
     "lodash": "4.17.21",
     "lucene": "^2.1.1",
@@ -130,7 +131,7 @@
     "moment": "^2.25.3",
     "node-fetch": "2.6.5",
     "node-notifier": "8.0.1",
-    "node-sass": "^4.13.0",
+    "node-sass": "4.14.0",
     "nth-check": "2.0.1",
     "performant-array-to-tree": "^1.7.1",
     "postcss-modules-extract-imports": "3.0.0",
@@ -181,6 +182,10 @@
     "**/**/node-notifier": "^8.0.1",
     "**/**/prismjs": "^1.25.0",
     "**/**/url-parse": "^1.5.2",
+<<<<<<< HEAD
+=======
+    "**/**/json-schema": "^0.4.0",
+>>>>>>> prod
     "@digg/react-ideal-image": "file:local_modules/digg_react-ideal-image-1.0.2.tgz"
   },
   "jest": {
diff --git a/src/assets/Illustration_1.tsx b/src/assets/Illustration_1.tsx
index cc8311af..45c54007 100644
--- a/src/assets/Illustration_1.tsx
+++ b/src/assets/Illustration_1.tsx
@@ -1,5 +1,6 @@
 import React from 'react';
+import i18n from 'i18n';
 
 const illustration_1 = require('./illustration_1.png');
 
-export const Illustration_1: React.SFC = () => <img src={illustration_1} alt="Illustration dator" />;
+export const Illustration_1: React.SFC = () => <img src={illustration_1} alt={i18n.t('common|illustration-1')} />;
diff --git a/src/assets/Illustration_2.tsx b/src/assets/Illustration_2.tsx
index d7cf2300..53d680d8 100644
--- a/src/assets/Illustration_2.tsx
+++ b/src/assets/Illustration_2.tsx
@@ -1,5 +1,6 @@
 import React from 'react';
+import i18n from 'i18n';
 
 const illustration_2 = require('./illustration_2.png');
 
-export const Illustration_2: React.SFC = () => <img src={illustration_2} alt="Illustration dator" />;
+export const Illustration_2: React.SFC = () => <img src={illustration_2} alt={i18n.t('common|illustration-2')} />;
diff --git a/src/assets/Illustration_3.tsx b/src/assets/Illustration_3.tsx
index 8ae9107f..bc1bdf0b 100644
--- a/src/assets/Illustration_3.tsx
+++ b/src/assets/Illustration_3.tsx
@@ -1,5 +1,6 @@
 import React from 'react';
+import i18n from 'i18n';
 
 const illustration_3 = require('./illustration_3.png');
 
-export const Illustration_3: React.SFC = () => <img src={illustration_3} alt="Illustration dator" />;
+export const Illustration_3: React.SFC = () => <img src={illustration_3} alt={i18n.t('common|illustration-3')} />;
diff --git a/src/assets/TopImage.tsx b/src/assets/TopImage.tsx
index 09af3b28..78d4c830 100644
--- a/src/assets/TopImage.tsx
+++ b/src/assets/TopImage.tsx
@@ -1,5 +1,6 @@
 import React from 'react';
+import i18n from 'i18n';
 
 const topimage = require('./start_bg1.jpg');
 
-export const TopImage: React.SFC = () => <img src={topimage} alt=" " />;
+export const TopImage: React.SFC = () => <img src={topimage} alt={i18n.t('common|top-image')}/>;
diff --git a/src/components/StartPageComponents/SearchBlock.tsx b/src/components/StartPageComponents/SearchBlock.tsx
index bb348adc..152d0097 100644
--- a/src/components/StartPageComponents/SearchBlock.tsx
+++ b/src/components/StartPageComponents/SearchBlock.tsx
@@ -56,9 +56,6 @@ export class SearchBlock extends React.Component<SearchBlockProps> {
           <div className="search__box">
             <div
               className="search__box--link"
-              // onClick={(e) => {
-              //   window.location.href = `/${i18n.languages[0]}/datasets?p=1&q=&f=`;
-              // }}
             >
               <Link
                 className="text-5-bold"
@@ -74,19 +71,15 @@ export class SearchBlock extends React.Component<SearchBlockProps> {
 
             <div
               className="search__box--link"
-              // onClick={(e) => {
-              //   window.location.href = `/${i18n.languages[0]}/concepts?p=1&q=&f=`;
-              // }}
             >
               <span className="row">
                 <Link
                   className="text-5-bold"
-                  aria-label="Sök efter begrepp"
+                  aria-label={i18n.t('pages|search|concepts')}
                   to={`/${i18n.languages[0]}/concepts?p=1&q=&f=`}
                 >
                   {i18n.t('pages|search|concepts')}{' '}
                 </Link>
-                <span className="beta_badge text-7-bold"> {i18n.t('common|beta')}</span>
               </span>
 
               <span className="text-6">
@@ -96,19 +89,15 @@ export class SearchBlock extends React.Component<SearchBlockProps> {
 
             <div
               className="search__box--link"
-              // onClick={(e) => {
-              //   window.location.href = `/${i18n.languages[0]}/specifications?p=1&q=&f=`;
-              // }}
             >
               <span className="row">
                 <Link
                   className="text-5-bold"
-                  aria-label="Sök efter specifikationer"
+                  aria-label={i18n.t('pages|search|specifications')}
                   to={`/${i18n.languages[0]}/specifications?p=1&q=&f=`}
                 >
                   {i18n.t('pages|search|specifications')}{' '}
                 </Link>
-                <span className="beta_badge text-7-bold"> {i18n.t('common|beta')}</span>
               </span>
 
               <span className="text-6">
diff --git a/src/pages/DetailPages/ConceptPage.tsx b/src/pages/DetailPages/ConceptPage.tsx
index c4283a1a..2ca41129 100644
--- a/src/pages/DetailPages/ConceptPage.tsx
+++ b/src/pages/DetailPages/ConceptPage.tsx
@@ -666,7 +666,10 @@ export const ConceptPage: React.FC<PageProps> = ({ env, match }) => {
             <div className="detailpage__wrapper">
               {/* Left column */}
               <div className="detailpage__wrapper--leftcol content">
+<<<<<<< HEAD
                 <span className="text-7-bold beta_badge--xl">BETA</span>
+=======
+>>>>>>> prod
                 <h1 className="text-2 terminology_header">
                   <span>{entry.title}</span>
                 </h1>
diff --git a/src/pages/DetailPages/SpecificationPage.tsx b/src/pages/DetailPages/SpecificationPage.tsx
index b8acfcbf..8cc68a7a 100644
--- a/src/pages/DetailPages/SpecificationPage.tsx
+++ b/src/pages/DetailPages/SpecificationPage.tsx
@@ -231,10 +231,12 @@ export const SpecificationPage: React.FC<PageProps> = ({
             <div className="detailpage__wrapper">
               {/* Left column */}
               <div className="detailpage__wrapper--leftcol content">
+<<<<<<< HEAD
                 <span className="text-7-bold beta_badge--xl">BETA</span>
 
+=======
+>>>>>>> prod
                 <h1 className="text-2">{entry.title}</h1>
-
                 <script
                   type="text/x-entryscape-handlebar"
                   data-entryscape="true"
diff --git a/src/pages/NotFoundPage/NotFoundPage.tsx b/src/pages/NotFoundPage/NotFoundPage.tsx
index 941a7819..fff085f4 100644
--- a/src/pages/NotFoundPage/NotFoundPage.tsx
+++ b/src/pages/NotFoundPage/NotFoundPage.tsx
@@ -3,13 +3,19 @@ import { Link, RouteComponentProps } from 'react-router-dom';
 import { RouterContext } from '../../../shared/RouterContext';
 import { PageMetadata } from '../PageMetadata';
 import i18n from 'i18n';
+import { __RouterContext } from 'react-router';
 
 export const NotFoundPage: React.FC<RouteComponentProps<any, RouterContext>> =
-  ({ staticContext }) => {
+  ({ staticContext, location }) => {
     if (staticContext) {
       staticContext.statusCode = 404;
     }
 
+    if(location.pathname && location.pathname.includes("/en/"))
+      i18n.changeLanguage("en");  
+    else
+      i18n.changeLanguage("sv");  
+
     return (
       <>
         <PageMetadata
diff --git a/src/pages/SearchPage/SearchSpecificationsPage.tsx b/src/pages/SearchPage/SearchSpecificationsPage.tsx
index b0e2a358..d6946c59 100644
--- a/src/pages/SearchPage/SearchSpecificationsPage.tsx
+++ b/src/pages/SearchPage/SearchSpecificationsPage.tsx
@@ -145,7 +145,10 @@ export const SearchSpecificationsPage: React.FC<SearchProps> = ({env}) => {
                 <h1 className="text-2 search-header">
                   {i18n.t('common|search-specs')}
                 </h1>
+<<<<<<< HEAD
                 <span className="text-7-bold beta_badge--lg">BETA</span>
+=======
+>>>>>>> prod
               </div>
 
               <SearchInput
diff --git a/src/pages/SearchPage/SearchTermsPage.tsx b/src/pages/SearchPage/SearchTermsPage.tsx
index fffc3d84..582a71af 100644
--- a/src/pages/SearchPage/SearchTermsPage.tsx
+++ b/src/pages/SearchPage/SearchTermsPage.tsx
@@ -141,7 +141,10 @@ export const SearchTermsPage: React.FC<SearchProps> = ({ location, env }) => {
                 <h1 className="text-2 search-header">
                   {i18n.t('common|search-concept')}
                 </h1>
+<<<<<<< HEAD
                 <span className="text-7-bold beta_badge--lg">BETA</span>
+=======
+>>>>>>> prod
               </div>
 
               <SearchInput
diff --git a/src/scss/Breadcrumb/breadcrumb.scss b/src/scss/Breadcrumb/breadcrumb.scss
index 9e6a80f1..b2392cff 100644
--- a/src/scss/Breadcrumb/breadcrumb.scss
+++ b/src/scss/Breadcrumb/breadcrumb.scss
@@ -102,6 +102,10 @@
                     text-decoration: none !important;
                     display: inline-block;
                     padding-right: $space-8;
+<<<<<<< HEAD
+=======
+                    color: $green50;
+>>>>>>> prod
                 }
             }
         }
diff --git a/src/scss/news/news.scss b/src/scss/news/news.scss
index 855bb9ab..8f7b6179 100644
--- a/src/scss/news/news.scss
+++ b/src/scss/news/news.scss
@@ -139,8 +139,8 @@
         li {
             display: flex;
             flex-direction: column;
-            padding-top: $space-8;
-            padding-bottom: $space-16;
+            padding-top: $space-16;
+            padding-bottom: $space-24;
             border-bottom: 0.125rem dotted $black10;
 
             &:first-of-type {
diff --git a/src/scss/swagger/swagger.scss b/src/scss/swagger/swagger.scss
index 60de4097..88010056 100644
--- a/src/scss/swagger/swagger.scss
+++ b/src/scss/swagger/swagger.scss
@@ -278,6 +278,16 @@ $authorize-btn-green: #258659;
     }
 }
 
+<<<<<<< HEAD
+=======
+//hide "try it out" function on deprecated methods
+.swagger-ui .opblock-deprecated {
+    .try-out {
+        display:none;
+    }
+}
+
+>>>>>>> prod
 //Swagger accordions head
 .swagger-ui .opblock-tag {
     background-color: $black10;
diff --git a/src/translations/en/common.json b/src/translations/en/common.json
index e70df714..0a046913 100644
--- a/src/translations/en/common.json
+++ b/src/translations/en/common.json
@@ -32,5 +32,13 @@
   "home-text" : "Home",
   "cookies" : "cookies",
   "skiptocontent" : "Skip to content",
+<<<<<<< HEAD
   "exploreapi" : "Explore API"
+=======
+  "exploreapi" : "Explore API",
+  "top-image": "View of Stockholm",
+  "illustration-1":"Illustration av kommunikation mellan dator och mobil",
+  "illustration-2":"Illustration av ett hus",
+  "illustration-3":"Illustration av dator som tar emot data"
+>>>>>>> prod
 }
\ No newline at end of file
diff --git a/src/translations/sv/common.json b/src/translations/sv/common.json
index be00660a..384376c6 100644
--- a/src/translations/sv/common.json
+++ b/src/translations/sv/common.json
@@ -30,6 +30,15 @@
   "home-text" : "Hem",
   "cookies" : "om_kakor",
   "skiptocontent" : "Hoppa till innehåll",
+<<<<<<< HEAD
   "exploreapi" : "Utforska API"
+=======
+  "exploreapi" : "Utforska API",
+  "top-image": "Vy över Stockholm",
+  "illustration-1":"Illustration av kommunikation mellan dator och mobil",
+  "illustration-2":"Illustration av ett hus",
+  "illustration-3":"Illustration av dator som tar emot data"
+
+>>>>>>> prod
 }
 
diff --git a/yarn.lock b/yarn.lock
index 0c3fa9f2..bcfd7629 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3520,6 +3520,11 @@ camelcase@^2.0.0:
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-2.1.1.tgz#7c1d16d679a1bbe59ca02cacecfb011e201f5a1f"
   integrity sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8=
 
+camelcase@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-3.0.0.tgz#32fc4b9fcdaf845fcdf7e73bb97cac2261f0ab0a"
+  integrity sha1-MvxLn82vhF/N9+c7uXysImHwqwo=
+
 camelcase@^4.0.0, camelcase@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-4.1.0.tgz#d545635be1e33c542649c69173e5de6acfae34dd"
@@ -3791,6 +3796,15 @@ clipboardy@^1.2.2:
     arch "^2.1.0"
     execa "^0.8.0"
 
+cliui@^3.2.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/cliui/-/cliui-3.2.0.tgz#120601537a916d29940f934da3b48d585a39213d"
+  integrity sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=
+  dependencies:
+    string-width "^1.0.1"
+    strip-ansi "^3.0.1"
+    wrap-ansi "^2.0.0"
+
 cliui@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/cliui/-/cliui-5.0.0.tgz#deefcfdb2e800784aa34f46fa08e06851c7bbbc5"
@@ -4695,7 +4709,7 @@ decamelize-keys@^1.0.0:
     decamelize "^1.1.0"
     map-obj "^1.0.0"
 
-decamelize@^1.1.0, decamelize@^1.1.2, decamelize@^1.2.0:
+decamelize@^1.1.0, decamelize@^1.1.1, decamelize@^1.1.2, decamelize@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
   integrity sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=
@@ -5929,6 +5943,11 @@ gensync@^1.0.0-beta.2:
   resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.2.tgz#32a6ee76c3d7f52d46b2b1ae5d93fea8580a25e0"
   integrity sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==
 
+get-caller-file@^1.0.1:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.3.tgz#f978fa4c90d1dfe7ff2d6beda2a515e713bdcf4a"
+  integrity sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==
+
 get-caller-file@^2.0.1:
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
@@ -6729,6 +6748,11 @@ invariant@^2.0.0, invariant@^2.2.2, invariant@^2.2.4:
   dependencies:
     loose-envify "^1.0.0"
 
+invert-kv@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/invert-kv/-/invert-kv-1.0.0.tgz#104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6"
+  integrity sha1-EEqOSqym09jNFXqO+L+rLXo//bY=
+
 ipaddr.js@1.9.1:
   version "1.9.1"
   resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.9.1.tgz#bff38543eeb8984825079ff3a2a8e6cbd46781b3"
@@ -7787,10 +7811,10 @@ json-schema-traverse@^0.4.1:
   resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660"
   integrity sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==
 
-json-schema@0.2.3:
-  version "0.2.3"
-  resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.2.3.tgz#b480c892e59a2f05954ce727bd3f2a4e882f9e13"
-  integrity sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=
+json-schema@0.2.3, json-schema@0.4.0, json-schema@^0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.4.0.tgz#f7de4cf6efab838ebaeb3236474cbba5a1930ab5"
+  integrity sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA==
 
 json-stringify-safe@^5.0.1, json-stringify-safe@~5.0.1:
   version "5.0.1"
@@ -7964,6 +7988,13 @@ latest-version@^5.0.0:
   dependencies:
     package-json "^6.3.0"
 
+lcid@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/lcid/-/lcid-1.0.0.tgz#308accafa0bc483a3867b4b6f2b9506251d1b835"
+  integrity sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=
+  dependencies:
+    invert-kv "^1.0.0"
+
 left-pad@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/left-pad/-/left-pad-1.3.0.tgz#5b8a3a7765dfe001261dde915589e782f8c94d1e"
@@ -8902,10 +8933,10 @@ node-releases@^2.0.0:
   resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.1.tgz#3d1d395f204f1f2f29a54358b9fb678765ad2fc5"
   integrity sha512-CqyzN6z7Q6aMeF/ktcMVTzhAHCEpf8SOarwpzpf8pNBY2k5/oM34UHldUwp8VKI7uxct2HxSRdJjBaZeESzcxA==
 
-node-sass@^4.13.0:
-  version "4.14.1"
-  resolved "https://registry.yarnpkg.com/node-sass/-/node-sass-4.14.1.tgz#99c87ec2efb7047ed638fb4c9db7f3a42e2217b5"
-  integrity sha512-sjCuOlvGyCJS40R8BscF5vhVlQjNN069NtQ1gSxyK1u9iqvn6tf7O1R4GNowVZfiZUCRt5MmMs1xd+4V/7Yr0g==
+node-sass@4.14.0:
+  version "4.14.0"
+  resolved "https://registry.yarnpkg.com/node-sass/-/node-sass-4.14.0.tgz#a8e9d7720f8e15b4a1072719dcf04006f5648eeb"
+  integrity sha512-AxqU+DFpk0lEz95sI6jO0hU0Rwyw7BXVEv6o9OItoXLyeygPeaSpiV4rwQb10JiTghHaa0gZeD21sz+OsQluaw==
   dependencies:
     async-foreach "^0.1.3"
     chalk "^1.1.1"
@@ -8921,7 +8952,7 @@ node-sass@^4.13.0:
     node-gyp "^3.8.0"
     npmlog "^4.0.0"
     request "^2.88.0"
-    sass-graph "2.2.5"
+    sass-graph "^2.2.4"
     stdout-stream "^1.4.0"
     "true-case-path" "^1.0.2"
 
@@ -9260,6 +9291,13 @@ os-homedir@^1.0.0:
   resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3"
   integrity sha1-/7xJiDNuDoM94MFox+8VISGqf7M=
 
+os-locale@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-1.4.0.tgz#20f9f17ae29ed345e8bde583b13d2009803c14d9"
+  integrity sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=
+  dependencies:
+    lcid "^1.0.0"
+
 os-tmpdir@^1.0.0, os-tmpdir@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
@@ -10924,6 +10962,11 @@ require-directory@^2.1.1:
   resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
   integrity sha1-jGStX9MNqxyXbiNE/+f3kqam30I=
 
+require-main-filename@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-1.0.1.tgz#97f717b69d48784f5f526a6c5aa8ffdda055a4d1"
+  integrity sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=
+
 require-main-filename@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-2.0.0.tgz#d0b329ecc7cc0f61649f62215be69af54aa8989b"
@@ -11116,15 +11159,15 @@ sane@^4.0.3:
     minimist "^1.1.1"
     walker "~1.0.5"
 
-sass-graph@2.2.5:
-  version "2.2.5"
-  resolved "https://registry.yarnpkg.com/sass-graph/-/sass-graph-2.2.5.tgz#a981c87446b8319d96dce0671e487879bd24c2e8"
-  integrity sha512-VFWDAHOe6mRuT4mZRd4eKE+d8Uedrk6Xnh7Sh9b4NGufQLQjOrvf/MQoOdx+0s92L89FeyUUNfU597j/3uNpag==
+sass-graph@^2.2.4:
+  version "2.2.6"
+  resolved "https://registry.yarnpkg.com/sass-graph/-/sass-graph-2.2.6.tgz#09fda0e4287480e3e4967b72a2d133ba09b8d827"
+  integrity sha512-MKuEYXFSGuRSi8FZ3A7imN1CeVn9Gpw0/SFJKdL1ejXJneI9a5rwlEZrKejhEFAA3O6yr3eIyl/WuvASvlT36g==
   dependencies:
     glob "^7.0.0"
     lodash "^4.0.0"
     scss-tokenizer "^0.2.3"
-    yargs "^13.3.2"
+    yargs "^7.0.0"
 
 sass-loader@^8.0.0:
   version "8.0.2"
@@ -11693,7 +11736,7 @@ string-length@^2.0.0:
     astral-regex "^1.0.0"
     strip-ansi "^4.0.0"
 
-string-width@^1.0.1:
+string-width@^1.0.1, string-width@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"
   integrity sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=
@@ -13239,6 +13282,11 @@ which-boxed-primitive@^1.0.2:
     is-string "^1.0.5"
     is-symbol "^1.0.3"
 
+which-module@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/which-module/-/which-module-1.0.0.tgz#bba63ca861948994ff307736089e3b96026c2a4f"
+  integrity sha1-u6Y8qGGUiZT/MHc2CJ47lgJsKk8=
+
 which-module@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"
@@ -13296,6 +13344,14 @@ worker-rpc@^0.1.0:
   dependencies:
     microevent.ts "~0.1.1"
 
+wrap-ansi@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-2.1.0.tgz#d8fc3d284dd05794fe84973caecdd1cf824fdd85"
+  integrity sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=
+  dependencies:
+    string-width "^1.0.1"
+    strip-ansi "^3.0.1"
+
 wrap-ansi@^5.1.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-5.1.0.tgz#1fd1f67235d5b6d0fee781056001bfb694c03b09"
@@ -13396,6 +13452,11 @@ xtend@~2.1.1:
   dependencies:
     object-keys "~0.4.0"
 
+y18n@^3.2.1:
+  version "3.2.2"
+  resolved "https://registry.yarnpkg.com/y18n/-/y18n-3.2.2.tgz#85c901bd6470ce71fc4bb723ad209b70f7f28696"
+  integrity sha512-uGZHXkHnhF0XeeAPgnKfPv1bgKAYyVvmNL1xlKsPYZPaIHxGti2hHqvOCQv71XMsLxu1QjergkqogUnms5D3YQ==
+
 y18n@^4.0.0:
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.3.tgz#b5f259c82cd6e336921efd7bfd8bf560de9eeedf"
@@ -13426,7 +13487,7 @@ yaml@^1.7.2:
   resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.10.2.tgz#2301c5ffbf12b467de8da2333a459e29e7920e4b"
   integrity sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==
 
-yargs-parser@10.x, yargs-parser@13.1.2, yargs-parser@^10.0.0, yargs-parser@^13.1.2:
+yargs-parser@10.x, yargs-parser@13.1.2, yargs-parser@^10.0.0, yargs-parser@^13.1.2, yargs-parser@^5.0.1:
   version "13.1.2"
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-13.1.2.tgz#130f09702ebaeef2650d54ce6e3e5706f7a4fb38"
   integrity sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==
@@ -13434,7 +13495,7 @@ yargs-parser@10.x, yargs-parser@13.1.2, yargs-parser@^10.0.0, yargs-parser@^13.1
     camelcase "^5.0.0"
     decamelize "^1.2.0"
 
-yargs@^13.3.0, yargs@^13.3.2:
+yargs@^13.3.0:
   version "13.3.2"
   resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.3.2.tgz#ad7ffefec1aa59565ac915f82dccb38a9c31a2dd"
   integrity sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==
@@ -13450,6 +13511,25 @@ yargs@^13.3.0, yargs@^13.3.2:
     y18n "^4.0.0"
     yargs-parser "^13.1.2"
 
+yargs@^7.0.0:
+  version "7.1.2"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-7.1.2.tgz#63a0a5d42143879fdbb30370741374e0641d55db"
+  integrity sha512-ZEjj/dQYQy0Zx0lgLMLR8QuaqTihnxirir7EwUHp1Axq4e3+k8jXU5K0VLbNvedv1f4EWtBonDIZm0NUr+jCcA==
+  dependencies:
+    camelcase "^3.0.0"
+    cliui "^3.2.0"
+    decamelize "^1.1.1"
+    get-caller-file "^1.0.1"
+    os-locale "^1.4.0"
+    read-pkg-up "^1.0.1"
+    require-directory "^2.1.1"
+    require-main-filename "^1.0.1"
+    set-blocking "^2.0.0"
+    string-width "^1.0.2"
+    which-module "^1.0.0"
+    y18n "^3.2.1"
+    yargs-parser "^5.0.1"
+
 ylru@^1.2.0:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/ylru/-/ylru-1.2.1.tgz#f576b63341547989c1de7ba288760923b27fe84f"