diff --git a/.github/build-packages.php b/.github/build-packages.php
index e61eae51df..5e9bcc1415 100644
--- a/.github/build-packages.php
+++ b/.github/build-packages.php
@@ -57,7 +57,7 @@ foreach ($dirs as $k => $dir) {
     $versions = @file_get_contents('https://repo.packagist.org/p/'.$package->name.'.json') ?: sprintf('{"packages":{"%s":{"dev-master":%s}}}', $package->name, file_get_contents($dir.'/composer.json'));
     $versions = json_decode($versions)->packages->{$package->name};
 
-    if ($package->version === str_replace('-dev', '.x-dev', $versions->{'dev-master'}->extra->{'branch-alias'}->{'dev-master'})) {
+    if (isset($versions->{'dev-master'}) && $package->version === str_replace('-dev', '.x-dev', $versions->{'dev-master'}->extra->{'branch-alias'}->{'dev-master'})) {
         unset($versions->{'dev-master'});
     }
 
diff --git a/src/Symfony/Bundle/FrameworkBundle/composer.json b/src/Symfony/Bundle/FrameworkBundle/composer.json
index a9518d5eda..97937024fa 100644
--- a/src/Symfony/Bundle/FrameworkBundle/composer.json
+++ b/src/Symfony/Bundle/FrameworkBundle/composer.json
@@ -20,6 +20,7 @@
         "ext-xml": "*",
         "symfony/cache": "^4.3|^5.0",
         "symfony/config": "^4.2|^5.0",
+        "symfony/debug": "~4.0|^5.0",
         "symfony/dependency-injection": "^4.4|^5.0",
         "symfony/http-foundation": "^4.3|^5.0",
         "symfony/http-kernel": "^4.4|^5.0",
diff --git a/src/Symfony/Bundle/TwigBundle/composer.json b/src/Symfony/Bundle/TwigBundle/composer.json
index 5c7195fbba..54c49c8a7b 100644
--- a/src/Symfony/Bundle/TwigBundle/composer.json
+++ b/src/Symfony/Bundle/TwigBundle/composer.json
@@ -17,6 +17,7 @@
     ],
     "require": {
         "php": "^7.1.3",
+        "symfony/debug": "~4.0|^5.0",
         "symfony/error-catcher": "^4.4|^5.0",
         "symfony/twig-bridge": "^4.4|^5.0",
         "symfony/http-foundation": "^4.3|^5.0",
diff --git a/src/Symfony/Component/HttpKernel/Client.php b/src/Symfony/Component/HttpKernel/Client.php
index 66ce0649f0..d4ae5f8e65 100644
--- a/src/Symfony/Component/HttpKernel/Client.php
+++ b/src/Symfony/Component/HttpKernel/Client.php
@@ -23,6 +23,9 @@ use Symfony\Component\HttpFoundation\Response;
 /**
  * Client simulates a browser and makes requests to an HttpKernel instance.
  *
+ * @method Request  getRequest()  A Request instance
+ * @method Response getResponse() A Response instance
+ *
  * @deprecated since Symfony 4.3, use HttpKernelBrowser instead.
  */
 class Client extends AbstractBrowser