diff --git a/dspace-api/src/main/java/org/dspace/core/ConfigurationManager.java b/dspace-api/src/main/java/org/dspace/core/ConfigurationManager.java
index bda489ed22..aef3b37540 100644
--- a/dspace-api/src/main/java/org/dspace/core/ConfigurationManager.java
+++ b/dspace-api/src/main/java/org/dspace/core/ConfigurationManager.java
@@ -429,11 +429,11 @@ public class ConfigurationManager
     {
         if ((argv.length == 2) && argv[0].equals("-property"))
         {
-            String val = getProperty(argv[1]);
+            Object val = DSpaceServicesFactory.getInstance().getConfigurationService().getPropertyValue(argv[1]);
 
             if (val != null)
             {
-                System.out.println(val);
+                System.out.println(val.toString());
             }
             else
             {
@@ -445,11 +445,11 @@ public class ConfigurationManager
         else if ((argv.length == 4) && argv[0].equals("-module") &&
                                         argv[2].equals("-property"))
         {
-            String val = getProperty(argv[1], argv[3]);
+            Object val = DSpaceServicesFactory.getInstance().getConfigurationService().getPropertyValue(argv[1] + "." + argv[3]);
 
             if (val != null)
             {
-                System.out.println(val);
+                System.out.println(val.toString());
             }
             else
             {
diff --git a/dspace/config/dspace.cfg b/dspace/config/dspace.cfg
index 5287e8f1e2..b4170b5312 100644
--- a/dspace/config/dspace.cfg
+++ b/dspace/config/dspace.cfg
@@ -2082,8 +2082,10 @@ include = ${module_dir}/authentication-x509.cfg
 include = ${module_dir}/bulkedit.cfg
 include = ${module_dir}/citation-page.cfg
 include = ${module_dir}/clamav.cfg
+include = ${module_dir}/controlpanel.cfg
 include = ${module_dir}/curate.cfg
 include = ${module_dir}/discovery.cfg
+include = ${module_dir}/disseminate-citation.cfg
 include = ${module_dir}/elastic-search-statistics.cfg
 include = ${module_dir}/fetchccdata.cfg
 include = ${module_dir}/google-analytics.cfg
@@ -2100,4 +2102,4 @@ include = ${module_dir}/swordv2-server.cfg
 include = ${module_dir}/translator.cfg
 include = ${module_dir}/usage-statistics.cfg
 include = ${module_dir}/versioning.cfg
-include = ${module_dir}/workflow.cfg
\ No newline at end of file
+include = ${module_dir}/workflow.cfg
diff --git a/dspace/config/modules/controlpanel.cfg b/dspace/config/modules/controlpanel.cfg
index fc13c7cca9..cd52b10cf3 100644
--- a/dspace/config/modules/controlpanel.cfg
+++ b/dspace/config/modules/controlpanel.cfg
@@ -2,17 +2,20 @@
 #------------ADMIN CONTROL PANEL CONFIGURATIONS-----------------#
 #---------------------------------------------------------------#
 
-### Control Panel Tabs
-controlpanel.tabs = Java Information, \
-					Configuration, \
-					SystemWide Alerts, \
-					Harvesting, \
-					Current Activity, \
+### Enabled Control Panel Tabs (one per line)
+### To remove a tab, simply comment out its line
+### To add a tab, define a new Plugin (see below) and add a new "controlpanel.tabs" line to enable
+controlpanel.tabs = Java Information
+controlpanel.tabs = Configuration
+controlpanel.tabs = SystemWide Alerts
+controlpanel.tabs = Harvesting
+controlpanel.tabs = Current Activity
 
-
-plugin.named.org.dspace.app.xmlui.aspect.administrative.controlpanel.ControlPanelTab = \
-		org.dspace.app.xmlui.aspect.administrative.controlpanel.ControlPanelJavaTab = Java Information, \
-		org.dspace.app.xmlui.aspect.administrative.controlpanel.ControlPanelConfigurationTab = Configuration, \
-		org.dspace.app.xmlui.aspect.administrative.controlpanel.ControlPanelAlertsTab = SystemWide Alerts, \
-		org.dspace.app.xmlui.aspect.administrative.controlpanel.ControlPanelHarvestingTab = Harvesting, \
-		org.dspace.app.xmlui.aspect.administrative.controlpanel.ControlPanelCurrentActivityTab = Current Activity, \
+### Define Control Panel Tab Plugins / Names (one per line)
+### These define the names of each Control Panel Tab plugin (names are used to enable/disable the tabs above)
+### New Control Panel Tab plugins may be added by simply adding a new "plugin.named" line below.
+plugin.named.org.dspace.app.xmlui.aspect.administrative.controlpanel.ControlPanelTab = org.dspace.app.xmlui.aspect.administrative.controlpanel.ControlPanelJavaTab = Java Information
+plugin.named.org.dspace.app.xmlui.aspect.administrative.controlpanel.ControlPanelTab = org.dspace.app.xmlui.aspect.administrative.controlpanel.ControlPanelConfigurationTab = Configuration
+plugin.named.org.dspace.app.xmlui.aspect.administrative.controlpanel.ControlPanelTab = org.dspace.app.xmlui.aspect.administrative.controlpanel.ControlPanelAlertsTab = SystemWide Alerts
+plugin.named.org.dspace.app.xmlui.aspect.administrative.controlpanel.ControlPanelTab = org.dspace.app.xmlui.aspect.administrative.controlpanel.ControlPanelHarvestingTab = Harvesting
+plugin.named.org.dspace.app.xmlui.aspect.administrative.controlpanel.ControlPanelTab = org.dspace.app.xmlui.aspect.administrative.controlpanel.ControlPanelCurrentActivityTab = Current Activity