diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index 9cf36e6beb..8b1eec6264 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -19,13 +19,13 @@ Symfony is the result of the work of many people who made the code better
  - Ryan Weaver (weaverryan)
  - Javier Eguiluz (javier.eguiluz)
  - Hugo Hamon (hhamon)
- - Abdellatif Ait boudad (aitboudad)
  - Maxime Steinhausser (ogizanagi)
+ - Abdellatif Ait boudad (aitboudad)
  - Robin Chalas (chalas_r)
  - Romain Neutron (romain)
  - Pascal Borreli (pborreli)
- - Wouter De Jong (wouterj)
  - Grégoire Pineau (lyrixx)
+ - Wouter De Jong (wouterj)
  - Joseph Bielawski (stloyd)
  - Karma Dordrak (drak)
  - Lukas Kahwe Smith (lsmith)
@@ -35,8 +35,8 @@ Symfony is the result of the work of many people who made the code better
  - Benjamin Eberlei (beberlei)
  - Igor Wiedler (igorw)
  - Eriksen Costa (eriksencosta)
- - Jules Pietri (heah)
  - Roland Franssen (ro0)
+ - Jules Pietri (heah)
  - Sarah Khalil (saro0h)
  - Guilhem Niot (energetick)
  - Jonathan Wage (jwage)
@@ -93,6 +93,7 @@ Symfony is the result of the work of many people who made the code better
  - Maxime STEINHAUSSER
  - Alexander M. Turek (derrabus)
  - Michal Piotrowski (eventhorizon)
+ - Dany Maillard (maidmaid)
  - Issei Murasawa (issei_m)
  - Tim Nagel (merk)
  - Brice BERNARD (brikou)
@@ -133,7 +134,6 @@ Symfony is the result of the work of many people who made the code better
  - Guilherme Blanco (guilhermeblanco)
  - Pablo Godel (pgodel)
  - Jérémie Augustin (jaugustin)
- - Dany Maillard (maidmaid)
  - Andréia Bohner (andreia)
  - Rafael Dohms (rdohms)
  - Arnaud Kleinpeter (nanocom)
@@ -141,6 +141,7 @@ Symfony is the result of the work of many people who made the code better
  - David Maicher (dmaicher)
  - Mikael Pajunen
  - Joel Wurtz (brouznouf)
+ - Jérôme Vasseur (jvasseur)
  - Grégoire Paris (greg0ire)
  - Philipp Wahala (hifi)
  - Vyacheslav Pavlov
@@ -150,7 +151,6 @@ Symfony is the result of the work of many people who made the code better
  - Thomas Rabaix (rande)
  - Rouven Weßling (realityking)
  - Teoh Han Hui (teohhanhui)
- - Jérôme Vasseur (jvasseur)
  - Clemens Tolboom
  - Helmer Aaviksoo
  - Hiromi Hishida (77web)
@@ -162,6 +162,7 @@ Symfony is the result of the work of many people who made the code better
  - Artur Kotyrba
  - jeremyFreeAgent (Jérémy Romey) (jeremyfreeagent)
  - James Halsall (jaitsu)
+ - Chris Wilkinson (thewilkybarkid)
  - Warnar Boekkooi (boekkooi)
  - Dmitrii Chekaliuk (lazyhammer)
  - Clément JOBEILI (dator)
@@ -175,7 +176,6 @@ Symfony is the result of the work of many people who made the code better
  - Benjamin Dulau (dbenjamin)
  - James Halsall (jaitsu)
  - Mathieu Lemoine (lemoinem)
- - Chris Wilkinson (thewilkybarkid)
  - Andreas Hucks (meandmymonkey)
  - Noel Guilbert (noel)
  - Stepan Anchugov (kix)
@@ -240,6 +240,7 @@ Symfony is the result of the work of many people who made the code better
  - Alif Rachmawadi
  - Kristen Gilden (kgilden)
  - Pierre-Yves LEBECQ (pylebecq)
+ - Jordan Samouh (jordansamouh)
  - Alex Pott
  - Jakub Kucharovic (jkucharovic)
  - Uwe Jäger (uwej711)
@@ -250,6 +251,7 @@ Symfony is the result of the work of many people who made the code better
  - GordonsLondon
  - Jan Sorgalla (jsor)
  - Ray
+ - Nikolay Labinskiy (e-moe)
  - Leo Feyer
  - Chekote
  - Thomas Adam
@@ -276,8 +278,8 @@ Symfony is the result of the work of many people who made the code better
  - Marc Weistroff (futurecat)
  - Christian Schmidt
  - Hidde Wieringa (hiddewie)
+ - Alessandro Chitolina
  - Chad Sikorra (chadsikorra)
- - Jordan Samouh (jordansamouh)
  - Chris Smith (cs278)
  - Florian Klein (docteurklein)
  - Manuel Kiessling (manuelkiessling)
@@ -296,7 +298,6 @@ Symfony is the result of the work of many people who made the code better
  - Victor Bocharsky (bocharsky_bw)
  - Jan Decavele (jandc)
  - Gustavo Piltcher
- - Nikolay Labinskiy (e-moe)
  - Stepan Tanasiychuk (stfalcon)
  - Tiago Ribeiro (fixe)
  - Hidde Boomsma (hboomsma)
@@ -311,6 +312,7 @@ Symfony is the result of the work of many people who made the code better
  - Thomas Schulz (king2500)
  - Dariusz Rumiński
  - Berny Cantos (xphere81)
+ - Thierry Thuon (lepiaf)
  - Ricard Clau (ricardclau)
  - Mark Challoner (markchalloner)
  - Gregor Harlan (gharlan)
@@ -329,6 +331,7 @@ Symfony is the result of the work of many people who made the code better
  - Inal DJAFAR (inalgnu)
  - Christian Gärtner (dagardner)
  - Tomasz Kowalczyk (thunderer)
+ - Michael Babker (mbabker)
  - François-Xavier de Guillebon (de-gui_f)
  - Damien Alexandre (damienalexandre)
  - Felix Labrecque
@@ -337,7 +340,6 @@ Symfony is the result of the work of many people who made the code better
  - Robbert Klarenbeek (robbertkl)
  - Thomas Calvet (fancyweb)
  - Niels Keurentjes (curry684)
- - Alessandro Chitolina
  - JhonnyL
  - hossein zolfi (ocean)
  - Clément Gautier (clementgautier)
@@ -403,6 +405,7 @@ Symfony is the result of the work of many people who made the code better
  - Olivier Dolbeau (odolbeau)
  - Jan Rosier (rosier)
  - Thomas Royer (cydonia7)
+ - Arturs Vonda
  - Josip Kruslin
  - Asmir Mustafic (goetas)
  - vagrant
@@ -430,6 +433,7 @@ Symfony is the result of the work of many people who made the code better
  - David Badura (davidbadura)
  - Zander Baldwin
  - Adam Harvey
+ - Maxime Veber (nek-)
  - Alex Bakhturin
  - Alexander Obuhovich (aik099)
  - boombatower
@@ -443,6 +447,7 @@ Symfony is the result of the work of many people who made the code better
  - Gladhon
  - Benoît Burnichon (bburnichon)
  - Sebastian Bergmann
+ - Miroslav Sustek
  - Pablo Díez (pablodip)
  - Kevin McBride
  - Sergio Santoro
@@ -552,7 +557,6 @@ Symfony is the result of the work of many people who made the code better
  - Maxime Douailin
  - Jean Pasdeloup (pasdeloup)
  - Benjamin Cremer (bcremer)
- - Thierry Thuon (lepiaf)
  - Javier López (loalf)
  - Reinier Kip
  - Geoffrey Brier (geoffrey-brier)
@@ -574,6 +578,7 @@ Symfony is the result of the work of many people who made the code better
  - Alex Bogomazov (alebo)
  - maxime.steinhausser
  - Stefan Warman
+ - Thomas Perez (scullwm)
  - Tristan Maindron (tmaindron)
  - Wesley Lancel
  - Ke WANG (yktd26)
@@ -582,7 +587,6 @@ Symfony is the result of the work of many people who made the code better
  - Sergey Kolodyazhnyy (skolodyazhnyy)
  - umpirski
  - Denis Brumann (dbrumann)
- - Michael Babker (mbabker)
  - Quentin de Longraye (quentinus95)
  - Chris Heng (gigablah)
  - Richard Bradley
@@ -592,7 +596,6 @@ Symfony is the result of the work of many people who made the code better
  - Michael Devery (mickadoo)
  - Antoine Corcy
  - Artur Eshenbrener
- - Arturs Vonda
  - Sascha Grossenbacher
  - Szijarto Tamas
  - Catalin Dan
@@ -622,7 +625,6 @@ Symfony is the result of the work of many people who made the code better
  - develop
  - ReenExe
  - Mark Sonnabaum
- - Maxime Veber (nek-)
  - Richard Quadling
  - jochenvdv
  - Arturas Smorgun (asarturas)
@@ -671,7 +673,6 @@ Symfony is the result of the work of many people who made the code better
  - Christian Soronellas (theunic)
  - Yosmany Garcia (yosmanyga)
  - Wouter de Wild
- - Miroslav Sustek
  - Degory Valentine
  - Benoit Lévêque (benoit_leveque)
  - Jeroen Fiege (fieg)
@@ -695,6 +696,7 @@ Symfony is the result of the work of many people who made the code better
  - Jan Prieser
  - Adrien Lucas (adrienlucas)
  - Zhuravlev Alexander (scif)
+ - Yanick Witschi (toflar)
  - James Michael DuPont
  - Tom Klingenberg
  - Christopher Hall (mythmakr)
@@ -836,7 +838,6 @@ Symfony is the result of the work of many people who made the code better
  - Danilo Silva
  - Zachary Tong (polyfractal)
  - Hryhorii Hrebiniuk
- - Thomas Perez (scullwm)
  - Dennis Fridrich (dfridrich)
  - hamza
  - dantleech
@@ -865,6 +866,7 @@ Symfony is the result of the work of many people who made the code better
  - Goran Juric
  - Laurent Ghirardotti (laurentg)
  - Nicolas Macherey
+ - AKeeman (akeeman)
  - Lin Clark
  - Jeremy David (jeremy.david)
  - Robin Lehrmann (robinlehrmann)
@@ -1106,6 +1108,7 @@ Symfony is the result of the work of many people who made the code better
  - Max Romanovsky (maxromanovsky)
  - Mathieu Morlon
  - Daniel Tschinder
+ - Alexander Schranz
  - Rafał Muszyński (rafmus90)
  - Timothy Anido (xanido)
  - Rick Prent
@@ -1413,6 +1416,7 @@ Symfony is the result of the work of many people who made the code better
  - Rosio (ben-rosio)
  - Simon Paarlberg (blamh)
  - Jeroen Thora (bolle)
+ - Brieuc THOMAS (brieucthomas)
  - Masao Maeda (brtriver)
  - Darius Leskauskas (darles)
  - David Joos (djoos)
@@ -1442,7 +1446,6 @@ Symfony is the result of the work of many people who made the code better
  - Cyrille Jouineau (tuxosaurus)
  - Yorkie Chadwick (yorkie76)
  - GuillaumeVerdon
- - Yanick Witschi
  - Ondrej Mirtes
  - akimsko
  - Youpie
diff --git a/src/Symfony/Component/DependencyInjection/Container.php b/src/Symfony/Component/DependencyInjection/Container.php
index 0397649a67..6e156919a1 100644
--- a/src/Symfony/Component/DependencyInjection/Container.php
+++ b/src/Symfony/Component/DependencyInjection/Container.php
@@ -253,9 +253,6 @@ class Container implements ResettableContainerInterface
             if (isset($this->privates[$id])) {
                 @trigger_error(sprintf('Requesting the "%s" private service is deprecated since Symfony 3.2 and won\'t be supported anymore in Symfony 4.0.', $id), E_USER_DEPRECATED);
             }
-            if ('service_container' === $id) {
-                return $this;
-            }
             if (isset($this->aliases[$id])) {
                 $id = $this->aliases[$id];
             }
@@ -264,6 +261,9 @@ class Container implements ResettableContainerInterface
             if (isset($this->services[$id])) {
                 return $this->services[$id];
             }
+            if ('service_container' === $id) {
+                return $this;
+            }
 
             if (isset($this->loading[$id])) {
                 throw new ServiceCircularReferenceException($id, array_keys($this->loading));
@@ -326,14 +326,14 @@ class Container implements ResettableContainerInterface
     {
         $id = strtolower($id);
 
-        if ('service_container' === $id) {
-            return false;
-        }
-
         if (isset($this->aliases[$id])) {
             $id = $this->aliases[$id];
         }
 
+        if ('service_container' === $id) {
+            return false;
+        }
+
         return isset($this->services[$id]);
     }
 
diff --git a/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php b/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
index 2b7d0b2a6a..19b1ba17c7 100644
--- a/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
+++ b/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
@@ -1482,6 +1482,10 @@ EOF;
      */
     private function getServiceCall($id, Reference $reference = null)
     {
+        while ($this->container->hasAlias($id)) {
+            $id = (string) $this->container->getAlias($id);
+        }
+
         if ('service_container' === $id) {
             return '$this';
         }
@@ -1495,10 +1499,6 @@ EOF;
             return sprintf('$this->get(\'%s\', ContainerInterface::NULL_ON_INVALID_REFERENCE)', $id);
         }
 
-        if ($this->container->hasAlias($id)) {
-            $id = (string) $this->container->getAlias($id);
-        }
-
         return sprintf('$this->get(\'%s\')', $id);
     }