Merge branch 'dev' into dependabot/npm_and_yarn/webpack-bundle-analyzer-3.4.1