Merge "Setup: Merge PreConfigSetup into Setup.php"