diff --git a/typo3/sysext/core/Classes/Core/Bootstrap.php b/typo3/sysext/core/Classes/Core/Bootstrap.php
index 3938098..5510376 100644
--- a/typo3/sysext/core/Classes/Core/Bootstrap.php
+++ b/typo3/sysext/core/Classes/Core/Bootstrap.php
@@ -225,6 +225,10 @@ class Bootstrap {
 	public function loadConfigurationAndInitialize($allowCaching = TRUE, $packageManagerClassName = 'TYPO3\\CMS\\Core\\Package\\PackageManager') {
 		$this->initializeClassLoader()
 			->populateLocalConfiguration();
+		if (!empty($GLOBALS['TYPO3_CONF_VARS']['SYS']['applicationContext'])) {
+			//$this->applicationContext = new ApplicationContext($GLOBALS['TYPO3_CONF_VARS']['SYS']['applicationContext']);
+			//Utility\GeneralUtility::presetApplicationContext($this->applicationContext);
+		}
 		if (!$allowCaching) {
 			$this->disableCoreAndClassesCache();
 		}
diff --git a/typo3/sysext/core/Configuration/DefaultConfiguration.php b/typo3/sysext/core/Configuration/DefaultConfiguration.php
index 74e01d1..5f0fb1a 100644
--- a/typo3/sysext/core/Configuration/DefaultConfiguration.php
+++ b/typo3/sysext/core/Configuration/DefaultConfiguration.php
@@ -116,6 +116,7 @@ return array(
 		'phpTimeZone' => '',					// String: timezone to force for all date() and mktime() functions. A list of supported values can be found at <a href="http://php.net/manual/en/timezones.php" target="_blank">php.net</a>. If this is not set, a valid fallback will be searched for by PHP (php.ini's <a href="http://www.php.net/manual/en/datetime.configuration.php#ini.date.timezone" target="_blank">date.timezone</a> setting, server defaults, etc); and if no fallback is found, the value of "UTC" is used instead.
 		'systemLog' => '',						// <p>String: semi-colon separated list. Defines one or more logging methods. Possible methods:</p><dl><dt>file,&lt;abs-path-to-file&gt;[,&lt;level&gt;]</dt><dd>logs to a file</dd><dt>mail,&lt;to&gt;[/&lt;from&gt;][,&lt;level&gt;]</dt><dd>sends the log entries via mail</dd><dt>syslog,&lt;facility&gt;,[,&lt;level&gt;]</dt><dd>uses the operating system's log. Facility may be one of LOCAL0..LOCAL7, USER (on Windows USER is the only valid type).</dd><dt>error_log[,,&lt;level&gt;]</dt><dd>uses the PHP error log</dd></dl><p>The &lt;level&gt; is the individual logging level (see <a href="#SYS-systemLogLevel">[SYS][systemLogLevel]</a>).</p>
 		'systemLogLevel' => 0,					// <p>Integer (0, 1, 2, 3, 4): Only messages with same or higher severity are logged.</p><ul><li>0: info</li><li>1: notice</li><li>2: warning</li><li>3: error</li><li>4: fatal error</li></ul>
+		'applicationContext' => '',				// String: Define the application context when it cannot be set using Environment Variable TYPO3_CONTEXT. Can be one of either "", "Production", "Development" or "Testing".
 		'enableDeprecationLog' => '',				// If set, this configuration enables the logging of deprecated methods and functions. The following options are allowed: <dl><dt>String: &quot;file&quot; (or integer &quot;1&quot;)</dt><dd>The log file will be written to typo3conf/deprecation_[hash-value].log</dd><dt>String: &quot;devlog&quot;</dt><dd>The log will be written to the development log</dd><dt>String: &quot;console&quot;<dt><dd>The log will be displayed in the Backend's Debug Console.</dd></dl>Logging options &quot;file&quot;, &quot;devlog&quot; and &quot;console&quot; can be combined by comma-separating them.
 		'maxFileNameLength' => 60,				// Integer: This is the maximum file name length. The value will be taken into account by basic file operations like renaming or creation of files and folders.
 		'UTF8filesystem' => FALSE,				// Boolean: If TRUE then TYPO3 uses utf-8 to store file names. This allows for accented Latin letters as well as any other non-latin characters like Cyrillic and Chinese.
diff --git a/typo3/sysext/install/Classes/Configuration/Context/CustomPreset.php b/typo3/sysext/install/Classes/Configuration/Context/CustomPreset.php
index a7c2446..9f14834 100644
--- a/typo3/sysext/install/Classes/Configuration/Context/CustomPreset.php
+++ b/typo3/sysext/install/Classes/Configuration/Context/CustomPreset.php
@@ -37,6 +37,7 @@ class CustomPreset extends Configuration\AbstractCustomPreset implements Configu
 	protected $configurationValues = array(
 		'BE/debug' => '',
 		'FE/debug' => '',
+		'SYS/applicationContext' => '',
 		'SYS/devIPmask' => '',
 		'SYS/displayErrors' => '',
 		'SYS/enableDeprecationLog' => '',
diff --git a/typo3/sysext/install/Classes/Configuration/Context/DevelopmentPreset.php b/typo3/sysext/install/Classes/Configuration/Context/DevelopmentPreset.php
index 2a8bce6..13fb4fa 100644
--- a/typo3/sysext/install/Classes/Configuration/Context/DevelopmentPreset.php
+++ b/typo3/sysext/install/Classes/Configuration/Context/DevelopmentPreset.php
@@ -47,6 +47,7 @@ class DevelopmentPreset extends Configuration\AbstractPreset {
 	protected $configurationValues = array(
 		'BE/debug' => TRUE,
 		'FE/debug' => TRUE,
+		'SYS/applicationContext' => 'Development',
 		'SYS/devIPmask' => '*',
 		'SYS/displayErrors' => TRUE,
 		'SYS/enableDeprecationLog' => 'file',
diff --git a/typo3/sysext/install/Classes/Configuration/Context/ProductionPreset.php b/typo3/sysext/install/Classes/Configuration/Context/ProductionPreset.php
index 7b79153..3087bb6 100644
--- a/typo3/sysext/install/Classes/Configuration/Context/ProductionPreset.php
+++ b/typo3/sysext/install/Classes/Configuration/Context/ProductionPreset.php
@@ -47,6 +47,7 @@ class ProductionPreset extends Configuration\AbstractPreset {
 	protected $configurationValues = array(
 		'BE/debug' => FALSE,
 		'FE/debug' => FALSE,
+		'SYS/applicationContext' => 'Production',
 		'SYS/devIPmask' => '',
 		'SYS/displayErrors' => FALSE,
 		'SYS/enableDeprecationLog' => FALSE,