diff --git a/app/code/Magento/Backend/etc/adminhtml/system.xml b/app/code/Magento/Backend/etc/adminhtml/system.xml
index 65744e56d94ac..c762dbf58de62 100644
--- a/app/code/Magento/Backend/etc/adminhtml/system.xml
+++ b/app/code/Magento/Backend/etc/adminhtml/system.xml
@@ -182,10 +182,6 @@
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                     <comment>Minification is not applied in developer mode.</comment>
                 </field>
-                <field id="move_inline_to_bottom" translate="label" type="select" sortOrder="25" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
-                    <label>Move JS code to the bottom of the page</label>
-                    <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-                </field>
             </group>
             <group id="css" translate="label" type="text" sortOrder="110" showInDefault="1" showInWebsite="1" showInStore="1">
                 <label>CSS Settings</label>
diff --git a/app/code/Magento/Theme/Controller/Result/JsFooterPlugin.php b/app/code/Magento/Theme/Controller/Result/JsFooterPlugin.php
index a234cd589904c..0ca435c506647 100644
--- a/app/code/Magento/Theme/Controller/Result/JsFooterPlugin.php
+++ b/app/code/Magento/Theme/Controller/Result/JsFooterPlugin.php
@@ -14,7 +14,7 @@
  */
 class JsFooterPlugin
 {
-    private const XML_PATH_DEV_MOVE_JS_TO_BOTTOM = 'dev/js/move_inline_to_bottom';
+    private const XML_PATH_DEV_MOVE_JS_TO_BOTTOM = 'dev/js/move_script_to_bottom';
 
     /**
      * @var ScopeConfigInterface
diff --git a/app/code/Magento/Theme/etc/system.xml b/app/code/Magento/Theme/etc/adminhtml/system.xml
similarity index 80%
rename from app/code/Magento/Theme/etc/system.xml
rename to app/code/Magento/Theme/etc/adminhtml/system.xml
index 4abc87e845122..b0d3ba90e8edb 100644
--- a/app/code/Magento/Theme/etc/system.xml
+++ b/app/code/Magento/Theme/etc/adminhtml/system.xml
@@ -8,8 +8,8 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config:etc/system_file.xsd">
     <system>
         <section id="dev" translate="label" type="text" sortOrder="920" showInDefault="1" showInWebsite="1" showInStore="1">
-            <group id="js" translate="label" type="text" sortOrder="100" showInDefault="1" showInWebsite="1" showInStore="1">
-                <field id="move_inline_to_bottom" translate="label" type="select" sortOrder="25" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
+            <group id="js">
+                <field id="move_script_to_bottom" translate="label" type="select" sortOrder="25" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
                     <label>Move JS code to the bottom of the page</label>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                 </field>
diff --git a/app/code/Magento/Theme/etc/config.xml b/app/code/Magento/Theme/etc/config.xml
index 37841789c0e10..f5cc312101fe8 100644
--- a/app/code/Magento/Theme/etc/config.xml
+++ b/app/code/Magento/Theme/etc/config.xml
@@ -68,7 +68,7 @@ Disallow: /*SID=
             </static>
             <dev>
                 <js>
-                    <move_inline_to_bottom>0</move_inline_to_bottom>
+                    <move_script_to_bottom>0</move_script_to_bottom>
                 </js>
             </dev>
         </dev>
diff --git a/dev/tools/UpgradeScripts/pre_composer_update_2.3.php b/dev/tools/UpgradeScripts/pre_composer_update_2.3.php
index 04e64ba45ba0e..3b3f575632124 100644
--- a/dev/tools/UpgradeScripts/pre_composer_update_2.3.php
+++ b/dev/tools/UpgradeScripts/pre_composer_update_2.3.php
@@ -233,12 +233,16 @@
 
     output('\nUpdating "require-dev" section of composer.json');
     runComposer('require --dev ' .
-        'phpunit/phpunit:~6.2.0 ' .
-        'friendsofphp/php-cs-fixer:~2.10.1 ' .
+        'allure-framework/allure-phpunit:~1.2.0 ' .
+        'friendsofphp/php-cs-fixer:~2.13.0 ' .
         'lusitanian/oauth:~0.8.10 ' .
+        'magento/magento-coding-standard:~1.0.0 ' .
+        'magento/magento2-functional-testing-framework:~2.3.14 ' .
         'pdepend/pdepend:2.5.2 ' .
+        'phpunit/phpunit:~6.5.0 ' .
         'sebastian/phpcpd:~3.0.0 ' .
-        'squizlabs/php_codesniffer:3.2.2 --no-update');
+        'squizlabs/php_codesniffer:3.3.1 ' .
+        '--sort-packages --no-update');
     output('');
     runComposer('remove --dev sjparkinson/static-review fabpot/php-cs-fixer --no-update');