diff --git a/typo3/sysext/backend/Classes/Template/DocumentTemplate.php b/typo3/sysext/backend/Classes/Template/DocumentTemplate.php
index d96dbe7d2a9eb4426f30b761e55cf7402bc599c5..ded79e52530cb3df173c341e7d7dd546f803394d 100644
--- a/typo3/sysext/backend/Classes/Template/DocumentTemplate.php
+++ b/typo3/sysext/backend/Classes/Template/DocumentTemplate.php
@@ -800,7 +800,10 @@ function jumpToUrl(URL) {
 			$this->pageRenderer->addJsFile($this->backPath . 'sysext/backend/Resources/Public/JavaScript/tab.js');
 		}
 		// Include the JS for the Context Sensitive Help
-		if ($includeCsh) {
+		// @todo: right now this is a hard dependency on csh manual, as the whole help system should be moved to
+		// the extension. The core provides a API for adding help, and rendering help, but the rendering
+		// should be up to the extension itself
+		if ($includeCsh && ExtensionManagementUtility::isLoaded('cshmanual')) {
 			$this->loadCshJavascript();
 		}
 
diff --git a/typo3/sysext/backend/Classes/Utility/BackendUtility.php b/typo3/sysext/backend/Classes/Utility/BackendUtility.php
index e6a1c930ee451c622eea71b3d9af4dc87338159c..c4094dd8ce87b1d87322b6ab4ff5ef2c3bbe955f 100644
--- a/typo3/sysext/backend/Classes/Utility/BackendUtility.php
+++ b/typo3/sysext/backend/Classes/Utility/BackendUtility.php
@@ -2562,7 +2562,10 @@ class BackendUtility {
 			$helpText = self::helpText($table, $field);
 		}
 		// If there's a help text or some overload information, proceed with preparing an output
-		if (!empty($helpText) || $hasHelpTextOverload) {
+		// @todo: right now this is a hard dependency on csh manual, as the whole help system should be moved to
+		// the extension. The core provides a API for adding help, and rendering help, but the rendering
+		// should be up to the extension itself
+		if ((!empty($helpText) || $hasHelpTextOverload) && ExtensionManagementUtility::isLoaded('cshmanual')) {
 			// If no text was given, just use the regular help icon
 			if ($text == '') {
 				$text = IconUtility::getSpriteIcon('actions-system-help-open');
diff --git a/typo3/sysext/backend/Resources/Public/JavaScript/contexthelp.js b/typo3/sysext/backend/Resources/Public/JavaScript/contexthelp.js
index 8c19b71fb217ea06a7b076701ba4a67b4e8e7c94..52dc1dd99edb30fb035d2b1970770ef30bee76f4 100644
--- a/typo3/sysext/backend/Resources/Public/JavaScript/contexthelp.js
+++ b/typo3/sysext/backend/Resources/Public/JavaScript/contexthelp.js
@@ -16,9 +16,11 @@ Ext.ns('TYPO3', 'TYPO3.CSH.ExtDirect');
 /**
  * Class to show tooltips for links that have the css t3-help-link
  * need the tags data-table and data-field (HTML5)
+ *
+ * @todo #1: rewrite it on jQuery base, or look for great alternatives
+ * @todo #2: make it so flexible that any extension register the JS code in backend.php and the rest should be handled via Data attributes
+ * @private please note that this javascript private API, don't depend on this code nor use it as blueprint
  */
-
-
 TYPO3.ContextHelp = function() {
 
 	/**
diff --git a/typo3/sysext/cshmanual/composer.json b/typo3/sysext/cshmanual/composer.json
index 2ce535b1f79cbce6077f379782d00e695bf91b8f..8b923ba1341cdb091e896afb328424a112d0c36b 100644
--- a/typo3/sysext/cshmanual/composer.json
+++ b/typo3/sysext/cshmanual/composer.json
@@ -15,7 +15,7 @@
 	"extra": {
 		"typo3/cms": {
 			"Package": {
-				"protected": true,
+				"protected": false,
 				"partOfFactoryDefault": true,
 				"partOfMinimalUsableSystem": true
 			}