diff --git a/core/lib/Drupal/Core/StreamWrapper/PrivateStream.php b/core/lib/Drupal/Core/StreamWrapper/PrivateStream.php
index 921c223..47ca61b 100644
--- a/core/lib/Drupal/Core/StreamWrapper/PrivateStream.php
+++ b/core/lib/Drupal/Core/StreamWrapper/PrivateStream.php
@@ -30,6 +30,6 @@ public function getDirectoryPath() {
    */
   function getExternalUrl() {
     $path = str_replace('\\', '/', $this->getTarget());
-    return url('system/files', array('absolute' => TRUE, 'query' => array('file' => $path)));
+    return url('system/files/private', array('absolute' => TRUE, 'query' => array('file' => $path)));
   }
 }
diff --git a/core/modules/file/lib/Drupal/file/Tests/DownloadTest.php b/core/modules/file/lib/Drupal/file/Tests/DownloadTest.php
index 3febe1c..106b08c 100644
--- a/core/modules/file/lib/Drupal/file/Tests/DownloadTest.php
+++ b/core/modules/file/lib/Drupal/file/Tests/DownloadTest.php
@@ -103,7 +103,7 @@ function testFileCreateUrl() {
     $script_path_original = $script_path;
     foreach (array('', 'index.php/') as $script_path) {
       $this->checkUrl('public', '', $basename, $base_url . '/' . file_stream_wrapper_get_instance_by_scheme('public')->getDirectoryPath() . '/' . $basename_encoded);
-      $this->checkUrl('private', '', $basename, $base_url . '/' . $script_path . 'system/files?file=' . $basename_encoded);
+      $this->checkUrl('private', '', $basename, $base_url . '/' . $script_path . 'system/files/private?file=' . $basename_encoded);
     }
     $script_path = $script_path_original;
   }
diff --git a/core/modules/image/image.module b/core/modules/image/image.module
index a7696a6..f5f6431 100644
--- a/core/modules/image/image.module
+++ b/core/modules/image/image.module
@@ -725,6 +725,7 @@ function image_style_flush($style) {
  */
 function image_style_url($style_name, $path) {
   $uri = image_style_path($style_name, $path);
+
   // The token query is added even if the
   // 'image.settings:allow_insecure_derivatives' configuration is TRUE, so that
   // the emitted links remain valid if it is changed back to the default FALSE.
diff --git a/core/modules/system/system.routing.yml b/core/modules/system/system.routing.yml
index 7ba63e9..cecf327 100644
--- a/core/modules/system/system.routing.yml
+++ b/core/modules/system/system.routing.yml
@@ -89,7 +89,7 @@ date_format_localize_reset:
     _permission: 'administer site configuration'
 
 system_files:
-  pattern: '/system/files'
+  pattern: '/system/files/{scheme}'
   defaults:
     _controller: 'Drupal\system\FileController::fileDownload'
     scheme: private