diff --git a/src/main/java/ca/uhn/fhir/jpa/starter/Application.java b/src/main/java/ca/uhn/fhir/jpa/starter/Application.java
index ea46049..e823d5f 100644
--- a/src/main/java/ca/uhn/fhir/jpa/starter/Application.java
+++ b/src/main/java/ca/uhn/fhir/jpa/starter/Application.java
@@ -1,6 +1,6 @@
 package ca.uhn.fhir.jpa.starter;
 
-import ca.uhn.fhir.jpa.mdm.MdmConfig;
+import ca.uhn.fhir.jpa.starter.mdm.MdmConfig;
 import ca.uhn.fhir.jpa.starter.annotations.OnEitherVersion;
 import ca.uhn.fhir.jpa.subscription.channel.config.SubscriptionChannelConfig;
 import ca.uhn.fhir.jpa.subscription.match.config.SubscriptionProcessorConfig;
@@ -29,6 +29,15 @@ public class Application extends SpringBootServletInitializer {
 
   public static void main(String[] args) {
 
+  	 /*
+  	 * https://github.com/hapifhir/hapi-fhir-jpaserver-starter/issues/246
+  	 * This will be allowed for a short period until we know how MDM should be configured
+  	 * or don't have multiple equal bean instantiations.
+  	 *
+  	 * This will require changes in the main project as stated in the Github comment
+  	 * */
+  	 System.setProperty("spring.main.allow-bean-definition-overriding","true");
+
     System.setProperty("spring.batch.job.enabled", "false");
     SpringApplication.run(Application.class, args);
 
diff --git a/src/main/java/ca/uhn/fhir/jpa/mdm/MdmConfig.java b/src/main/java/ca/uhn/fhir/jpa/starter/mdm/MdmConfig.java
similarity index 89%
rename from src/main/java/ca/uhn/fhir/jpa/mdm/MdmConfig.java
rename to src/main/java/ca/uhn/fhir/jpa/starter/mdm/MdmConfig.java
index be17571..301c883 100644
--- a/src/main/java/ca/uhn/fhir/jpa/mdm/MdmConfig.java
+++ b/src/main/java/ca/uhn/fhir/jpa/starter/mdm/MdmConfig.java
@@ -1,4 +1,4 @@
-package ca.uhn.fhir.jpa.mdm;
+package ca.uhn.fhir.jpa.starter.mdm;
 
 import ca.uhn.fhir.context.FhirContext;
 import ca.uhn.fhir.jpa.mdm.config.MdmConsumerConfig;
@@ -9,6 +9,7 @@ import ca.uhn.fhir.mdm.rules.config.MdmRuleValidator;
 import ca.uhn.fhir.mdm.rules.config.MdmSettings;
 import ca.uhn.fhir.rest.server.util.ISearchParamRegistry;
 import com.google.common.base.Charsets;
+import java.io.IOException;
 import org.apache.commons.io.IOUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
@@ -18,12 +19,6 @@ import org.springframework.context.annotation.Import;
 import org.springframework.core.io.DefaultResourceLoader;
 import org.springframework.core.io.Resource;
 
-import java.io.IOException;
-
-/**
- * TODO: Move this to package "ca.uhn.fhir.jpa.starter" in HAPI FHIR 5.2.0+. The lousy component scan
- * in 5.1.0 picks this up even if MDM is disabled currently.
- */
 @Configuration
 @Conditional(MdmConfigCondition.class)
 @Import({MdmConsumerConfig.class, MdmSubmitterConfig.class})
diff --git a/src/main/java/ca/uhn/fhir/jpa/mdm/MdmConfigCondition.java b/src/main/java/ca/uhn/fhir/jpa/starter/mdm/MdmConfigCondition.java
similarity index 92%
rename from src/main/java/ca/uhn/fhir/jpa/mdm/MdmConfigCondition.java
rename to src/main/java/ca/uhn/fhir/jpa/starter/mdm/MdmConfigCondition.java
index fd2b7bb..a5c7de0 100644
--- a/src/main/java/ca/uhn/fhir/jpa/mdm/MdmConfigCondition.java
+++ b/src/main/java/ca/uhn/fhir/jpa/starter/mdm/MdmConfigCondition.java
@@ -1,4 +1,4 @@
-package ca.uhn.fhir.jpa.mdm;
+package ca.uhn.fhir.jpa.starter.mdm;
 
 import org.springframework.context.annotation.Condition;
 import org.springframework.context.annotation.ConditionContext;
diff --git a/src/main/resources/application.yaml b/src/main/resources/application.yaml
index 005ccb9..ae34a0c 100644
--- a/src/main/resources/application.yaml
+++ b/src/main/resources/application.yaml
@@ -81,6 +81,7 @@ hapi:
 #    filter_search_enabled: true
 #    graphql_enabled: true
 #    narrative_enabled: true
+#    mdm_enabled: true
 #    partitioning:
 #      allow_references_across_partitions: false
 #      partitioning_include_in_search_hashes: false