diff --git a/.travis.yml b/.travis.yml
index bc355e5e4..82f006460 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,10 +13,10 @@ php:
   - 7.0.22
 env:
   - VERSION=HEAD
+  - VERSION=2.2.0
   - VERSION=2.1.8
   - VERSION=2.1.7
   - VERSION=2.1.6
-  - VERSION=2.1.5
 
 addons:
   apt:
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 57a52bbf1..80039a753 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,6 @@
+## 2.2.0
+* Lightning has been updated to run on and now requires Drupal Core 8.4.x.
+
 ## 2.1.8
 * Added the ability to easily crop images contained in media entities and use
   the cropped version when embedding or selecting the media item.
diff --git a/README.md b/README.md
index 85e0bfdf5..e3015817e 100644
--- a/README.md
+++ b/README.md
@@ -141,9 +141,10 @@ your environment, but generally you will not need to do this.
   with the experimental Content Moderation module included with Drupal core
   8.3.0 and later and serves the same purpose as Workbench Moderation. We plan
   to seamlessly migrate Lightning Workflow to Content Moderation once it is
-  stable, most likely in Drupal 8.4.0. But for now, installing Content
-  Moderation alongside Lightning Workflow may have unpredictable and dangerous
-  effects, and is best avoided.
+  ready and an update path exists (see [Issue #2863059](https://www.drupal.org/node/2863059)
+  for more information). But for now, installing Content Moderation alongside
+  Lightning Workflow may have unpredictable and dangerous effects, an is best
+  avoided.
   
 ### Inherited profiles
 Neither Drush nor Drupal Console are aware of the concept of inherited profiles
diff --git a/RoboFile.php b/RoboFile.php
index d45ff36b7..8d03fb7bf 100644
--- a/RoboFile.php
+++ b/RoboFile.php
@@ -10,8 +10,8 @@ protected function taskBehat($behat = NULL) {
 
     return parent::taskBehat($behat)
       ->config('docroot/sites/default/files/behat.yml')
-      ->option('strict')
-      ->stopOnFail();
+      ->option('stop-on-failure')
+      ->option('strict');
   }
 
   /**
diff --git a/UPDATE.md b/UPDATE.md
index e4d599f53..f1bdd0fe9 100644
--- a/UPDATE.md
+++ b/UPDATE.md
@@ -76,6 +76,9 @@ are currently running Beta 1 and are trying to update to Beta 3, you will need
 to follow the instructions for updating from Beta 1 to Beta 2, then from Beta 2
 to Beta 3, in that order.
 
+### 2.1.8 to 2.2.0
+There are no manual update steps for this version. 
+
 ### 2.1.7 to 2.1.8
 * Lightning now ships with support for image cropping, using the Image Widget
   Crop module. To use it for the Image media bundle (the default behavior in
diff --git a/build-lightning.make b/build-lightning.make
index 06c4082b7..174cb6438 100644
--- a/build-lightning.make
+++ b/build-lightning.make
@@ -4,4 +4,4 @@ includes[] = drupal-org-core.make
 projects[lightning][type] = profile
 projects[lightning][download][type] = git
 projects[lightning][download][branch] = 8.x-2.x
-projects[lightning][download][tag] = 8.x-2.20-dev
\ No newline at end of file
+projects[lightning][download][tag] = 8.x-2.20
\ No newline at end of file
diff --git a/composer.json b/composer.json
index 842ab4934..56e818f4b 100644
--- a/composer.json
+++ b/composer.json
@@ -89,8 +89,6 @@
                 "https://www.drupal.org/files/issues/workbench_moderation-quickedit-support-2749503-6.patch"
             },
             "drupal/core": {
-                "2652138 - ImageFormatter does not support SVGs":
-                "https://www.drupal.org/files/issues/2652138-41.patch",
                 "1356276 - Allow profiles to provide a base/parent profile and load them in the correct order":
                 "https://www.drupal.org/files/issues/1356276-360.patch",
                 "2880374 - Experimental modules should not have warnings after being installed":
@@ -100,9 +98,7 @@
                 "2869592 - Disabled update module shouldn't produce a status report warning":
                 "https://www.drupal.org/files/issues/2869592-remove-update-warning-7.patch",
                 "2885441 - EntityReferenceAutocompleteWidget should define its size setting as an integer":
-                "https://www.drupal.org/files/issues/2885441-2.patch",
-                "2904798 - 8.3.7 Views SA patch should use ajaxEnabled() and not check option 'use_ajax' directly":
-                "https://www.drupal.org/files/issues/2904798-7.patch"
+                "https://www.drupal.org/files/issues/2885441-2.patch"
             },
             "drupal/entity_embed": {
                 "2832504 - Send the CKEditor instance ID to the embed.preview route":
@@ -126,7 +122,9 @@
                 "2825034 - Form error messages do not appear in IPE":
                 "https://www.drupal.org/files/issues/panels-ipe-propogate-errors-2825034-5.patch",
                 "2908897 - CategoryView leaves AJAX request marked active":
-                "https://www.drupal.org/files/issues/2908897-2.patch"
+                "https://www.drupal.org/files/issues/2908897-2.patch",
+                "2913353 - IPE attaches behaviors a bit too quickly":
+                "https://www.drupal.org/files/issues/2913353-2.patch"
             },
             "drupal/panelizer": {
                 "2908917 - SaveTabView blindly assumes a Revert tab exists":
@@ -140,7 +138,7 @@
     },
     "require": {
         "cweagans/composer-patches": "^1.5.0",
-        "drupal/core": "~8.3.1",
+        "drupal/core": "~8.4.0",
         "drupal/embed": "^1.0",
         "drupal/entity_embed": "1.0.0-beta2",
         "drupal/media_entity": "^1.0",
diff --git a/composer.lock b/composer.lock
index ea7af4b4e..36fed3bfe 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "content-hash": "d0b481385f4d85654235e848bf4923c3",
+    "content-hash": "d1da76a95319f4c41045367d3466bbda",
     "packages": [
         {
             "name": "asm89/stack-cors",
@@ -437,35 +437,35 @@
         },
         {
             "name": "doctrine/annotations",
-            "version": "v1.2.7",
+            "version": "v1.4.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/annotations.git",
-                "reference": "f25c8aab83e0c3e976fd7d19875f198ccf2f7535"
+                "reference": "54cacc9b81758b14e3ce750f205a393d52339e97"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/annotations/zipball/f25c8aab83e0c3e976fd7d19875f198ccf2f7535",
-                "reference": "f25c8aab83e0c3e976fd7d19875f198ccf2f7535",
+                "url": "https://api.github.com/repos/doctrine/annotations/zipball/54cacc9b81758b14e3ce750f205a393d52339e97",
+                "reference": "54cacc9b81758b14e3ce750f205a393d52339e97",
                 "shasum": ""
             },
             "require": {
                 "doctrine/lexer": "1.*",
-                "php": ">=5.3.2"
+                "php": "^5.6 || ^7.0"
             },
             "require-dev": {
                 "doctrine/cache": "1.*",
-                "phpunit/phpunit": "4.*"
+                "phpunit/phpunit": "^5.7"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.3.x-dev"
+                    "dev-master": "1.4.x-dev"
                 }
             },
             "autoload": {
-                "psr-0": {
-                    "Doctrine\\Common\\Annotations\\": "lib/"
+                "psr-4": {
+                    "Doctrine\\Common\\Annotations\\": "lib/Doctrine/Common/Annotations"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -501,7 +501,7 @@
                 "docblock",
                 "parser"
             ],
-            "time": "2015-08-31T12:32:49+00:00"
+            "time": "2017-02-24T16:22:25+00:00"
         },
         {
             "name": "doctrine/cache",
@@ -1121,48 +1121,48 @@
         },
         {
             "name": "drupal/core",
-            "version": "8.3.7",
+            "version": "8.4.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/drupal/core.git",
-                "reference": "32f66ed9cc593f8e9ab0eaaaeff4cadbd859d5ff"
+                "reference": "d4be8e12d9e8b4db82ece760c632213247f56fa7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/drupal/core/zipball/32f66ed9cc593f8e9ab0eaaaeff4cadbd859d5ff",
-                "reference": "32f66ed9cc593f8e9ab0eaaaeff4cadbd859d5ff",
+                "url": "https://api.github.com/repos/drupal/core/zipball/d4be8e12d9e8b4db82ece760c632213247f56fa7",
+                "reference": "d4be8e12d9e8b4db82ece760c632213247f56fa7",
                 "shasum": ""
             },
             "require": {
-                "asm89/stack-cors": "~1.0",
-                "composer/semver": "~1.0",
-                "doctrine/annotations": "1.2.*",
+                "asm89/stack-cors": "^1.1",
+                "composer/semver": "^1.0",
+                "doctrine/annotations": "^1.2",
                 "doctrine/common": "^2.5",
-                "easyrdf/easyrdf": "0.9.*",
-                "egulias/email-validator": "1.2.*",
+                "easyrdf/easyrdf": "^0.9",
+                "egulias/email-validator": "^1.2",
                 "guzzlehttp/guzzle": "^6.2.1",
-                "masterminds/html5": "~2.1",
+                "masterminds/html5": "^2.1",
                 "paragonie/random_compat": "^1.0|^2.0",
                 "php": ">=5.5.9",
-                "stack/builder": "1.0.*",
-                "symfony-cmf/routing": "~1.4",
-                "symfony/class-loader": "~2.8",
-                "symfony/console": "~2.8",
-                "symfony/dependency-injection": "~2.8",
-                "symfony/event-dispatcher": "~2.8",
-                "symfony/http-foundation": "~2.8",
-                "symfony/http-kernel": "~2.8",
-                "symfony/polyfill-iconv": "~1.0",
-                "symfony/process": "~2.8",
+                "stack/builder": "^1.0",
+                "symfony-cmf/routing": "^1.4",
+                "symfony/class-loader": "~3.2.8",
+                "symfony/console": "~3.2.8",
+                "symfony/dependency-injection": "~3.2.8",
+                "symfony/event-dispatcher": "~3.2.8",
+                "symfony/http-foundation": "~3.2.8",
+                "symfony/http-kernel": "~3.2.8",
+                "symfony/polyfill-iconv": "^1.0",
+                "symfony/process": "~3.2.8",
                 "symfony/psr-http-message-bridge": "^1.0",
-                "symfony/routing": "~2.8",
-                "symfony/serializer": "~2.8",
-                "symfony/translation": "~2.8",
-                "symfony/validator": "~2.8",
-                "symfony/yaml": "~2.8",
+                "symfony/routing": "~3.2.8",
+                "symfony/serializer": "~3.2.8",
+                "symfony/translation": "~3.2.8",
+                "symfony/validator": "~3.2.8",
+                "symfony/yaml": "~3.2.8",
                 "twig/twig": "^1.23.1",
-                "zendframework/zend-diactoros": "~1.1",
-                "zendframework/zend-feed": "~2.4"
+                "zendframework/zend-diactoros": "^1.1",
+                "zendframework/zend-feed": "^2.4"
             },
             "conflict": {
                 "drush/drush": "<8.1.10"
@@ -1232,6 +1232,7 @@
                 "drupal/layout_discovery": "self.version",
                 "drupal/link": "self.version",
                 "drupal/locale": "self.version",
+                "drupal/media": "self.version",
                 "drupal/menu_link_content": "self.version",
                 "drupal/menu_ui": "self.version",
                 "drupal/migrate": "self.version",
@@ -1240,7 +1241,6 @@
                 "drupal/minimal": "self.version",
                 "drupal/node": "self.version",
                 "drupal/options": "self.version",
-                "drupal/outside_in": "self.version",
                 "drupal/page_cache": "self.version",
                 "drupal/path": "self.version",
                 "drupal/quickedit": "self.version",
@@ -1249,6 +1249,7 @@
                 "drupal/rest": "self.version",
                 "drupal/search": "self.version",
                 "drupal/serialization": "self.version",
+                "drupal/settings_tray": "self.version",
                 "drupal/seven": "self.version",
                 "drupal/shortcut": "self.version",
                 "drupal/simpletest": "self.version",
@@ -1271,25 +1272,24 @@
             },
             "require-dev": {
                 "behat/mink": "1.7.x-dev",
-                "behat/mink-goutte-driver": "~1.2",
-                "drupal/coder": "8.2.12",
-                "jcalderonzumba/gastonjs": "~1.0.2",
-                "jcalderonzumba/mink-phantomjs-driver": "~0.3.1",
-                "mikey179/vfsstream": "~1.2",
-                "phpunit/phpunit": ">=4.8.28 <5",
-                "symfony/browser-kit": ">=2.8.13 <3.0",
-                "symfony/css-selector": "~2.8"
+                "behat/mink-goutte-driver": "^1.2",
+                "drupal/coder": "^8.2.12",
+                "jcalderonzumba/gastonjs": "^1.0.2",
+                "jcalderonzumba/mink-phantomjs-driver": "^0.3.1",
+                "mikey179/vfsstream": "^1.2",
+                "phpspec/prophecy": "^1.4",
+                "phpunit/phpunit": ">=4.8.35 <5",
+                "symfony/css-selector": "~3.2.8",
+                "symfony/phpunit-bridge": "~3.2.8"
             },
             "type": "drupal-core",
             "extra": {
                 "patches_applied": {
-                    "2652138 - ImageFormatter does not support SVGs": "https://www.drupal.org/files/issues/2652138-41.patch",
                     "1356276 - Allow profiles to provide a base/parent profile and load them in the correct order": "https://www.drupal.org/files/issues/1356276-360.patch",
                     "2880374 - Experimental modules should not have warnings after being installed": "https://www.drupal.org/files/issues/2880374-remove-experimental-warnings-6.patch",
                     "2880445 - Config sync should not throw a warning when not being writable": "https://www.drupal.org/files/issues/2880445-remove-config-write-warning-2.patch",
                     "2869592 - Disabled update module shouldn't produce a status report warning": "https://www.drupal.org/files/issues/2869592-remove-update-warning-7.patch",
-                    "2885441 - EntityReferenceAutocompleteWidget should define its size setting as an integer": "https://www.drupal.org/files/issues/2885441-2.patch",
-                    "2904798 - 8.3.7 Views SA patch should use ajaxEnabled() and not check option 'use_ajax' directly": "https://www.drupal.org/files/issues/2904798-7.patch"
+                    "2885441 - EntityReferenceAutocompleteWidget should define its size setting as an integer": "https://www.drupal.org/files/issues/2885441-2.patch"
                 }
             },
             "autoload": {
@@ -1313,7 +1313,7 @@
                 "GPL-2.0+"
             ],
             "description": "Drupal is an open source content management platform powering millions of websites and applications.",
-            "time": "2017-08-16T17:10:35+00:00"
+            "time": "2017-10-04T19:25:32+00:00"
         },
         {
             "name": "drupal/crop",
@@ -2632,17 +2632,17 @@
         },
         {
             "name": "drupal/metatag",
-            "version": "1.2.0",
+            "version": "1.3.0",
             "source": {
                 "type": "git",
                 "url": "https://git.drupal.org/project/metatag",
-                "reference": "8.x-1.2"
+                "reference": "8.x-1.3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://ftp.drupal.org/files/projects/metatag-8.x-1.2.zip",
-                "reference": "8.x-1.2",
-                "shasum": "f64745456579bb0ff8139a38d8d5de673868d94c"
+                "url": "https://ftp.drupal.org/files/projects/metatag-8.x-1.3.zip",
+                "reference": "8.x-1.3",
+                "shasum": "5ff80fe91a1ea0446b11aef6c947259305080a38"
             },
             "require": {
                 "drupal/core": "*",
@@ -2652,8 +2652,7 @@
                 "drupal/devel": "^1.0",
                 "drupal/metatag_dc": "*",
                 "drupal/metatag_open_graph": "*",
-                "drupal/restui": "*",
-                "restui/restui": "^1.0"
+                "drupal/restui": "^1.0"
             },
             "type": "drupal-module",
             "extra": {
@@ -2661,8 +2660,12 @@
                     "dev-1.x": "1.x-dev"
                 },
                 "drupal": {
-                    "version": "8.x-1.2",
-                    "datestamp": "1501584761"
+                    "version": "8.x-1.3",
+                    "datestamp": "1506715150",
+                    "security-coverage": {
+                        "status": "covered",
+                        "message": "Covered by Drupal's security advisory policy"
+                    }
                 }
             },
             "notification-url": "https://packages.drupal.org/8/downloads",
@@ -2868,7 +2871,8 @@
                 "patches_applied": {
                     "2878684 - Use String.match to correlate regions when switching Layouts in Panels IPE": "https://www.drupal.org/files/issues/panels-ipe-2878684-3.patch",
                     "2825034 - Form error messages do not appear in IPE": "https://www.drupal.org/files/issues/panels-ipe-propogate-errors-2825034-5.patch",
-                    "2908897 - CategoryView leaves AJAX request marked active": "https://www.drupal.org/files/issues/2908897-2.patch"
+                    "2908897 - CategoryView leaves AJAX request marked active": "https://www.drupal.org/files/issues/2908897-2.patch",
+                    "2913353 - IPE attaches behaviors a bit too quickly": "https://www.drupal.org/files/issues/2913353-2.patch"
                 }
             },
             "notification-url": "https://packages.drupal.org/8/downloads",
@@ -3273,17 +3277,17 @@
         },
         {
             "name": "drupal/simple_oauth",
-            "version": "3.0.0-beta1",
+            "version": "3.0.0",
             "source": {
                 "type": "git",
                 "url": "https://git.drupal.org/project/simple_oauth",
-                "reference": "8.x-3.0-beta1"
+                "reference": "8.x-3.0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://ftp.drupal.org/files/projects/simple_oauth-8.x-3.0-beta1.zip",
-                "reference": "8.x-3.0-beta1",
-                "shasum": "fe529ff93f3c0ec5ca3860623a36356ddf2992c3"
+                "url": "https://ftp.drupal.org/files/projects/simple_oauth-8.x-3.0.zip",
+                "reference": "8.x-3.0",
+                "shasum": "2814802f824433bf14410edfea3283412c30713b"
             },
             "require": {
                 "drupal/consumers": "*",
@@ -3296,11 +3300,11 @@
                     "dev-3.x": "3.x-dev"
                 },
                 "drupal": {
-                    "version": "8.x-3.0-beta1",
-                    "datestamp": "1505028244",
+                    "version": "8.x-3.0",
+                    "datestamp": "1506893943",
                     "security-coverage": {
-                        "status": "not-covered",
-                        "message": "Beta releases are not covered by Drupal security advisories."
+                        "status": "covered",
+                        "message": "Covered by Drupal's security advisory policy"
                     }
                 }
             },
@@ -3942,48 +3946,6 @@
             ],
             "time": "2017-03-20T17:10:46+00:00"
         },
-        {
-            "name": "ircmaxell/password-compat",
-            "version": "v1.0.4",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/ircmaxell/password_compat.git",
-                "reference": "5c5cde8822a69545767f7c7f3058cb15ff84614c"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/ircmaxell/password_compat/zipball/5c5cde8822a69545767f7c7f3058cb15ff84614c",
-                "reference": "5c5cde8822a69545767f7c7f3058cb15ff84614c",
-                "shasum": ""
-            },
-            "require-dev": {
-                "phpunit/phpunit": "4.*"
-            },
-            "type": "library",
-            "autoload": {
-                "files": [
-                    "lib/password.php"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Anthony Ferrara",
-                    "email": "ircmaxell@php.net",
-                    "homepage": "http://blog.ircmaxell.com"
-                }
-            ],
-            "description": "A compatibility library for the proposed simplified password hashing algorithm: https://wiki.php.net/rfc/password_hash",
-            "homepage": "https://github.com/ircmaxell/password_compat",
-            "keywords": [
-                "hashing",
-                "password"
-            ],
-            "time": "2014-11-20T16:49:30+00:00"
-        },
         {
             "name": "j7mbo/twitter-api-php",
             "version": "1.0.6",
@@ -4356,16 +4318,16 @@
         },
         {
             "name": "paragonie/random_compat",
-            "version": "v2.0.10",
+            "version": "v2.0.11",
             "source": {
                 "type": "git",
                 "url": "https://github.com/paragonie/random_compat.git",
-                "reference": "634bae8e911eefa89c1abfbf1b66da679ac8f54d"
+                "reference": "5da4d3c796c275c55f057af5a643ae297d96b4d8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/paragonie/random_compat/zipball/634bae8e911eefa89c1abfbf1b66da679ac8f54d",
-                "reference": "634bae8e911eefa89c1abfbf1b66da679ac8f54d",
+                "url": "https://api.github.com/repos/paragonie/random_compat/zipball/5da4d3c796c275c55f057af5a643ae297d96b4d8",
+                "reference": "5da4d3c796c275c55f057af5a643ae297d96b4d8",
                 "shasum": ""
             },
             "require": {
@@ -4400,7 +4362,7 @@
                 "pseudorandom",
                 "random"
             ],
-            "time": "2017-03-13T16:27:32+00:00"
+            "time": "2017-09-27T21:40:39+00:00"
         },
         {
             "name": "psr/http-message",
@@ -4657,29 +4619,32 @@
         },
         {
             "name": "symfony/class-loader",
-            "version": "v2.8.27",
+            "version": "v3.2.13",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/class-loader.git",
-                "reference": "151afda88c9e3f8b45efa2ce791c69528327e18c"
+                "reference": "e192d96b15fdd168bdb1c91001d26c93ba4af482"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/class-loader/zipball/151afda88c9e3f8b45efa2ce791c69528327e18c",
-                "reference": "151afda88c9e3f8b45efa2ce791c69528327e18c",
+                "url": "https://api.github.com/repos/symfony/class-loader/zipball/e192d96b15fdd168bdb1c91001d26c93ba4af482",
+                "reference": "e192d96b15fdd168bdb1c91001d26c93ba4af482",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.9",
-                "symfony/polyfill-apcu": "~1.1"
+                "php": ">=5.5.9"
             },
             "require-dev": {
-                "symfony/finder": "^2.0.5|~3.0.0"
+                "symfony/finder": "~2.8|~3.0",
+                "symfony/polyfill-apcu": "~1.1"
+            },
+            "suggest": {
+                "symfony/polyfill-apcu": "For using ApcClassLoader on HHVM"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.8-dev"
+                    "dev-master": "3.2-dev"
                 }
             },
             "autoload": {
@@ -4706,41 +4671,43 @@
             ],
             "description": "Symfony ClassLoader Component",
             "homepage": "https://symfony.com",
-            "time": "2017-07-05T06:50:35+00:00"
+            "time": "2017-06-01T21:00:24+00:00"
         },
         {
             "name": "symfony/console",
-            "version": "v2.8.27",
+            "version": "v3.2.13",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/console.git",
-                "reference": "c0807a2ca978e64d8945d373a9221a5c35d1a253"
+                "reference": "eced439413608647aeff243038a33ea246b2b33a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/c0807a2ca978e64d8945d373a9221a5c35d1a253",
-                "reference": "c0807a2ca978e64d8945d373a9221a5c35d1a253",
+                "url": "https://api.github.com/repos/symfony/console/zipball/eced439413608647aeff243038a33ea246b2b33a",
+                "reference": "eced439413608647aeff243038a33ea246b2b33a",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.9",
-                "symfony/debug": "^2.7.2|~3.0.0",
+                "php": ">=5.5.9",
+                "symfony/debug": "~2.8|~3.0",
                 "symfony/polyfill-mbstring": "~1.0"
             },
             "require-dev": {
                 "psr/log": "~1.0",
-                "symfony/event-dispatcher": "~2.1|~3.0.0",
-                "symfony/process": "~2.1|~3.0.0"
+                "symfony/event-dispatcher": "~2.8|~3.0",
+                "symfony/filesystem": "~2.8|~3.0",
+                "symfony/process": "~2.8|~3.0"
             },
             "suggest": {
                 "psr/log": "For using the console logger",
                 "symfony/event-dispatcher": "",
+                "symfony/filesystem": "",
                 "symfony/process": ""
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.8-dev"
+                    "dev-master": "3.2-dev"
                 }
             },
             "autoload": {
@@ -4767,37 +4734,36 @@
             ],
             "description": "Symfony Console Component",
             "homepage": "https://symfony.com",
-            "time": "2017-08-27T14:29:03+00:00"
+            "time": "2017-07-29T21:27:41+00:00"
         },
         {
             "name": "symfony/debug",
-            "version": "v2.8.27",
+            "version": "v3.3.9",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/debug.git",
-                "reference": "efc9656dcb227e1459905d5aa51e43dfec76e752"
+                "reference": "8beb24eec70b345c313640962df933499373a944"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/debug/zipball/efc9656dcb227e1459905d5aa51e43dfec76e752",
-                "reference": "efc9656dcb227e1459905d5aa51e43dfec76e752",
+                "url": "https://api.github.com/repos/symfony/debug/zipball/8beb24eec70b345c313640962df933499373a944",
+                "reference": "8beb24eec70b345c313640962df933499373a944",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.9",
+                "php": "^5.5.9|>=7.0.8",
                 "psr/log": "~1.0"
             },
             "conflict": {
                 "symfony/http-kernel": ">=2.3,<2.3.24|~2.4.0|>=2.5,<2.5.9|>=2.6,<2.6.2"
             },
             "require-dev": {
-                "symfony/class-loader": "~2.2|~3.0.0",
-                "symfony/http-kernel": "~2.3.24|~2.5.9|^2.6.2|~3.0.0"
+                "symfony/http-kernel": "~2.8|~3.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.8-dev"
+                    "dev-master": "3.3-dev"
                 }
             },
             "autoload": {
@@ -4824,32 +4790,32 @@
             ],
             "description": "Symfony Debug Component",
             "homepage": "https://symfony.com",
-            "time": "2017-08-27T14:29:03+00:00"
+            "time": "2017-09-01T13:23:39+00:00"
         },
         {
             "name": "symfony/dependency-injection",
-            "version": "v2.8.27",
+            "version": "v3.2.13",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/dependency-injection.git",
-                "reference": "fbeea992f0d30e3c400694c85f60c9bfd10454a3"
+                "reference": "d9f2e62e1a93d52ad4e4f6faaf66f6eef723d761"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/fbeea992f0d30e3c400694c85f60c9bfd10454a3",
-                "reference": "fbeea992f0d30e3c400694c85f60c9bfd10454a3",
+                "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/d9f2e62e1a93d52ad4e4f6faaf66f6eef723d761",
+                "reference": "d9f2e62e1a93d52ad4e4f6faaf66f6eef723d761",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.9"
+                "php": ">=5.5.9"
             },
             "conflict": {
-                "symfony/expression-language": "<2.6"
+                "symfony/yaml": "<3.2"
             },
             "require-dev": {
-                "symfony/config": "~2.2|~3.0.0",
-                "symfony/expression-language": "~2.6|~3.0.0",
-                "symfony/yaml": "~2.3.42|~2.7.14|~2.8.7|~3.0.7"
+                "symfony/config": "~2.8|~3.0",
+                "symfony/expression-language": "~2.8|~3.0",
+                "symfony/yaml": "~3.2"
             },
             "suggest": {
                 "symfony/config": "",
@@ -4860,7 +4826,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.8-dev"
+                    "dev-master": "3.2-dev"
                 }
             },
             "autoload": {
@@ -4887,31 +4853,31 @@
             ],
             "description": "Symfony DependencyInjection Component",
             "homepage": "https://symfony.com",
-            "time": "2017-08-10T14:42:21+00:00"
+            "time": "2017-07-28T15:22:55+00:00"
         },
         {
             "name": "symfony/event-dispatcher",
-            "version": "v2.8.27",
+            "version": "v3.2.13",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/event-dispatcher.git",
-                "reference": "1377400fd641d7d1935981546aaef780ecd5bf6d"
+                "reference": "b8de6ee252af19330dd72ad5fc0dd4658a1d6325"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/1377400fd641d7d1935981546aaef780ecd5bf6d",
-                "reference": "1377400fd641d7d1935981546aaef780ecd5bf6d",
+                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/b8de6ee252af19330dd72ad5fc0dd4658a1d6325",
+                "reference": "b8de6ee252af19330dd72ad5fc0dd4658a1d6325",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.9"
+                "php": ">=5.5.9"
             },
             "require-dev": {
                 "psr/log": "~1.0",
-                "symfony/config": "^2.0.5|~3.0.0",
-                "symfony/dependency-injection": "~2.6|~3.0.0",
-                "symfony/expression-language": "~2.6|~3.0.0",
-                "symfony/stopwatch": "~2.3|~3.0.0"
+                "symfony/config": "~2.8|~3.0",
+                "symfony/dependency-injection": "~2.8|~3.0",
+                "symfony/expression-language": "~2.8|~3.0",
+                "symfony/stopwatch": "~2.8|~3.0"
             },
             "suggest": {
                 "symfony/dependency-injection": "",
@@ -4920,7 +4886,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.8-dev"
+                    "dev-master": "3.2-dev"
                 }
             },
             "autoload": {
@@ -4947,35 +4913,33 @@
             ],
             "description": "Symfony EventDispatcher Component",
             "homepage": "https://symfony.com",
-            "time": "2017-06-02T07:47:27+00:00"
+            "time": "2017-06-02T08:26:05+00:00"
         },
         {
             "name": "symfony/http-foundation",
-            "version": "v2.8.27",
+            "version": "v3.2.13",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/http-foundation.git",
-                "reference": "fc4942ad82af83ac8301b68d0c9b1bbcc95a84c6"
+                "reference": "107b7e6c2372ad4859b8a8c8c5b4fb9d7a208fe1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-foundation/zipball/fc4942ad82af83ac8301b68d0c9b1bbcc95a84c6",
-                "reference": "fc4942ad82af83ac8301b68d0c9b1bbcc95a84c6",
+                "url": "https://api.github.com/repos/symfony/http-foundation/zipball/107b7e6c2372ad4859b8a8c8c5b4fb9d7a208fe1",
+                "reference": "107b7e6c2372ad4859b8a8c8c5b4fb9d7a208fe1",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.9",
-                "symfony/polyfill-mbstring": "~1.1",
-                "symfony/polyfill-php54": "~1.0",
-                "symfony/polyfill-php55": "~1.0"
+                "php": ">=5.5.9",
+                "symfony/polyfill-mbstring": "~1.1"
             },
             "require-dev": {
-                "symfony/expression-language": "~2.4|~3.0.0"
+                "symfony/expression-language": "~2.8|~3.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.8-dev"
+                    "dev-master": "3.2-dev"
                 }
             },
             "autoload": {
@@ -5002,49 +4966,49 @@
             ],
             "description": "Symfony HttpFoundation Component",
             "homepage": "https://symfony.com",
-            "time": "2017-08-10T07:04:10+00:00"
+            "time": "2017-07-20T07:58:49+00:00"
         },
         {
             "name": "symfony/http-kernel",
-            "version": "v2.8.27",
+            "version": "v3.2.13",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/http-kernel.git",
-                "reference": "b07102898dcba281d8e91d24ea43872f897d6203"
+                "reference": "18ec42e19ec676d7da5ddff13f1eed68d88fb460"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-kernel/zipball/b07102898dcba281d8e91d24ea43872f897d6203",
-                "reference": "b07102898dcba281d8e91d24ea43872f897d6203",
+                "url": "https://api.github.com/repos/symfony/http-kernel/zipball/18ec42e19ec676d7da5ddff13f1eed68d88fb460",
+                "reference": "18ec42e19ec676d7da5ddff13f1eed68d88fb460",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.9",
+                "php": ">=5.5.9",
                 "psr/log": "~1.0",
-                "symfony/debug": "^2.6.2",
-                "symfony/event-dispatcher": "^2.6.7|~3.0.0",
-                "symfony/http-foundation": "~2.7.20|~2.8.13|~3.1.6"
+                "symfony/debug": "~2.8|~3.0",
+                "symfony/event-dispatcher": "~2.8|~3.0",
+                "symfony/http-foundation": "~2.8.13|~3.1.6|~3.2"
             },
             "conflict": {
-                "symfony/config": "<2.7",
+                "symfony/config": "<2.8",
                 "twig/twig": "<1.34|<2.4,>=2"
             },
             "require-dev": {
-                "symfony/browser-kit": "~2.3|~3.0.0",
-                "symfony/class-loader": "~2.1|~3.0.0",
-                "symfony/config": "~2.8",
-                "symfony/console": "~2.3|~3.0.0",
-                "symfony/css-selector": "^2.0.5|~3.0.0",
-                "symfony/dependency-injection": "~2.8|~3.0.0",
-                "symfony/dom-crawler": "^2.0.5|~3.0.0",
-                "symfony/expression-language": "~2.4|~3.0.0",
-                "symfony/finder": "^2.0.5|~3.0.0",
-                "symfony/process": "^2.0.5|~3.0.0",
-                "symfony/routing": "~2.8|~3.0.0",
-                "symfony/stopwatch": "~2.3|~3.0.0",
-                "symfony/templating": "~2.2|~3.0.0",
-                "symfony/translation": "^2.0.5|~3.0.0",
-                "symfony/var-dumper": "~2.6|~3.0.0"
+                "symfony/browser-kit": "~2.8|~3.0",
+                "symfony/class-loader": "~2.8|~3.0",
+                "symfony/config": "~2.8|~3.0",
+                "symfony/console": "~2.8|~3.0",
+                "symfony/css-selector": "~2.8|~3.0",
+                "symfony/dependency-injection": "~2.8|~3.0",
+                "symfony/dom-crawler": "~2.8|~3.0",
+                "symfony/expression-language": "~2.8|~3.0",
+                "symfony/finder": "~2.8|~3.0",
+                "symfony/process": "~2.8|~3.0",
+                "symfony/routing": "~2.8|~3.0",
+                "symfony/stopwatch": "~2.8|~3.0",
+                "symfony/templating": "~2.8|~3.0",
+                "symfony/translation": "~2.8|~3.0",
+                "symfony/var-dumper": "~3.2"
             },
             "suggest": {
                 "symfony/browser-kit": "",
@@ -5058,7 +5022,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.8-dev"
+                    "dev-master": "3.2-dev"
                 }
             },
             "autoload": {
@@ -5085,60 +5049,7 @@
             ],
             "description": "Symfony HttpKernel Component",
             "homepage": "https://symfony.com",
-            "time": "2017-08-28T19:21:40+00:00"
-        },
-        {
-            "name": "symfony/polyfill-apcu",
-            "version": "v1.5.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/polyfill-apcu.git",
-                "reference": "cec32398a973a9bfe9d2f94f4b5d5e186b40b698"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-apcu/zipball/cec32398a973a9bfe9d2f94f4b5d5e186b40b698",
-                "reference": "cec32398a973a9bfe9d2f94f4b5d5e186b40b698",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.5-dev"
-                }
-            },
-            "autoload": {
-                "files": [
-                    "bootstrap.php"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Nicolas Grekas",
-                    "email": "p@tchwork.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony polyfill backporting apcu_* functions to lower PHP versions",
-            "homepage": "https://symfony.com",
-            "keywords": [
-                "apcu",
-                "compatibility",
-                "polyfill",
-                "portable",
-                "shim"
-            ],
-            "time": "2017-07-05T15:09:33+00:00"
+            "time": "2017-08-01T09:40:19+00:00"
         },
         {
             "name": "symfony/polyfill-iconv",
@@ -5258,141 +5169,27 @@
             ],
             "time": "2017-06-14T15:44:48+00:00"
         },
-        {
-            "name": "symfony/polyfill-php54",
-            "version": "v1.5.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/polyfill-php54.git",
-                "reference": "b7763422a5334c914ef0298ed21b253d25913a6e"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php54/zipball/b7763422a5334c914ef0298ed21b253d25913a6e",
-                "reference": "b7763422a5334c914ef0298ed21b253d25913a6e",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.5-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Polyfill\\Php54\\": ""
-                },
-                "files": [
-                    "bootstrap.php"
-                ],
-                "classmap": [
-                    "Resources/stubs"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Nicolas Grekas",
-                    "email": "p@tchwork.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony polyfill backporting some PHP 5.4+ features to lower PHP versions",
-            "homepage": "https://symfony.com",
-            "keywords": [
-                "compatibility",
-                "polyfill",
-                "portable",
-                "shim"
-            ],
-            "time": "2017-06-14T15:44:48+00:00"
-        },
-        {
-            "name": "symfony/polyfill-php55",
-            "version": "v1.5.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/polyfill-php55.git",
-                "reference": "29b1381d66f16e0581aab0b9f678ccf073288f68"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php55/zipball/29b1381d66f16e0581aab0b9f678ccf073288f68",
-                "reference": "29b1381d66f16e0581aab0b9f678ccf073288f68",
-                "shasum": ""
-            },
-            "require": {
-                "ircmaxell/password-compat": "~1.0",
-                "php": ">=5.3.3"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.5-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Polyfill\\Php55\\": ""
-                },
-                "files": [
-                    "bootstrap.php"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Nicolas Grekas",
-                    "email": "p@tchwork.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony polyfill backporting some PHP 5.5+ features to lower PHP versions",
-            "homepage": "https://symfony.com",
-            "keywords": [
-                "compatibility",
-                "polyfill",
-                "portable",
-                "shim"
-            ],
-            "time": "2017-06-14T15:44:48+00:00"
-        },
         {
             "name": "symfony/process",
-            "version": "v2.8.27",
+            "version": "v3.2.13",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/process.git",
-                "reference": "57e52a0a6a80ea0aec4fc1b785a7920a95cb88a8"
+                "reference": "b39d805dd6c4d1cba1f00cd80361ec80eed0d7bc"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/process/zipball/57e52a0a6a80ea0aec4fc1b785a7920a95cb88a8",
-                "reference": "57e52a0a6a80ea0aec4fc1b785a7920a95cb88a8",
+                "url": "https://api.github.com/repos/symfony/process/zipball/b39d805dd6c4d1cba1f00cd80361ec80eed0d7bc",
+                "reference": "b39d805dd6c4d1cba1f00cd80361ec80eed0d7bc",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.9"
+                "php": ">=5.5.9"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.8-dev"
+                    "dev-master": "3.2-dev"
                 }
             },
             "autoload": {
@@ -5419,7 +5216,7 @@
             ],
             "description": "Symfony Process Component",
             "homepage": "https://symfony.com",
-            "time": "2017-07-03T08:04:30+00:00"
+            "time": "2017-07-03T08:06:20+00:00"
         },
         {
             "name": "symfony/psr-http-message-bridge",
@@ -5483,32 +5280,32 @@
         },
         {
             "name": "symfony/routing",
-            "version": "v2.8.27",
+            "version": "v3.2.13",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/routing.git",
-                "reference": "5cdaffed631e88c972f283bb4f9ca699f3c8bffa"
+                "reference": "b382d7c4f443372c118efcd0cd2bf1028434f2f5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/routing/zipball/5cdaffed631e88c972f283bb4f9ca699f3c8bffa",
-                "reference": "5cdaffed631e88c972f283bb4f9ca699f3c8bffa",
+                "url": "https://api.github.com/repos/symfony/routing/zipball/b382d7c4f443372c118efcd0cd2bf1028434f2f5",
+                "reference": "b382d7c4f443372c118efcd0cd2bf1028434f2f5",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.9"
+                "php": ">=5.5.9"
             },
             "conflict": {
-                "symfony/config": "<2.7"
+                "symfony/config": "<2.8"
             },
             "require-dev": {
                 "doctrine/annotations": "~1.0",
                 "doctrine/common": "~2.2",
                 "psr/log": "~1.0",
-                "symfony/config": "~2.7|~3.0.0",
-                "symfony/expression-language": "~2.4|~3.0.0",
-                "symfony/http-foundation": "~2.3|~3.0.0",
-                "symfony/yaml": "^2.0.5|~3.0.0"
+                "symfony/config": "~2.8|~3.0",
+                "symfony/expression-language": "~2.8|~3.0",
+                "symfony/http-foundation": "~2.8|~3.0",
+                "symfony/yaml": "~2.8|~3.0"
             },
             "suggest": {
                 "doctrine/annotations": "For using the annotation loader",
@@ -5521,7 +5318,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.8-dev"
+                    "dev-master": "3.2-dev"
                 }
             },
             "autoload": {
@@ -5554,44 +5351,55 @@
                 "uri",
                 "url"
             ],
-            "time": "2017-06-20T23:27:56+00:00"
+            "time": "2017-06-23T06:35:45+00:00"
         },
         {
             "name": "symfony/serializer",
-            "version": "v2.8.27",
+            "version": "v3.2.13",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/serializer.git",
-                "reference": "ff6bd03c458a6007b05a2c4c4199cbc3417bf074"
+                "reference": "dc98d5ab4ae29dc47bfb1507b39806bfe13d3477"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/serializer/zipball/ff6bd03c458a6007b05a2c4c4199cbc3417bf074",
-                "reference": "ff6bd03c458a6007b05a2c4c4199cbc3417bf074",
+                "url": "https://api.github.com/repos/symfony/serializer/zipball/dc98d5ab4ae29dc47bfb1507b39806bfe13d3477",
+                "reference": "dc98d5ab4ae29dc47bfb1507b39806bfe13d3477",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.9",
-                "symfony/polyfill-php55": "~1.0"
+                "php": ">=5.5.9"
+            },
+            "conflict": {
+                "symfony/property-access": ">=3.0,<3.0.4|>=2.8,<2.8.4",
+                "symfony/property-info": "<3.1",
+                "symfony/yaml": "<3.1"
             },
             "require-dev": {
                 "doctrine/annotations": "~1.0",
                 "doctrine/cache": "~1.0",
-                "symfony/config": "~2.2|~3.0.0",
-                "symfony/property-access": "~2.3|~3.0.0",
-                "symfony/yaml": "^2.0.5|~3.0.0"
+                "phpdocumentor/reflection-docblock": "~3.0",
+                "symfony/cache": "~3.1",
+                "symfony/config": "~2.8|~3.0",
+                "symfony/http-foundation": "~2.8|~3.0",
+                "symfony/property-access": "~2.8|~3.0",
+                "symfony/property-info": "~3.1",
+                "symfony/yaml": "~3.1"
             },
             "suggest": {
                 "doctrine/annotations": "For using the annotation mapping. You will also need doctrine/cache.",
                 "doctrine/cache": "For using the default cached annotation reader and metadata cache.",
+                "psr/cache-implementation": "For using the metadata cache.",
                 "symfony/config": "For using the XML mapping loader.",
+                "symfony/http-foundation": "To use the DataUriNormalizer.",
                 "symfony/property-access": "For using the ObjectNormalizer.",
+                "symfony/property-info": "To deserialize relations.",
                 "symfony/yaml": "For using the default YAML mapping loader."
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.8-dev"
+                    "dev-master": "3.2-dev"
                 }
             },
             "autoload": {
@@ -5618,34 +5426,34 @@
             ],
             "description": "Symfony Serializer Component",
             "homepage": "https://symfony.com",
-            "time": "2017-07-03T14:09:54+00:00"
+            "time": "2017-07-06T07:39:51+00:00"
         },
         {
             "name": "symfony/translation",
-            "version": "v2.8.27",
+            "version": "v3.2.13",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/translation.git",
-                "reference": "a89af885b8c6d0142c79a02ca9cc059ed25d40d8"
+                "reference": "df36a48672b929bf3995eb62c58d83004b1d0d50"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/translation/zipball/a89af885b8c6d0142c79a02ca9cc059ed25d40d8",
-                "reference": "a89af885b8c6d0142c79a02ca9cc059ed25d40d8",
+                "url": "https://api.github.com/repos/symfony/translation/zipball/df36a48672b929bf3995eb62c58d83004b1d0d50",
+                "reference": "df36a48672b929bf3995eb62c58d83004b1d0d50",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.9",
+                "php": ">=5.5.9",
                 "symfony/polyfill-mbstring": "~1.0"
             },
             "conflict": {
-                "symfony/config": "<2.7"
+                "symfony/config": "<2.8"
             },
             "require-dev": {
                 "psr/log": "~1.0",
-                "symfony/config": "~2.8",
-                "symfony/intl": "~2.7.25|^2.8.18|~3.2.5",
-                "symfony/yaml": "~2.2|~3.0.0"
+                "symfony/config": "~2.8|~3.0",
+                "symfony/intl": "^2.8.18|^3.2.5",
+                "symfony/yaml": "~2.8|~3.0"
             },
             "suggest": {
                 "psr/log": "To use logging capability in translator",
@@ -5655,7 +5463,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.8-dev"
+                    "dev-master": "3.2-dev"
                 }
             },
             "autoload": {
@@ -5682,53 +5490,56 @@
             ],
             "description": "Symfony Translation Component",
             "homepage": "https://symfony.com",
-            "time": "2017-06-24T16:44:49+00:00"
+            "time": "2017-06-24T16:45:17+00:00"
         },
         {
             "name": "symfony/validator",
-            "version": "v2.8.27",
+            "version": "v3.2.13",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/validator.git",
-                "reference": "864ba6865e253a7ffc3db5629af676cfdc3bd104"
+                "reference": "39244fbf580e01acc3f5df01238a8f69b1b3e46f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/validator/zipball/864ba6865e253a7ffc3db5629af676cfdc3bd104",
-                "reference": "864ba6865e253a7ffc3db5629af676cfdc3bd104",
+                "url": "https://api.github.com/repos/symfony/validator/zipball/39244fbf580e01acc3f5df01238a8f69b1b3e46f",
+                "reference": "39244fbf580e01acc3f5df01238a8f69b1b3e46f",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.9",
+                "php": ">=5.5.9",
                 "symfony/polyfill-mbstring": "~1.0",
-                "symfony/translation": "~2.4|~3.0.0"
+                "symfony/translation": "~2.8|~3.0"
+            },
+            "conflict": {
+                "phpunit/phpunit": "<4.8.35|<5.4.3,>=5.0"
             },
             "require-dev": {
                 "doctrine/annotations": "~1.0",
                 "doctrine/cache": "~1.0",
-                "egulias/email-validator": "^1.2.1",
-                "symfony/config": "~2.2|~3.0.0",
-                "symfony/expression-language": "~2.4|~3.0.0",
-                "symfony/http-foundation": "~2.3|~3.0.0",
-                "symfony/intl": "~2.7.25|^2.8.18|~3.2.5",
-                "symfony/property-access": "~2.3|~3.0.0",
-                "symfony/yaml": "^2.0.5|~3.0.0"
+                "egulias/email-validator": "^1.2.8|~2.0",
+                "symfony/cache": "~3.1",
+                "symfony/config": "~2.8|~3.0",
+                "symfony/expression-language": "~2.8|~3.0",
+                "symfony/http-foundation": "~2.8|~3.0",
+                "symfony/intl": "^2.8.18|^3.2.5",
+                "symfony/yaml": "~2.8|~3.0"
             },
             "suggest": {
                 "doctrine/annotations": "For using the annotation mapping. You will also need doctrine/cache.",
                 "doctrine/cache": "For using the default cached annotation reader and metadata cache.",
                 "egulias/email-validator": "Strict (RFC compliant) email validation",
+                "psr/cache-implementation": "For using the metadata cache.",
                 "symfony/config": "",
-                "symfony/expression-language": "For using the 2.4 Expression validator",
+                "symfony/expression-language": "For using the Expression validator",
                 "symfony/http-foundation": "",
                 "symfony/intl": "",
-                "symfony/property-access": "For using the 2.4 Validator API",
                 "symfony/yaml": ""
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.8-dev"
+                    "dev-master": "3.2-dev"
                 }
             },
             "autoload": {
@@ -5755,29 +5566,35 @@
             ],
             "description": "Symfony Validator Component",
             "homepage": "https://symfony.com",
-            "time": "2017-08-27T14:29:03+00:00"
+            "time": "2017-07-26T06:34:07+00:00"
         },
         {
             "name": "symfony/yaml",
-            "version": "v2.8.27",
+            "version": "v3.2.13",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/yaml.git",
-                "reference": "4c29dec8d489c4e37cf87ccd7166cd0b0e6a45c5"
+                "reference": "78a0c5d7d43713212aac73d7c6a56754a5c26cea"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/yaml/zipball/4c29dec8d489c4e37cf87ccd7166cd0b0e6a45c5",
-                "reference": "4c29dec8d489c4e37cf87ccd7166cd0b0e6a45c5",
+                "url": "https://api.github.com/repos/symfony/yaml/zipball/78a0c5d7d43713212aac73d7c6a56754a5c26cea",
+                "reference": "78a0c5d7d43713212aac73d7c6a56754a5c26cea",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.9"
+                "php": ">=5.5.9"
+            },
+            "require-dev": {
+                "symfony/console": "~2.8|~3.0"
+            },
+            "suggest": {
+                "symfony/console": "For validating YAML files using the lint command"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.8-dev"
+                    "dev-master": "3.2-dev"
                 }
             },
             "autoload": {
@@ -5804,20 +5621,20 @@
             ],
             "description": "Symfony Yaml Component",
             "homepage": "https://symfony.com",
-            "time": "2017-06-01T20:52:29+00:00"
+            "time": "2017-06-02T09:43:35+00:00"
         },
         {
             "name": "twig/twig",
-            "version": "v1.34.4",
+            "version": "v1.35.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/twigphp/Twig.git",
-                "reference": "f878bab48edb66ad9c6ed626bf817f60c6c096ee"
+                "reference": "daa657073e55b0a78cce8fdd22682fddecc6385f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/twigphp/Twig/zipball/f878bab48edb66ad9c6ed626bf817f60c6c096ee",
-                "reference": "f878bab48edb66ad9c6ed626bf817f60c6c096ee",
+                "url": "https://api.github.com/repos/twigphp/Twig/zipball/daa657073e55b0a78cce8fdd22682fddecc6385f",
+                "reference": "daa657073e55b0a78cce8fdd22682fddecc6385f",
                 "shasum": ""
             },
             "require": {
@@ -5831,7 +5648,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.34-dev"
+                    "dev-master": "1.35-dev"
                 }
             },
             "autoload": {
@@ -5869,7 +5686,7 @@
             "keywords": [
                 "templating"
             ],
-            "time": "2017-07-04T13:19:31+00:00"
+            "time": "2017-09-27T18:06:46+00:00"
         },
         {
             "name": "zendframework/zend-diactoros",
@@ -6852,16 +6669,16 @@
         },
         {
             "name": "consolidation/annotated-command",
-            "version": "2.6.1",
+            "version": "dev-master",
             "source": {
                 "type": "git",
                 "url": "https://github.com/consolidation/annotated-command.git",
-                "reference": "7a634471471b913e63888b64b626b544799db282"
+                "reference": "f7c6143807d365646e3753f29d96a2cb1b956cdc"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/consolidation/annotated-command/zipball/7a634471471b913e63888b64b626b544799db282",
-                "reference": "7a634471471b913e63888b64b626b544799db282",
+                "url": "https://api.github.com/repos/consolidation/annotated-command/zipball/f7c6143807d365646e3753f29d96a2cb1b956cdc",
+                "reference": "f7c6143807d365646e3753f29d96a2cb1b956cdc",
                 "shasum": ""
             },
             "require": {
@@ -6900,11 +6717,11 @@
                 }
             ],
             "description": "Initialize Symfony Console commands from annotated command class methods.",
-            "time": "2017-09-18T21:45:28+00:00"
+            "time": "2017-10-03T21:30:44+00:00"
         },
         {
             "name": "consolidation/config",
-            "version": "1.0.2",
+            "version": "dev-master",
             "source": {
                 "type": "git",
                 "url": "https://github.com/consolidation/config.git",
@@ -7049,16 +6866,16 @@
         },
         {
             "name": "consolidation/robo",
-            "version": "1.1.2",
+            "version": "1.1.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/consolidation/Robo.git",
-                "reference": "46340c0ba2477e6f30a22ebaa072da0ba2b15bb1"
+                "reference": "21370cc6fea83729ab6d903f8f382389b14ae90c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/consolidation/Robo/zipball/46340c0ba2477e6f30a22ebaa072da0ba2b15bb1",
-                "reference": "46340c0ba2477e6f30a22ebaa072da0ba2b15bb1",
+                "url": "https://api.github.com/repos/consolidation/Robo/zipball/21370cc6fea83729ab6d903f8f382389b14ae90c",
+                "reference": "21370cc6fea83729ab6d903f8f382389b14ae90c",
                 "shasum": ""
             },
             "require": {
@@ -7124,7 +6941,7 @@
                 }
             ],
             "description": "Modern task runner",
-            "time": "2017-07-28T21:29:52+00:00"
+            "time": "2017-09-23T15:53:19+00:00"
         },
         {
             "name": "container-interop/container-interop",
@@ -7948,24 +7765,26 @@
         },
         {
             "name": "drush/drush",
-            "version": "9.0.0-beta4",
+            "version": "9.0.0-beta5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/drush-ops/drush.git",
-                "reference": "69db709a4809a5ac55438c6164dfd07bb8113e97"
+                "reference": "fc3ec716f60eb00790984315161198adca7960b2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/drush-ops/drush/zipball/69db709a4809a5ac55438c6164dfd07bb8113e97",
-                "reference": "69db709a4809a5ac55438c6164dfd07bb8113e97",
+                "url": "https://api.github.com/repos/drush-ops/drush/zipball/fc3ec716f60eb00790984315161198adca7960b2",
+                "reference": "fc3ec716f60eb00790984315161198adca7960b2",
                 "shasum": ""
             },
             "require": {
                 "chi-teck/drupal-code-generator": "^1.17.3",
-                "consolidation/annotated-command": "^2.4.10",
+                "consolidation/annotated-command": "dev-master as 2.7.0",
+                "consolidation/config": "dev-master",
                 "consolidation/output-formatters": "^3.1.11",
-                "consolidation/robo": "~1",
+                "consolidation/robo": "^1.1.2",
                 "ext-dom": "*",
+                "grasmash/yaml-expander": "^1.1.1",
                 "league/container": "~2",
                 "pear/console_table": "~1.3.0",
                 "php": ">=5.6.0",
@@ -8043,7 +7862,7 @@
             ],
             "description": "Drush is a command line shell and scripting interface for Drupal, a veritable Swiss Army knife designed to make life easier for those of us who spend some of our working hours hacking away at the command prompt.",
             "homepage": "http://www.drush.org",
-            "time": "2017-08-26T18:11:03+00:00"
+            "time": "2017-10-04T03:14:47+00:00"
         },
         {
             "name": "fabpot/goutte",
@@ -8184,16 +8003,16 @@
         },
         {
             "name": "grasmash/yaml-expander",
-            "version": "1.1.1",
+            "version": "1.2.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/grasmash/yaml-expander.git",
-                "reference": "720c54b2c99b80d5d696714b6826183d34edce93"
+                "reference": "9ec59ccc7a630eb2637639e8214e70d27675456b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/grasmash/yaml-expander/zipball/720c54b2c99b80d5d696714b6826183d34edce93",
-                "reference": "720c54b2c99b80d5d696714b6826183d34edce93",
+                "url": "https://api.github.com/repos/grasmash/yaml-expander/zipball/9ec59ccc7a630eb2637639e8214e70d27675456b",
+                "reference": "9ec59ccc7a630eb2637639e8214e70d27675456b",
                 "shasum": ""
             },
             "require": {
@@ -8227,7 +8046,7 @@
                 }
             ],
             "description": "Expands internal property references in a yaml file.",
-            "time": "2017-08-01T16:15:05+00:00"
+            "time": "2017-09-26T16:57:45+00:00"
         },
         {
             "name": "instaclick/php-webdriver",
@@ -8533,16 +8352,16 @@
         },
         {
             "name": "justinrainbow/json-schema",
-            "version": "5.2.1",
+            "version": "5.2.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/justinrainbow/json-schema.git",
-                "reference": "429be236f296ca249d61c65649cdf2652f4a5e80"
+                "reference": "b80053b620826810b38211b3c5f935ba9cddf6b3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/justinrainbow/json-schema/zipball/429be236f296ca249d61c65649cdf2652f4a5e80",
-                "reference": "429be236f296ca249d61c65649cdf2652f4a5e80",
+                "url": "https://api.github.com/repos/justinrainbow/json-schema/zipball/b80053b620826810b38211b3c5f935ba9cddf6b3",
+                "reference": "b80053b620826810b38211b3c5f935ba9cddf6b3",
                 "shasum": ""
             },
             "require": {
@@ -8551,7 +8370,6 @@
             "require-dev": {
                 "friendsofphp/php-cs-fixer": "^2.1",
                 "json-schema/json-schema-test-suite": "1.2.0",
-                "phpdocumentor/phpdocumentor": "^2.7",
                 "phpunit/phpunit": "^4.8.22"
             },
             "bin": [
@@ -8596,7 +8414,7 @@
                 "json",
                 "schema"
             ],
-            "time": "2017-05-16T21:06:09+00:00"
+            "time": "2017-10-03T00:49:49+00:00"
         },
         {
             "name": "league/container",
@@ -8817,24 +8635,24 @@
         },
         {
             "name": "phing/phing",
-            "version": "2.15.2",
+            "version": "2.16.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phingofficial/phing.git",
-                "reference": "0999ab4e94e609dc00998e3d1b88df843054db7c"
+                "reference": "151a0f4d8cebf7711eccc62dde3f09bc36a00d7b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phingofficial/phing/zipball/0999ab4e94e609dc00998e3d1b88df843054db7c",
-                "reference": "0999ab4e94e609dc00998e3d1b88df843054db7c",
+                "url": "https://api.github.com/repos/phingofficial/phing/zipball/151a0f4d8cebf7711eccc62dde3f09bc36a00d7b",
+                "reference": "151a0f4d8cebf7711eccc62dde3f09bc36a00d7b",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.2.0"
+                "php": ">=5.2.0",
+                "symfony/yaml": "^3.1"
             },
             "require-dev": {
                 "ext-pdo_sqlite": "*",
-                "lastcraft/simpletest": "@dev",
                 "mikey179/vfsstream": "^1.6",
                 "pdepend/pdepend": "2.x",
                 "pear/archive_tar": "1.4.x",
@@ -8850,8 +8668,8 @@
                 "sebastian/git": "~1.0",
                 "sebastian/phpcpd": "2.x",
                 "siad007/versioncontrol_hg": "^1.0",
-                "squizlabs/php_codesniffer": "~2.2",
-                "symfony/yaml": "~2.7"
+                "simpletest/simpletest": "^1.1",
+                "squizlabs/php_codesniffer": "~2.2"
             },
             "suggest": {
                 "pdepend/pdepend": "PHP version of JDepend",
@@ -8873,7 +8691,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.15.x-dev"
+                    "dev-master": "2.16.x-dev"
                 }
             },
             "autoload": {
@@ -8906,7 +8724,7 @@
                 "task",
                 "tool"
             ],
-            "time": "2016-10-13T09:01:45+00:00"
+            "time": "2016-12-22T20:16:33+00:00"
         },
         {
             "name": "phpdocumentor/reflection-docblock",
@@ -10727,6 +10545,59 @@
             "homepage": "https://symfony.com",
             "time": "2017-07-29T21:54:42+00:00"
         },
+        {
+            "name": "symfony/polyfill-apcu",
+            "version": "v1.5.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/polyfill-apcu.git",
+                "reference": "cec32398a973a9bfe9d2f94f4b5d5e186b40b698"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/polyfill-apcu/zipball/cec32398a973a9bfe9d2f94f4b5d5e186b40b698",
+                "reference": "cec32398a973a9bfe9d2f94f4b5d5e186b40b698",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.5-dev"
+                }
+            },
+            "autoload": {
+                "files": [
+                    "bootstrap.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony polyfill backporting apcu_* functions to lower PHP versions",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "apcu",
+                "compatibility",
+                "polyfill",
+                "portable",
+                "shim"
+            ],
+            "time": "2017-07-05T15:09:33+00:00"
+        },
         {
             "name": "symfony/var-dumper",
             "version": "v3.3.9",
diff --git a/drupal-org-core.make b/drupal-org-core.make
index c900b8653..161b3177e 100644
--- a/drupal-org-core.make
+++ b/drupal-org-core.make
@@ -1,11 +1,9 @@
 core = 8.x
 api = 2
 projects[drupal][type] = core
-projects[drupal][patch][] = https://www.drupal.org/files/issues/2652138-41.patch
 projects[drupal][patch][] = https://www.drupal.org/files/issues/1356276-360.patch
 projects[drupal][patch][] = https://www.drupal.org/files/issues/2880374-remove-experimental-warnings-6.patch
 projects[drupal][patch][] = https://www.drupal.org/files/issues/2880445-remove-config-write-warning-2.patch
 projects[drupal][patch][] = https://www.drupal.org/files/issues/2869592-remove-update-warning-7.patch
 projects[drupal][patch][] = https://www.drupal.org/files/issues/2885441-2.patch
-projects[drupal][patch][] = https://www.drupal.org/files/issues/2904798-7.patch
-projects[drupal][version] = 8.3.7
\ No newline at end of file
+projects[drupal][version] = 8.4.0
\ No newline at end of file
diff --git a/drupal-org.make b/drupal-org.make
index f4cf39d78..377e2d2ad 100644
--- a/drupal-org.make
+++ b/drupal-org.make
@@ -52,7 +52,7 @@ projects[media_entity_instagram][version] = 1.4
 projects[media_entity_twitter][type] = module
 projects[media_entity_twitter][version] = 1.3
 projects[metatag][type] = module
-projects[metatag][version] = 1.2
+projects[metatag][version] = 1.3
 projects[openapi][type] = module
 projects[openapi][version] = 1.0-alpha1
 projects[panelizer][type] = module
@@ -62,6 +62,7 @@ projects[panels][type] = module
 projects[panels][patch][] = https://www.drupal.org/files/issues/panels-ipe-2878684-3.patch
 projects[panels][patch][] = https://www.drupal.org/files/issues/panels-ipe-propogate-errors-2825034-5.patch
 projects[panels][patch][] = https://www.drupal.org/files/issues/2908897-2.patch
+projects[panels][patch][] = https://www.drupal.org/files/issues/2913353-2.patch
 projects[panels][version] = 4.2
 projects[pathauto][type] = module
 projects[pathauto][version] = 1.0
@@ -72,7 +73,7 @@ projects[schemata][version] = 1.0-alpha2
 projects[search_api][type] = module
 projects[search_api][version] = 1.4
 projects[simple_oauth][type] = module
-projects[simple_oauth][version] = 3.0-beta1
+projects[simple_oauth][version] = 3.0
 projects[token][type] = module
 projects[token][version] = 1.0
 projects[video_embed_field][type] = module
diff --git a/lightning.info.yml b/lightning.info.yml
index 483f709b9..e972e06b8 100644
--- a/lightning.info.yml
+++ b/lightning.info.yml
@@ -2,7 +2,7 @@ name: Lightning
 core: 8.x
 type: profile
 description: 'A fast and feature-rich Drupal distribution.'
-version: '8.x-2.20-dev'
+version: '8.x-2.20'
 distribution:
   name: Lightning
 dependencies:
diff --git a/modules/lightning_features/lightning_api/lightning_api.info.yml b/modules/lightning_features/lightning_api/lightning_api.info.yml
index 2776c6cc1..cd639fa6c 100644
--- a/modules/lightning_features/lightning_api/lightning_api.info.yml
+++ b/modules/lightning_features/lightning_api/lightning_api.info.yml
@@ -3,7 +3,7 @@ core: 8.x
 type: module
 package: Lightning
 description: 'Progressive decoupling? No problem.'
-version: '8.x-2.20-dev'
+version: '8.x-2.20'
 dependencies:
   - jsonapi
   - openapi_redoc
diff --git a/modules/lightning_features/lightning_api/modules/api_test/api_test.info.yml b/modules/lightning_features/lightning_api/modules/api_test/api_test.info.yml
index 3db9ecca2..2c6e0ab9c 100644
--- a/modules/lightning_features/lightning_api/modules/api_test/api_test.info.yml
+++ b/modules/lightning_features/lightning_api/modules/api_test/api_test.info.yml
@@ -5,4 +5,4 @@ description: 'Contains configuration and support code for testing Headless Light
 hidden: true
 dependencies:
   - lightning_api
-version: '8.x-2.20-dev'
+version: '8.x-2.20'
diff --git a/modules/lightning_features/lightning_core/lightning_core.info.yml b/modules/lightning_features/lightning_core/lightning_core.info.yml
index 5d9fff028..7986eeafe 100644
--- a/modules/lightning_features/lightning_core/lightning_core.info.yml
+++ b/modules/lightning_features/lightning_core/lightning_core.info.yml
@@ -3,7 +3,7 @@ core: 8.x
 type: module
 package: Lightning
 description: 'Shared functionality for the Lightning distribution.'
-version: '8.x-2.20-dev'
+version: '8.x-2.20'
 dependencies:
   - node
   - path
diff --git a/modules/lightning_features/lightning_core/modules/lightning_contact_form/lightning_contact_form.info.yml b/modules/lightning_features/lightning_core/modules/lightning_contact_form/lightning_contact_form.info.yml
index 6c1f68556..a5264eff1 100644
--- a/modules/lightning_features/lightning_core/modules/lightning_contact_form/lightning_contact_form.info.yml
+++ b/modules/lightning_features/lightning_core/modules/lightning_contact_form/lightning_contact_form.info.yml
@@ -3,6 +3,6 @@ core: 8.x
 type: module
 package: Lightning
 description: 'Provides a site-wide contact form with basic default configuration.'
-version: '8.x-2.20-dev'
+version: '8.x-2.20'
 dependencies:
   - contact_storage
diff --git a/modules/lightning_features/lightning_core/modules/lightning_dev/lightning_dev.info.yml b/modules/lightning_features/lightning_core/modules/lightning_dev/lightning_dev.info.yml
index dbb383aed..11fcf48cf 100644
--- a/modules/lightning_features/lightning_core/modules/lightning_dev/lightning_dev.info.yml
+++ b/modules/lightning_features/lightning_core/modules/lightning_dev/lightning_dev.info.yml
@@ -3,7 +3,7 @@ core: 8.x
 type: module
 package: Lightning
 description: 'Development tools for working on the Lightning distribution itself.'
-version: '8.x-2.20-dev'
+version: '8.x-2.20'
 hidden: true
 dependencies:
   - devel_generate
diff --git a/modules/lightning_features/lightning_core/modules/lightning_page/config/install/core.entity_form_display.node.page.default.yml b/modules/lightning_features/lightning_core/modules/lightning_page/config/install/core.entity_form_display.node.page.default.yml
index ba87752ad..2040b19de 100644
--- a/modules/lightning_features/lightning_core/modules/lightning_page/config/install/core.entity_form_display.node.page.default.yml
+++ b/modules/lightning_features/lightning_core/modules/lightning_page/config/install/core.entity_form_display.node.page.default.yml
@@ -64,6 +64,13 @@ content:
       placeholder: ''
     third_party_settings: {  }
     region: content
+  status:
+    type: boolean_checkbox
+    settings:
+      display_label: true
+    weight: 120
+    region: content
+    third_party_settings: {  }
   scheduled_update:
     type: inline_entity_form_complex
     weight: 8
diff --git a/modules/lightning_features/lightning_core/modules/lightning_page/lightning_page.info.yml b/modules/lightning_features/lightning_core/modules/lightning_page/lightning_page.info.yml
index 19b043c4a..a1b7ecefe 100644
--- a/modules/lightning_features/lightning_core/modules/lightning_page/lightning_page.info.yml
+++ b/modules/lightning_features/lightning_core/modules/lightning_page/lightning_page.info.yml
@@ -3,6 +3,6 @@ package: Lightning
 core: 8.x
 type: module
 description: 'Provides a "Basic Page" content type that is, indeed, very basic.'
-version: '8.x-2.20-dev'
+version: '8.x-2.20'
 dependencies:
   - lightning_core
diff --git a/modules/lightning_features/lightning_core/modules/lightning_roles/lightning_roles.info.yml b/modules/lightning_features/lightning_core/modules/lightning_roles/lightning_roles.info.yml
index 54cc8afc1..ba20c0fbf 100644
--- a/modules/lightning_features/lightning_core/modules/lightning_roles/lightning_roles.info.yml
+++ b/modules/lightning_features/lightning_core/modules/lightning_roles/lightning_roles.info.yml
@@ -3,4 +3,4 @@ core: 8.x
 type: module
 package: Lightning
 description: 'Automatically manages user roles and permissions.'
-version: '8.x-2.20-dev'
+version: '8.x-2.20'
diff --git a/modules/lightning_features/lightning_core/modules/lightning_search/lightning_search.info.yml b/modules/lightning_features/lightning_core/modules/lightning_search/lightning_search.info.yml
index 564e822d0..004b6907a 100644
--- a/modules/lightning_features/lightning_core/modules/lightning_search/lightning_search.info.yml
+++ b/modules/lightning_features/lightning_core/modules/lightning_search/lightning_search.info.yml
@@ -3,7 +3,7 @@ core: 8.x
 type: module
 package: Lightning
 description: 'A basic but powerful set of default configuration for searching your site.'
-version: '8.x-2.20-dev'
+version: '8.x-2.20'
 dependencies:
   - lightning_core
   - search_api
diff --git a/modules/lightning_features/lightning_core/modules/lightning_test/lightning_test.info.yml b/modules/lightning_features/lightning_core/modules/lightning_test/lightning_test.info.yml
index 7a550bde9..951798699 100644
--- a/modules/lightning_features/lightning_core/modules/lightning_test/lightning_test.info.yml
+++ b/modules/lightning_features/lightning_core/modules/lightning_test/lightning_test.info.yml
@@ -3,5 +3,5 @@ core: 8.x
 type: module
 description: 'Contains configuration and support code for running Lightning functional tests.'
 package: Lightning
-version: '8.x-2.20-dev'
+version: '8.x-2.20'
 hidden: true
diff --git a/modules/lightning_features/lightning_core/src/Entity/EntityViewMode.php b/modules/lightning_features/lightning_core/src/Entity/EntityViewMode.php
index d81ab548a..de18397e0 100644
--- a/modules/lightning_features/lightning_core/src/Entity/EntityViewMode.php
+++ b/modules/lightning_features/lightning_core/src/Entity/EntityViewMode.php
@@ -13,4 +13,20 @@ class EntityViewMode extends BaseEntityViewMode implements EntityDescriptionInte
 
   use ConfigEntityDescriptionTrait;
 
+  /**
+   * {@inheritdoc}
+   *
+   * This should be removed before Lightning 2.2.0. See
+   * https://www.drupal.org/node/2907654
+   */
+  protected function urlRouteParameters($rel) {
+    $parameters = parent::urlRouteParameters($rel);
+
+    if (empty($parameters['entity_type_id'])) {
+      $parameters['entity_type_id'] = $this->getTargetType();
+    }
+
+    return $parameters;
+  }
+
 }
diff --git a/modules/lightning_features/lightning_layout/lightning_layout.info.yml b/modules/lightning_features/lightning_layout/lightning_layout.info.yml
index 6489c49c9..9a6cca927 100644
--- a/modules/lightning_features/lightning_layout/lightning_layout.info.yml
+++ b/modules/lightning_features/lightning_layout/lightning_layout.info.yml
@@ -2,7 +2,7 @@ name: 'Lightning Layout'
 core: 8.x
 type: module
 description: 'Provides the tools to take control of your layout.'
-version: '8.x-2.20-dev'
+version: '8.x-2.20'
 package: Lightning
 dependencies:
   - lightning_core
diff --git a/modules/lightning_features/lightning_layout/lightning_layout.module b/modules/lightning_features/lightning_layout/lightning_layout.module
index 52af00c60..140143e8c 100644
--- a/modules/lightning_features/lightning_layout/lightning_layout.module
+++ b/modules/lightning_features/lightning_layout/lightning_layout.module
@@ -8,6 +8,7 @@
 use Drupal\Core\Entity\Entity\EntityViewMode;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Url;
+use Drupal\block_content\BlockContentInterface;
 use Drupal\lightning_core\ConfigHelper as Config;
 use Drupal\lightning_core\Element;
 use Drupal\lightning_core\OverrideHelper as Override;
@@ -50,6 +51,13 @@ function lightning_layout_user_role_insert(RoleInterface $role) {
   }
 }
 
+/**
+ * Implements hook_block_content_delete().
+ */
+function lightning_layout_block_content_delete(BlockContentInterface $block_content) {
+  \Drupal::service('block_content.uuid_lookup')->delete($block_content->uuid());
+}
+
 /**
  * Implements hook_block_alter().
  */
diff --git a/modules/lightning_features/lightning_layout/modules/lightning_landing_page/config/install/core.entity_form_display.node.landing_page.default.yml b/modules/lightning_features/lightning_layout/modules/lightning_landing_page/config/install/core.entity_form_display.node.landing_page.default.yml
index 7b0587ccb..5c258078c 100644
--- a/modules/lightning_features/lightning_layout/modules/lightning_landing_page/config/install/core.entity_form_display.node.landing_page.default.yml
+++ b/modules/lightning_features/lightning_layout/modules/lightning_landing_page/config/install/core.entity_form_display.node.landing_page.default.yml
@@ -58,6 +58,13 @@ content:
       placeholder: ''
     third_party_settings: {  }
     region: content
+  status:
+    type: boolean_checkbox
+    settings:
+      display_label: true
+    weight: 120
+    region: content
+    third_party_settings: {  }
 hidden:
   promote: true
   sticky: true
diff --git a/modules/lightning_features/lightning_layout/modules/lightning_landing_page/lightning_landing_page.info.yml b/modules/lightning_features/lightning_layout/modules/lightning_landing_page/lightning_landing_page.info.yml
index f1da7bb4b..ccb6d8fb1 100644
--- a/modules/lightning_features/lightning_layout/modules/lightning_landing_page/lightning_landing_page.info.yml
+++ b/modules/lightning_features/lightning_layout/modules/lightning_landing_page/lightning_landing_page.info.yml
@@ -3,6 +3,6 @@ package: Lightning
 core: 8.x
 type: module
 description: 'Provides a content type which allows you to build free-form one-off landing pages.'
-version: '8.x-2.20-dev'
+version: '8.x-2.20'
 dependencies:
   - lightning_layout
diff --git a/modules/lightning_features/lightning_media/lightning_media.info.yml b/modules/lightning_features/lightning_media/lightning_media.info.yml
index 4bc0017fb..c7ea04992 100644
--- a/modules/lightning_features/lightning_media/lightning_media.info.yml
+++ b/modules/lightning_features/lightning_media/lightning_media.info.yml
@@ -2,7 +2,7 @@ name: 'Lightning Media'
 core: 8.x
 type: module
 description: 'Slick media handling for Lightning. So cool you''ll make the A/C jealous.'
-version: '8.x-2.20-dev'
+version: '8.x-2.20'
 package: Lightning
 dependencies:
   - ckeditor
diff --git a/modules/lightning_features/lightning_media/lightning_media.module b/modules/lightning_features/lightning_media/lightning_media.module
index 085f8fdce..b60c4e55b 100644
--- a/modules/lightning_features/lightning_media/lightning_media.module
+++ b/modules/lightning_features/lightning_media/lightning_media.module
@@ -404,6 +404,17 @@ function lightning_media_ajax_render_alter(array &$data) {
   }
 }
 
+/**
+ * Implements hook_library_info_alter().
+ *
+ * This should be removed once Lightning uses the core Media module.
+ */
+function lightning_media_library_info_alter(array &$libraries, $extension) {
+  if ($extension == 'seven' && !\Drupal::moduleHandler()->moduleExists('media')) {
+    unset($libraries['media-form']);
+  }
+}
+
 /**
  * Preprocess function for grid views of the media library.
  *
diff --git a/modules/lightning_features/lightning_media/modules/lightning_media_bulk_upload/lightning_media_bulk_upload.info.yml b/modules/lightning_features/lightning_media/modules/lightning_media_bulk_upload/lightning_media_bulk_upload.info.yml
index 6319f959f..dc463c9d5 100644
--- a/modules/lightning_features/lightning_media/modules/lightning_media_bulk_upload/lightning_media_bulk_upload.info.yml
+++ b/modules/lightning_features/lightning_media/modules/lightning_media_bulk_upload/lightning_media_bulk_upload.info.yml
@@ -2,7 +2,7 @@ name: 'Bulk Media Upload'
 core: 8.x
 type: module
 description: 'Provides a form to upload many media items at once.'
-version: '8.x-2.20-dev'
+version: '8.x-2.20'
 package: Lightning
 dependencies:
   - dropzonejs
diff --git a/modules/lightning_features/lightning_media/modules/lightning_media_document/lightning_media_document.info.yml b/modules/lightning_features/lightning_media/modules/lightning_media_document/lightning_media_document.info.yml
index 2b00027e6..76b1c5079 100644
--- a/modules/lightning_features/lightning_media/modules/lightning_media_document/lightning_media_document.info.yml
+++ b/modules/lightning_features/lightning_media/modules/lightning_media_document/lightning_media_document.info.yml
@@ -2,7 +2,7 @@ name: 'Media Document'
 core: 8.x
 type: module
 description: 'Locally hosted document support for Lightning Media.'
-version: '8.x-2.20-dev'
+version: '8.x-2.20'
 package: Lightning
 dependencies:
   - file
diff --git a/modules/lightning_features/lightning_media/modules/lightning_media_image/lightning_media_image.info.yml b/modules/lightning_features/lightning_media/modules/lightning_media_image/lightning_media_image.info.yml
index 9f546bffd..8c3f9def7 100644
--- a/modules/lightning_features/lightning_media/modules/lightning_media_image/lightning_media_image.info.yml
+++ b/modules/lightning_features/lightning_media/modules/lightning_media_image/lightning_media_image.info.yml
@@ -3,7 +3,7 @@ core: 8.x
 type: module
 package: Lightning
 description: 'Image support for Lightning Media.'
-version: '8.x-2.20-dev'
+version: '8.x-2.20'
 dependencies:
   - image
   - lightning_media
diff --git a/modules/lightning_features/lightning_media/modules/lightning_media_instagram/lightning_media_instagram.info.yml b/modules/lightning_features/lightning_media/modules/lightning_media_instagram/lightning_media_instagram.info.yml
index 0136c1e88..94d4545b5 100644
--- a/modules/lightning_features/lightning_media/modules/lightning_media_instagram/lightning_media_instagram.info.yml
+++ b/modules/lightning_features/lightning_media/modules/lightning_media_instagram/lightning_media_instagram.info.yml
@@ -2,7 +2,7 @@ name: 'Media Instagram'
 core: 8.x
 type: module
 description: 'Instagram support for Lightning Media.'
-version: '8.x-2.20-dev'
+version: '8.x-2.20'
 package: Lightning
 dependencies:
   - lightning_media
diff --git a/modules/lightning_features/lightning_media/modules/lightning_media_twitter/lightning_media_twitter.info.yml b/modules/lightning_features/lightning_media/modules/lightning_media_twitter/lightning_media_twitter.info.yml
index 2c2575627..fc9357e3f 100644
--- a/modules/lightning_features/lightning_media/modules/lightning_media_twitter/lightning_media_twitter.info.yml
+++ b/modules/lightning_features/lightning_media/modules/lightning_media_twitter/lightning_media_twitter.info.yml
@@ -3,7 +3,7 @@ core: 8.x
 type: module
 package: Lightning
 description: 'Twitter support for Lightning Media.'
-version: '8.x-2.20-dev'
+version: '8.x-2.20'
 dependencies:
   - lightning_media
   - media_entity_twitter
diff --git a/modules/lightning_features/lightning_media/modules/lightning_media_video/lightning_media_video.info.yml b/modules/lightning_features/lightning_media/modules/lightning_media_video/lightning_media_video.info.yml
index 6f17312a3..0ac08390f 100644
--- a/modules/lightning_features/lightning_media/modules/lightning_media_video/lightning_media_video.info.yml
+++ b/modules/lightning_features/lightning_media/modules/lightning_media_video/lightning_media_video.info.yml
@@ -3,7 +3,7 @@ core: 8.x
 type: module
 package: Lightning
 description: 'Video support for Lightning Media.'
-version: '8.x-2.20-dev'
+version: '8.x-2.20'
 dependencies:
   - lightning_media
   - video_embed_media
diff --git a/modules/lightning_features/lightning_workflow/lightning_workflow.info.yml b/modules/lightning_features/lightning_workflow/lightning_workflow.info.yml
index 6ccf335c2..5a23e9c78 100644
--- a/modules/lightning_features/lightning_workflow/lightning_workflow.info.yml
+++ b/modules/lightning_features/lightning_workflow/lightning_workflow.info.yml
@@ -2,7 +2,7 @@ name: 'Lightning Workflow'
 core: 8.x
 type: module
 description: 'Tools to improve your content workflow.'
-version: '8.x-2.20-dev'
+version: '8.x-2.20'
 package: Lightning
 dependencies:
   - lightning_core
diff --git a/modules/lightning_features/lightning_workflow/modules/lightning_scheduled_updates/lightning_scheduled_updates.info.yml b/modules/lightning_features/lightning_workflow/modules/lightning_scheduled_updates/lightning_scheduled_updates.info.yml
index f711a7fb9..fd6463761 100644
--- a/modules/lightning_features/lightning_workflow/modules/lightning_scheduled_updates/lightning_scheduled_updates.info.yml
+++ b/modules/lightning_features/lightning_workflow/modules/lightning_scheduled_updates/lightning_scheduled_updates.info.yml
@@ -2,7 +2,7 @@ name: 'Schedule Publication'
 core: 8.x
 type: module
 description: 'Allows authors to schedule publication of content.'
-version: '8.x-2.20-dev'
+version: '8.x-2.20'
 package: Lightning
 dependencies:
   - inline_entity_form
diff --git a/tests/config/core.entity_form_display.media.document.default.yml b/tests/config/core.entity_form_display.media.document.default.yml
index 27b75ad75..2155d39c3 100644
--- a/tests/config/core.entity_form_display.media.document.default.yml
+++ b/tests/config/core.entity_form_display.media.document.default.yml
@@ -7,6 +7,7 @@ dependencies:
     - media_entity.bundle.document
   module:
     - file
+    - path
     - workbench_moderation
 _core: {  }
 id: media.document.default
@@ -36,6 +37,12 @@ content:
       placeholder: ''
     third_party_settings: {  }
     region: content
+  path:
+    type: path
+    weight: 30
+    region: content
+    settings: {  }
+    third_party_settings: {  }
 hidden:
   created: true
   uid: true
diff --git a/tests/config/core.entity_form_display.media.document.media_browser.yml b/tests/config/core.entity_form_display.media.document.media_browser.yml
index 16a2a080b..da718accf 100644
--- a/tests/config/core.entity_form_display.media.document.media_browser.yml
+++ b/tests/config/core.entity_form_display.media.document.media_browser.yml
@@ -7,6 +7,7 @@ dependencies:
     - field.field.media.document.field_media_in_library
     - media_entity.bundle.document
   module:
+    - path
     - workbench_moderation
 _core: {  }
 id: media.document.media_browser
@@ -29,6 +30,12 @@ content:
       placeholder: ''
     third_party_settings: {  }
     region: content
+  path:
+    type: path
+    weight: 30
+    region: content
+    settings: {  }
+    third_party_settings: {  }
 hidden:
   created: true
   field_document: true
diff --git a/tests/config/core.entity_form_display.media.image.default.yml b/tests/config/core.entity_form_display.media.image.default.yml
index 8ba5f1401..56a7c3190 100644
--- a/tests/config/core.entity_form_display.media.image.default.yml
+++ b/tests/config/core.entity_form_display.media.image.default.yml
@@ -8,6 +8,7 @@ dependencies:
     - media_entity.bundle.image
   module:
     - image_widget_crop
+    - path
     - workbench_moderation
 _core: {  }
 id: media.image.default
@@ -44,6 +45,12 @@ content:
       placeholder: ''
     third_party_settings: {  }
     region: content
+  path:
+    type: path
+    weight: 30
+    region: content
+    settings: {  }
+    third_party_settings: {  }
 hidden:
   created: true
   uid: true
diff --git a/tests/config/core.entity_form_display.media.image.media_browser.yml b/tests/config/core.entity_form_display.media.image.media_browser.yml
index 80d36febe..d87ab6675 100644
--- a/tests/config/core.entity_form_display.media.image.media_browser.yml
+++ b/tests/config/core.entity_form_display.media.image.media_browser.yml
@@ -10,6 +10,7 @@ dependencies:
   module:
     - image_widget_crop
     - lightning_media
+    - path
     - workbench_moderation
 _core: {  }
 id: media.image.media_browser
@@ -49,6 +50,12 @@ content:
       placeholder: ''
     third_party_settings: {  }
     region: content
+  path:
+    type: path
+    weight: 30
+    region: content
+    settings: {  }
+    third_party_settings: {  }
 hidden:
   created: true
   uid: true
diff --git a/tests/config/core.entity_form_display.media.instagram.default.yml b/tests/config/core.entity_form_display.media.instagram.default.yml
index 0ddeefb66..0e82fe043 100644
--- a/tests/config/core.entity_form_display.media.instagram.default.yml
+++ b/tests/config/core.entity_form_display.media.instagram.default.yml
@@ -6,6 +6,7 @@ dependencies:
     - field.field.media.instagram.field_media_in_library
     - media_entity.bundle.instagram
   module:
+    - path
     - workbench_moderation
 _core: {  }
 id: media.instagram.default
@@ -36,6 +37,12 @@ content:
       placeholder: ''
     third_party_settings: {  }
     region: content
+  path:
+    type: path
+    weight: 30
+    region: content
+    settings: {  }
+    third_party_settings: {  }
   preview:
     weight: 0
     region: content
diff --git a/tests/config/core.entity_form_display.media.instagram.media_browser.yml b/tests/config/core.entity_form_display.media.instagram.media_browser.yml
index 350a815e4..05474736b 100644
--- a/tests/config/core.entity_form_display.media.instagram.media_browser.yml
+++ b/tests/config/core.entity_form_display.media.instagram.media_browser.yml
@@ -7,6 +7,7 @@ dependencies:
     - field.field.media.instagram.field_media_in_library
     - media_entity.bundle.instagram
   module:
+    - path
     - workbench_moderation
 _core: {  }
 id: media.instagram.media_browser
@@ -29,6 +30,12 @@ content:
       placeholder: ''
     third_party_settings: {  }
     region: content
+  path:
+    type: path
+    weight: 30
+    region: content
+    settings: {  }
+    third_party_settings: {  }
   preview:
     weight: null
     settings: {  }
diff --git a/tests/config/core.entity_form_display.media.tweet.default.yml b/tests/config/core.entity_form_display.media.tweet.default.yml
index 9cf4e5ac3..4f54da8cc 100644
--- a/tests/config/core.entity_form_display.media.tweet.default.yml
+++ b/tests/config/core.entity_form_display.media.tweet.default.yml
@@ -6,6 +6,7 @@ dependencies:
     - field.field.media.tweet.field_media_in_library
     - media_entity.bundle.tweet
   module:
+    - path
     - workbench_moderation
 _core: {  }
 id: media.tweet.default
@@ -36,6 +37,12 @@ content:
       placeholder: ''
     third_party_settings: {  }
     region: content
+  path:
+    type: path
+    weight: 30
+    region: content
+    settings: {  }
+    third_party_settings: {  }
   preview:
     weight: 0
     region: content
diff --git a/tests/config/core.entity_form_display.media.tweet.media_browser.yml b/tests/config/core.entity_form_display.media.tweet.media_browser.yml
index f93056ac7..4a33ee944 100644
--- a/tests/config/core.entity_form_display.media.tweet.media_browser.yml
+++ b/tests/config/core.entity_form_display.media.tweet.media_browser.yml
@@ -7,6 +7,7 @@ dependencies:
     - field.field.media.tweet.field_media_in_library
     - media_entity.bundle.tweet
   module:
+    - path
     - workbench_moderation
 _core: {  }
 id: media.tweet.media_browser
@@ -29,6 +30,12 @@ content:
       placeholder: ''
     third_party_settings: {  }
     region: content
+  path:
+    type: path
+    weight: 30
+    region: content
+    settings: {  }
+    third_party_settings: {  }
   preview:
     weight: null
     settings: {  }
diff --git a/tests/config/core.entity_form_display.media.video.default.yml b/tests/config/core.entity_form_display.media.video.default.yml
index 7f034c714..032b10eb4 100644
--- a/tests/config/core.entity_form_display.media.video.default.yml
+++ b/tests/config/core.entity_form_display.media.video.default.yml
@@ -6,6 +6,7 @@ dependencies:
     - field.field.media.video.field_media_video_embed_field
     - media_entity.bundle.video
   module:
+    - path
     - video_embed_field
     - workbench_moderation
 _core: {  }
@@ -35,6 +36,12 @@ content:
       placeholder: ''
     third_party_settings: {  }
     region: content
+  path:
+    type: path
+    weight: 30
+    region: content
+    settings: {  }
+    third_party_settings: {  }
   preview:
     weight: 0
     region: content
diff --git a/tests/config/core.entity_form_display.media.video.media_browser.yml b/tests/config/core.entity_form_display.media.video.media_browser.yml
index 68ee478fd..ca6912a4a 100644
--- a/tests/config/core.entity_form_display.media.video.media_browser.yml
+++ b/tests/config/core.entity_form_display.media.video.media_browser.yml
@@ -7,6 +7,7 @@ dependencies:
     - field.field.media.video.field_media_video_embed_field
     - media_entity.bundle.video
   module:
+    - path
     - workbench_moderation
 _core: {  }
 id: media.video.media_browser
@@ -29,6 +30,12 @@ content:
       placeholder: ''
     third_party_settings: {  }
     region: content
+  path:
+    type: path
+    weight: 30
+    region: content
+    settings: {  }
+    third_party_settings: {  }
   preview:
     weight: null
     settings: {  }
diff --git a/tests/config/core.entity_form_display.node.landing_page.default.yml b/tests/config/core.entity_form_display.node.landing_page.default.yml
index b4ccf2314..602cff222 100644
--- a/tests/config/core.entity_form_display.node.landing_page.default.yml
+++ b/tests/config/core.entity_form_display.node.landing_page.default.yml
@@ -36,7 +36,7 @@ content:
   field_meta_tags:
     type: metatag_firehose
     region: content
-    weight: 26
+    weight: 121
     settings: {  }
     third_party_settings: {  }
   panelizer:
@@ -51,6 +51,13 @@ content:
     settings: {  }
     third_party_settings: {  }
     region: content
+  status:
+    type: boolean_checkbox
+    settings:
+      display_label: true
+    weight: 120
+    region: content
+    third_party_settings: {  }
   title:
     type: string_textfield
     weight: 0
diff --git a/tests/config/core.entity_form_display.node.page.default.yml b/tests/config/core.entity_form_display.node.page.default.yml
index b27f1f0df..57dd73faa 100644
--- a/tests/config/core.entity_form_display.node.page.default.yml
+++ b/tests/config/core.entity_form_display.node.page.default.yml
@@ -36,7 +36,7 @@ content:
   field_meta_tags:
     type: metatag_firehose
     region: content
-    weight: 27
+    weight: 122
     settings: {  }
     third_party_settings: {  }
   path:
@@ -62,9 +62,16 @@ content:
       allow_existing: false
       match_operator: CONTAINS
       form_mode: default
-    weight: 26
+    weight: 121
     third_party_settings: {  }
     region: content
+  status:
+    type: boolean_checkbox
+    settings:
+      display_label: true
+    weight: 120
+    region: content
+    third_party_settings: {  }
   sticky:
     type: boolean_checkbox
     settings:
diff --git a/tests/config/file.settings.yml b/tests/config/file.settings.yml
index dd7a10ce3..b2095b8d2 100644
--- a/tests/config/file.settings.yml
+++ b/tests/config/file.settings.yml
@@ -3,4 +3,5 @@ description:
   length: 128
 icon:
   directory: core/modules/file/icons
+make_unused_managed_files_temporary: false
 _core: {  }
diff --git a/tests/config/metatag.metatag_defaults.global.yml b/tests/config/metatag.metatag_defaults.global.yml
index c94ca75a7..07afe98a8 100644
--- a/tests/config/metatag.metatag_defaults.global.yml
+++ b/tests/config/metatag.metatag_defaults.global.yml
@@ -5,4 +5,5 @@ _core: {  }
 id: global
 label: Global
 tags:
+  canonical_url: '[current-page:url]'
   title: '[current-page:title] | [site:name]'
diff --git a/tests/config/metatag.metatag_defaults.node.yml b/tests/config/metatag.metatag_defaults.node.yml
index 1b4215dde..e39f69599 100644
--- a/tests/config/metatag.metatag_defaults.node.yml
+++ b/tests/config/metatag.metatag_defaults.node.yml
@@ -7,3 +7,4 @@ label: Content
 tags:
   title: '[node:title] | [site:name]'
   description: '[node:summary]'
+  canonical_url: '[node:url]'
diff --git a/tests/config/metatag.metatag_defaults.taxonomy_term.yml b/tests/config/metatag.metatag_defaults.taxonomy_term.yml
index 5ef7e571c..c15ca6228 100644
--- a/tests/config/metatag.metatag_defaults.taxonomy_term.yml
+++ b/tests/config/metatag.metatag_defaults.taxonomy_term.yml
@@ -5,5 +5,6 @@ _core: {  }
 id: taxonomy_term
 label: 'Taxonomy term'
 tags:
-  title: '[term:name] | [site:name]'
+  canonical_url: '[term:url]'
   description: '[term:description]'
+  title: '[term:name] | [site:name]'
diff --git a/tests/config/metatag.metatag_defaults.user.yml b/tests/config/metatag.metatag_defaults.user.yml
index ff583e96d..e1966521a 100644
--- a/tests/config/metatag.metatag_defaults.user.yml
+++ b/tests/config/metatag.metatag_defaults.user.yml
@@ -5,5 +5,6 @@ _core: {  }
 id: user
 label: User
 tags:
-  title: '[user:name] | [site:name]'
+  canonical_url: '[user:url]'
   description: '[site:name]'
+  title: '[user:name] | [site:name]'
diff --git a/tests/config/serialization.settings.yml b/tests/config/serialization.settings.yml
index f2f5c2db1..84040624d 100644
--- a/tests/config/serialization.settings.yml
+++ b/tests/config/serialization.settings.yml
@@ -1,2 +1,3 @@
 bc_primitives_as_strings: false
+bc_timestamp_normalizer_unix: false
 _core: {  }
diff --git a/tests/config/system.action.user_add_role_action.administrator.yml b/tests/config/system.action.user_add_role_action.administrator.yml
index 4c642123c..deef843a2 100644
--- a/tests/config/system.action.user_add_role_action.administrator.yml
+++ b/tests/config/system.action.user_add_role_action.administrator.yml
@@ -6,7 +6,7 @@ dependencies:
   module:
     - user
 id: user_add_role_action.administrator
-label: 'Add the Administrator role to the selected users'
+label: 'Add the Administrator role to the selected user(s)'
 type: user
 plugin: user_add_role_action
 configuration:
diff --git a/tests/config/system.action.user_add_role_action.landing_page_creator.yml b/tests/config/system.action.user_add_role_action.landing_page_creator.yml
index 1d48cef56..5756f88c0 100644
--- a/tests/config/system.action.user_add_role_action.landing_page_creator.yml
+++ b/tests/config/system.action.user_add_role_action.landing_page_creator.yml
@@ -6,7 +6,7 @@ dependencies:
   module:
     - user
 id: user_add_role_action.landing_page_creator
-label: 'Add the Landing page creator role to the selected users'
+label: 'Add the Landing page creator role to the selected user(s)'
 type: user
 plugin: user_add_role_action
 configuration:
diff --git a/tests/config/system.action.user_add_role_action.landing_page_reviewer.yml b/tests/config/system.action.user_add_role_action.landing_page_reviewer.yml
index b7a01e00f..a1ae4c917 100644
--- a/tests/config/system.action.user_add_role_action.landing_page_reviewer.yml
+++ b/tests/config/system.action.user_add_role_action.landing_page_reviewer.yml
@@ -6,7 +6,7 @@ dependencies:
   module:
     - user
 id: user_add_role_action.landing_page_reviewer
-label: 'Add the Landing page reviewer role to the selected users'
+label: 'Add the Landing page reviewer role to the selected user(s)'
 type: user
 plugin: user_add_role_action
 configuration:
diff --git a/tests/config/system.action.user_add_role_action.layout_manager.yml b/tests/config/system.action.user_add_role_action.layout_manager.yml
index 165096e20..e8604b18c 100644
--- a/tests/config/system.action.user_add_role_action.layout_manager.yml
+++ b/tests/config/system.action.user_add_role_action.layout_manager.yml
@@ -6,7 +6,7 @@ dependencies:
   module:
     - user
 id: user_add_role_action.layout_manager
-label: 'Add the Layout manager role to the selected users'
+label: 'Add the Layout manager role to the selected user(s)'
 type: user
 plugin: user_add_role_action
 configuration:
diff --git a/tests/config/system.action.user_add_role_action.media_creator.yml b/tests/config/system.action.user_add_role_action.media_creator.yml
index a2b3386c2..2b0cc86bd 100644
--- a/tests/config/system.action.user_add_role_action.media_creator.yml
+++ b/tests/config/system.action.user_add_role_action.media_creator.yml
@@ -6,7 +6,7 @@ dependencies:
   module:
     - user
 id: user_add_role_action.media_creator
-label: 'Add the Media creator role to the selected users'
+label: 'Add the Media creator role to the selected user(s)'
 type: user
 plugin: user_add_role_action
 configuration:
diff --git a/tests/config/system.action.user_add_role_action.media_manager.yml b/tests/config/system.action.user_add_role_action.media_manager.yml
index a29611635..ec0d85a6e 100644
--- a/tests/config/system.action.user_add_role_action.media_manager.yml
+++ b/tests/config/system.action.user_add_role_action.media_manager.yml
@@ -6,7 +6,7 @@ dependencies:
   module:
     - user
 id: user_add_role_action.media_manager
-label: 'Add the Media manager role to the selected users'
+label: 'Add the Media manager role to the selected user(s)'
 type: user
 plugin: user_add_role_action
 configuration:
diff --git a/tests/config/system.action.user_add_role_action.page_creator.yml b/tests/config/system.action.user_add_role_action.page_creator.yml
index 708010003..056f166b3 100644
--- a/tests/config/system.action.user_add_role_action.page_creator.yml
+++ b/tests/config/system.action.user_add_role_action.page_creator.yml
@@ -6,7 +6,7 @@ dependencies:
   module:
     - user
 id: user_add_role_action.page_creator
-label: 'Add the Basic page creator role to the selected users'
+label: 'Add the Basic page creator role to the selected user(s)'
 type: user
 plugin: user_add_role_action
 configuration:
diff --git a/tests/config/system.action.user_add_role_action.page_reviewer.yml b/tests/config/system.action.user_add_role_action.page_reviewer.yml
index 07a2d060d..d6a5a54ff 100644
--- a/tests/config/system.action.user_add_role_action.page_reviewer.yml
+++ b/tests/config/system.action.user_add_role_action.page_reviewer.yml
@@ -6,7 +6,7 @@ dependencies:
   module:
     - user
 id: user_add_role_action.page_reviewer
-label: 'Add the Basic page reviewer role to the selected users'
+label: 'Add the Basic page reviewer role to the selected user(s)'
 type: user
 plugin: user_add_role_action
 configuration:
diff --git a/tests/config/system.action.user_remove_role_action.administrator.yml b/tests/config/system.action.user_remove_role_action.administrator.yml
index aa8544e54..79a8c8fe9 100644
--- a/tests/config/system.action.user_remove_role_action.administrator.yml
+++ b/tests/config/system.action.user_remove_role_action.administrator.yml
@@ -6,7 +6,7 @@ dependencies:
   module:
     - user
 id: user_remove_role_action.administrator
-label: 'Remove the Administrator role from the selected users'
+label: 'Remove the Administrator role from the selected user(s)'
 type: user
 plugin: user_remove_role_action
 configuration:
diff --git a/tests/config/system.action.user_remove_role_action.landing_page_creator.yml b/tests/config/system.action.user_remove_role_action.landing_page_creator.yml
index 6f8c9c313..1d099c65e 100644
--- a/tests/config/system.action.user_remove_role_action.landing_page_creator.yml
+++ b/tests/config/system.action.user_remove_role_action.landing_page_creator.yml
@@ -6,7 +6,7 @@ dependencies:
   module:
     - user
 id: user_remove_role_action.landing_page_creator
-label: 'Remove the Landing page creator role from the selected users'
+label: 'Remove the Landing page creator role from the selected user(s)'
 type: user
 plugin: user_remove_role_action
 configuration:
diff --git a/tests/config/system.action.user_remove_role_action.landing_page_reviewer.yml b/tests/config/system.action.user_remove_role_action.landing_page_reviewer.yml
index 503a07c37..b75ff1e4d 100644
--- a/tests/config/system.action.user_remove_role_action.landing_page_reviewer.yml
+++ b/tests/config/system.action.user_remove_role_action.landing_page_reviewer.yml
@@ -6,7 +6,7 @@ dependencies:
   module:
     - user
 id: user_remove_role_action.landing_page_reviewer
-label: 'Remove the Landing page reviewer role from the selected users'
+label: 'Remove the Landing page reviewer role from the selected user(s)'
 type: user
 plugin: user_remove_role_action
 configuration:
diff --git a/tests/config/system.action.user_remove_role_action.layout_manager.yml b/tests/config/system.action.user_remove_role_action.layout_manager.yml
index c15031c35..5a851d6c4 100644
--- a/tests/config/system.action.user_remove_role_action.layout_manager.yml
+++ b/tests/config/system.action.user_remove_role_action.layout_manager.yml
@@ -6,7 +6,7 @@ dependencies:
   module:
     - user
 id: user_remove_role_action.layout_manager
-label: 'Remove the Layout manager role from the selected users'
+label: 'Remove the Layout manager role from the selected user(s)'
 type: user
 plugin: user_remove_role_action
 configuration:
diff --git a/tests/config/system.action.user_remove_role_action.media_creator.yml b/tests/config/system.action.user_remove_role_action.media_creator.yml
index ff9d28880..28bb36cca 100644
--- a/tests/config/system.action.user_remove_role_action.media_creator.yml
+++ b/tests/config/system.action.user_remove_role_action.media_creator.yml
@@ -6,7 +6,7 @@ dependencies:
   module:
     - user
 id: user_remove_role_action.media_creator
-label: 'Remove the Media creator role from the selected users'
+label: 'Remove the Media creator role from the selected user(s)'
 type: user
 plugin: user_remove_role_action
 configuration:
diff --git a/tests/config/system.action.user_remove_role_action.media_manager.yml b/tests/config/system.action.user_remove_role_action.media_manager.yml
index 93130a5d4..3eed6136b 100644
--- a/tests/config/system.action.user_remove_role_action.media_manager.yml
+++ b/tests/config/system.action.user_remove_role_action.media_manager.yml
@@ -6,7 +6,7 @@ dependencies:
   module:
     - user
 id: user_remove_role_action.media_manager
-label: 'Remove the Media manager role from the selected users'
+label: 'Remove the Media manager role from the selected user(s)'
 type: user
 plugin: user_remove_role_action
 configuration:
diff --git a/tests/config/system.action.user_remove_role_action.page_creator.yml b/tests/config/system.action.user_remove_role_action.page_creator.yml
index 77744cddd..16a0795c1 100644
--- a/tests/config/system.action.user_remove_role_action.page_creator.yml
+++ b/tests/config/system.action.user_remove_role_action.page_creator.yml
@@ -6,7 +6,7 @@ dependencies:
   module:
     - user
 id: user_remove_role_action.page_creator
-label: 'Remove the Basic page creator role from the selected users'
+label: 'Remove the Basic page creator role from the selected user(s)'
 type: user
 plugin: user_remove_role_action
 configuration:
diff --git a/tests/config/system.action.user_remove_role_action.page_reviewer.yml b/tests/config/system.action.user_remove_role_action.page_reviewer.yml
index 2bf129482..0794c65d4 100644
--- a/tests/config/system.action.user_remove_role_action.page_reviewer.yml
+++ b/tests/config/system.action.user_remove_role_action.page_reviewer.yml
@@ -6,7 +6,7 @@ dependencies:
   module:
     - user
 id: user_remove_role_action.page_reviewer
-label: 'Remove the Basic page reviewer role from the selected users'
+label: 'Remove the Basic page reviewer role from the selected user(s)'
 type: user
 plugin: user_remove_role_action
 configuration:
diff --git a/tests/config/views.view.files.yml b/tests/config/views.view.files.yml
index 99d81ccd5..ad405e5cb 100644
--- a/tests/config/views.view.files.yml
+++ b/tests/config/views.view.files.yml
@@ -566,7 +566,7 @@ display:
           decimal: .
           separator: ','
           format_plural: true
-          format_plural_string: "1 place\x03@count places"
+          format_plural_string: !!binary MSBwbGFjZQNAY291bnQgcGxhY2Vz
           prefix: ''
           suffix: ''
           plugin_id: numeric
@@ -1008,7 +1008,7 @@ display:
           decimal: .
           separator: ','
           format_plural: false
-          format_plural_string: "1\x03@count"
+          format_plural_string: !!binary MQNAY291bnQ=
           prefix: ''
           suffix: ''
           plugin_id: numeric
diff --git a/tests/config/views.view.watchdog.yml b/tests/config/views.view.watchdog.yml
new file mode 100644
index 000000000..56c2d3a61
--- /dev/null
+++ b/tests/config/views.view.watchdog.yml
@@ -0,0 +1,710 @@
+langcode: en
+status: true
+dependencies:
+  module:
+    - dblog
+    - user
+_core: {  }
+id: watchdog
+label: Watchdog
+module: views
+description: 'Recent log messages'
+tag: ''
+base_table: watchdog
+base_field: wid
+core: 8.x
+display:
+  default:
+    display_plugin: default
+    id: default
+    display_title: Master
+    position: 0
+    display_options:
+      access:
+        type: perm
+        options:
+          perm: 'access site reports'
+      cache:
+        type: none
+        options: {  }
+      query:
+        type: views_query
+        options:
+          disable_sql_rewrite: false
+          distinct: false
+          replica: false
+          query_comment: ''
+          query_tags: {  }
+      exposed_form:
+        type: basic
+        options:
+          submit_button: Filter
+          reset_button: true
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
+          expose_sort_order: false
+          sort_asc_label: Asc
+          sort_desc_label: Desc
+      pager:
+        type: mini
+        options:
+          items_per_page: 50
+          offset: 0
+          id: 0
+          total_pages: null
+          expose:
+            items_per_page: false
+            items_per_page_label: 'Items per page'
+            items_per_page_options: '5, 10, 25, 50'
+            items_per_page_options_all: false
+            items_per_page_options_all_label: '- All -'
+            offset: false
+            offset_label: Offset
+          tags:
+            previous: ‹‹
+            next: ››
+      style:
+        type: table
+        options:
+          grouping: {  }
+          row_class: '{{ type }} {{ severity }}'
+          default_row_class: true
+          override: true
+          sticky: false
+          caption: ''
+          summary: ''
+          description: ''
+          columns:
+            nothing: nothing
+            wid: wid
+            severity: severity
+            type: type
+            timestamp: timestamp
+            message: message
+            name: name
+            link: link
+          info:
+            nothing:
+              sortable: false
+              default_sort_order: asc
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: priority-medium
+            wid:
+              sortable: false
+              default_sort_order: desc
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: priority-low
+            severity:
+              sortable: false
+              default_sort_order: asc
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: priority-low
+            type:
+              sortable: true
+              default_sort_order: asc
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: priority-medium
+            timestamp:
+              sortable: true
+              default_sort_order: desc
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: priority-low
+            message:
+              sortable: false
+              default_sort_order: asc
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: ''
+            name:
+              sortable: true
+              default_sort_order: asc
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: priority-medium
+            link:
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: priority-low
+          default: wid
+          empty_table: false
+      row:
+        type: fields
+      fields:
+        nothing:
+          id: nothing
+          table: views
+          field: nothing
+          relationship: none
+          group_type: group
+          admin_label: Icon
+          label: ''
+          exclude: false
+          alter:
+            alter_text: true
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: icon
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: false
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: false
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: false
+          plugin_id: custom
+        wid:
+          id: wid
+          table: watchdog
+          field: wid
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: WID
+          exclude: true
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: true
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          plugin_id: standard
+        severity:
+          id: severity
+          table: watchdog
+          field: severity
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: Severity
+          exclude: true
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: true
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          machine_name: false
+          plugin_id: machine_name
+        type:
+          id: type
+          table: watchdog
+          field: type
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: Type
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: true
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          plugin_id: standard
+        timestamp:
+          id: timestamp
+          table: watchdog
+          field: timestamp
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: Date
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: true
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          date_format: short
+          custom_date_format: ''
+          timezone: ''
+          plugin_id: date
+        message:
+          id: message
+          table: watchdog
+          field: message
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: Message
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: true
+            path: 'admin/reports/dblog/event/{{ wid }}'
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: '{{ message }}'
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 56
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: true
+            trim: true
+            preserve_tags: ''
+            html: true
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: true
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          replace_variables: true
+          plugin_id: dblog_message
+        name:
+          id: name
+          table: users_field_data
+          field: name
+          relationship: uid
+          group_type: group
+          admin_label: ''
+          label: User
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: true
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          click_sort_column: value
+          type: user_name
+          settings:
+            link_to_entity: true
+          group_column: value
+          group_columns: {  }
+          group_rows: true
+          delta_limit: 0
+          delta_offset: 0
+          delta_reversed: false
+          delta_first_last: false
+          multi_type: separator
+          separator: ', '
+          field_api_classes: false
+          entity_type: user
+          entity_field: name
+          plugin_id: field
+        link:
+          id: link
+          table: watchdog
+          field: link
+          relationship: none
+          group_type: group
+          admin_label: ''
+          label: Operations
+          exclude: false
+          alter:
+            alter_text: false
+            text: ''
+            make_link: false
+            path: ''
+            absolute: false
+            external: false
+            replace_spaces: false
+            path_case: none
+            trim_whitespace: false
+            alt: ''
+            rel: ''
+            link_class: ''
+            prefix: ''
+            suffix: ''
+            target: ''
+            nl2br: false
+            max_length: 0
+            word_boundary: true
+            ellipsis: true
+            more_link: false
+            more_link_text: ''
+            more_link_path: ''
+            strip_tags: false
+            trim: false
+            preserve_tags: ''
+            html: false
+          element_type: ''
+          element_class: ''
+          element_label_type: ''
+          element_label_class: ''
+          element_label_colon: true
+          element_wrapper_type: ''
+          element_wrapper_class: ''
+          element_default_classes: true
+          empty: ''
+          hide_empty: false
+          empty_zero: false
+          hide_alter_empty: true
+          plugin_id: dblog_operations
+      filters:
+        type:
+          id: type
+          table: watchdog
+          field: type
+          relationship: none
+          group_type: group
+          admin_label: ''
+          operator: in
+          value: {  }
+          group: 1
+          exposed: true
+          expose:
+            operator_id: type_op
+            label: Type
+            description: ''
+            use_operator: false
+            operator: type_op
+            identifier: type
+            required: false
+            remember: false
+            multiple: true
+            remember_roles:
+              authenticated: authenticated
+              anonymous: '0'
+              administrator: '0'
+            reduce: false
+          is_grouped: false
+          group_info:
+            label: ''
+            description: ''
+            identifier: ''
+            optional: true
+            widget: select
+            multiple: false
+            remember: false
+            default_group: All
+            default_group_multiple: {  }
+            group_items: {  }
+          plugin_id: dblog_types
+        severity:
+          id: severity
+          table: watchdog
+          field: severity
+          relationship: none
+          group_type: group
+          admin_label: ''
+          operator: in
+          value: {  }
+          group: 1
+          exposed: true
+          expose:
+            operator_id: severity_op
+            label: Severity
+            description: ''
+            use_operator: false
+            operator: severity_op
+            identifier: severity
+            required: false
+            remember: false
+            multiple: true
+            remember_roles:
+              authenticated: authenticated
+              anonymous: '0'
+              administrator: '0'
+            reduce: false
+          is_grouped: false
+          group_info:
+            label: ''
+            description: ''
+            identifier: ''
+            optional: true
+            widget: select
+            multiple: false
+            remember: false
+            default_group: All
+            default_group_multiple: {  }
+            group_items: {  }
+          plugin_id: in_operator
+      sorts:
+        wid:
+          id: wid
+          table: watchdog
+          field: wid
+          relationship: none
+          group_type: group
+          admin_label: ''
+          order: DESC
+          exposed: false
+          expose:
+            label: ''
+          plugin_id: standard
+      title: 'Recent log messages'
+      header: {  }
+      footer: {  }
+      empty:
+        area:
+          id: area
+          table: views
+          field: area
+          relationship: none
+          group_type: group
+          admin_label: ''
+          empty: true
+          tokenize: false
+          content:
+            value: 'No log messages available.'
+            format: basic_html
+          plugin_id: text
+      relationships:
+        uid:
+          id: uid
+          table: watchdog
+          field: uid
+          relationship: none
+          group_type: group
+          admin_label: User
+          required: false
+          plugin_id: standard
+      arguments: {  }
+      display_extenders: {  }
+      filter_groups:
+        operator: AND
+        groups:
+          1: AND
+      css_class: admin-dblog
+    cache_metadata:
+      max-age: 0
+      contexts:
+        - 'languages:language_content'
+        - 'languages:language_interface'
+        - url
+        - url.query_args
+        - user.permissions
+      tags: {  }
+  page:
+    display_plugin: page
+    id: page
+    display_title: Page
+    position: 1
+    display_options:
+      display_extenders: {  }
+      path: admin/reports/dblog
+    cache_metadata:
+      max-age: 0
+      contexts:
+        - 'languages:language_content'
+        - 'languages:language_interface'
+        - url
+        - url.query_args
+        - user.permissions
+      tags: {  }
diff --git a/tests/features/search.feature b/tests/features/search.feature
index d09ffaadb..cdee64716 100644
--- a/tests/features/search.feature
+++ b/tests/features/search.feature
@@ -12,7 +12,8 @@ Feature: Site search
     When I visit "/search"
     And I enter "zombie" for "Keywords"
     And I press "Search"
-    Then I should not see "Zombie 1"
+    Then the response status code should be 200
+    And I should not see "Zombie 1"
     And I should not see "Zombie 2"
     And I should see "Zombie 3"
 
diff --git a/tests/features/workflow/moderation_states.feature b/tests/features/workflow/moderation_states.feature
index 1e796c5ed..9b52594ba 100644
--- a/tests/features/workflow/moderation_states.feature
+++ b/tests/features/workflow/moderation_states.feature
@@ -101,8 +101,9 @@ Feature: Workflow moderation states
       | not_moderated | Not Moderated |
     And I am logged in as a user with the "administer nodes,create not_moderated content" permissions
     When I visit "/node/add/not_moderated"
-    Then I should see the "Save and publish" button
-    And I should see the "Save as unpublished" button
+    Then I should see the "Save" button
+    And I should not see the "Save and publish" button
+    And I should not see the "Save as unpublished" button
 
   @7cef449b
   Scenario: Unmoderated content types have the "Create new revision" Checkbox
diff --git a/tests/fixtures/2.1.5.sql.bz2 b/tests/fixtures/2.1.5.sql.bz2
deleted file mode 100644
index f369bede2..000000000
Binary files a/tests/fixtures/2.1.5.sql.bz2 and /dev/null differ
diff --git a/tests/fixtures/2.2.0.sql.bz2 b/tests/fixtures/2.2.0.sql.bz2
new file mode 100644
index 000000000..8d059e74b
Binary files /dev/null and b/tests/fixtures/2.2.0.sql.bz2 differ
diff --git a/tests/modules/upload_bundles_test/upload_bundles_test.info.yml b/tests/modules/upload_bundles_test/upload_bundles_test.info.yml
index 503f585d9..5a2d5a838 100644
--- a/tests/modules/upload_bundles_test/upload_bundles_test.info.yml
+++ b/tests/modules/upload_bundles_test/upload_bundles_test.info.yml
@@ -6,4 +6,4 @@ hidden: true
 dependencies:
   - lightning_media_image
   - lightning_page
-version: '8.x-2.20-dev'
+version: '8.x-2.20'
diff --git a/tests/modules/view_mode_test/view_mode_test.info.yml b/tests/modules/view_mode_test/view_mode_test.info.yml
index 4ef364c8b..9a64af6b0 100644
--- a/tests/modules/view_mode_test/view_mode_test.info.yml
+++ b/tests/modules/view_mode_test/view_mode_test.info.yml
@@ -6,4 +6,4 @@ hidden: true
 dependencies:
   - lightning_core
   - node
-version: '8.x-2.20-dev'
+version: '8.x-2.20'