diff --git a/administrator/components/com_modules/forms/module.xml b/administrator/components/com_modules/forms/module.xml
index c6a00dea7e40c..7207d5976e2fd 100644
--- a/administrator/components/com_modules/forms/module.xml
+++ b/administrator/components/com_modules/forms/module.xml
@@ -113,7 +113,7 @@
 			label="COM_MODULES_FIELD_CONTENT_LABEL"
 			buttons="true"
 			filter="\Joomla\CMS\Component\ComponentHelper::filterText"
-			hide="readmore,pagebreak,module"
+			hide="readmore,pagebreak,module,fields"
 		/>
 
 		<field
diff --git a/components/com_config/forms/modules.xml b/components/com_config/forms/modules.xml
index cff9c43e0c20c..15674b2761bce 100644
--- a/components/com_config/forms/modules.xml
+++ b/components/com_config/forms/modules.xml
@@ -118,7 +118,7 @@
 			label="COM_MODULES_FIELD_CONTENT_LABEL"
 			buttons="true"
 			filter="\Joomla\CMS\Component\ComponentHelper::filterText"
-			hide="readmore,pagebreak"
+			hide="readmore,pagebreak,module,fields"
 		/>
 
 		<field
diff --git a/modules/mod_login/tmpl/default.php b/modules/mod_login/tmpl/default.php
index f84dc9c2cef6f..4acacc9544b73 100644
--- a/modules/mod_login/tmpl/default.php
+++ b/modules/mod_login/tmpl/default.php
@@ -60,7 +60,13 @@
                 </div>
             <?php else : ?>
                 <label for="modlgn-passwd-<?php echo $module->id; ?>"><?php echo Text::_('JGLOBAL_PASSWORD'); ?></label>
-                <input id="modlgn-passwd-<?php echo $module->id; ?>" type="password" name="password" autocomplete="current-password" class="form-control" placeholder="<?php echo Text::_('JGLOBAL_PASSWORD'); ?>">
+                <div class="input-group">
+                    <input id="modlgn-passwd-<?php echo $module->id; ?>" type="password" name="password" autocomplete="current-password" class="form-control" placeholder="<?php echo Text::_('JGLOBAL_PASSWORD'); ?>">
+                    <button type="button" class="btn btn-secondary input-password-toggle">
+                        <span class="icon-eye icon-fw" aria-hidden="true"></span>
+                        <span class="visually-hidden"><?php echo Text::_('JSHOWPASSWORD'); ?></span>
+                    </button>
+                </div>
             <?php endif; ?>
         </div>
 
diff --git a/modules/mod_related_items/src/Dispatcher/Dispatcher.php b/modules/mod_related_items/src/Dispatcher/Dispatcher.php
index e5424569329ba..84c525a2fbb20 100644
--- a/modules/mod_related_items/src/Dispatcher/Dispatcher.php
+++ b/modules/mod_related_items/src/Dispatcher/Dispatcher.php
@@ -20,7 +20,7 @@
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
- * Dispatcher class for mod_articles_popular
+ * Dispatcher class for mod_articles_related_items
  *
  * @since  4.4.0
  */
diff --git a/tests/System/entrypoint.sh b/tests/System/entrypoint.sh
index 631c4f0707414..e5046f630b20a 100644
--- a/tests/System/entrypoint.sh
+++ b/tests/System/entrypoint.sh
@@ -21,6 +21,10 @@ chown -R www-data /tests/www/$TEST_GROUP/
 # Required for media manager tests
 chmod -R 777 /tests/www/$TEST_GROUP/images
 
+# Disable opcache for configuration.php, otherwise there are issues when the config is changed in a test
+echo "/tests/www/$TEST_GROUP/configuration.php" > /tmp/blacklist.ini
+echo "opcache.blacklist_filename=/tmp/blacklist.ini" >> /etc/php/*/apache2/conf.d/10-opcache.ini
+
 echo "[RUNNER] Start Apache"
 a2enmod rewrite
 apache2ctl -D FOREGROUND &