diff --git a/conf/docker-aio/1prep.sh b/conf/docker-aio/1prep.sh
index a030a8ee250..1dc95f8d45c 100755
--- a/conf/docker-aio/1prep.sh
+++ b/conf/docker-aio/1prep.sh
@@ -4,8 +4,9 @@
 # this was based off the phoenix deployment; and is likely uglier and bulkier than necessary in a perfect world
 
 mkdir -p testdata/doc/sphinx-guides/source/_static/util/
-cp ../solr/7.3.1/schema.xml testdata/
+cp ../solr/7.3.1/schema*.xml testdata/
 cp ../solr/7.3.1/solrconfig.xml testdata/
+cp ../solr/7.3.1/updateSchemaMDB.sh testdata/
 cp ../jhove/jhove.conf testdata/
 cp ../jhove/jhoveConfig.xsd testdata/
 cd ../../
diff --git a/conf/docker-aio/c7.dockerfile b/conf/docker-aio/c7.dockerfile
index 6455121c6bd..7436b73664c 100644
--- a/conf/docker-aio/c7.dockerfile
+++ b/conf/docker-aio/c7.dockerfile
@@ -7,7 +7,7 @@ RUN yum install -y jq lsof awscli
 
 # copy and unpack dependencies (solr, glassfish)
 COPY dv /tmp/dv
-COPY testdata/schema.xml /tmp/dv
+COPY testdata/schema*.xml /tmp/dv/
 COPY testdata/solrconfig.xml /tmp/dv
 
 # ITs need files
@@ -29,7 +29,7 @@ RUN sudo -u postgres /usr/pgsql-9.6/bin/initdb -D /var/lib/pgsql/data
 # copy configuration related files
 RUN cp /tmp/dv/pg_hba.conf /var/lib/pgsql/data/
 RUN cp -r /opt/solr-7.3.1/server/solr/configsets/_default /opt/solr-7.3.1/server/solr/collection1
-RUN cp /tmp/dv/schema.xml /opt/solr-7.3.1/server/solr/collection1/conf/schema.xml
+RUN cp /tmp/dv/schema*.xml /opt/solr-7.3.1/server/solr/collection1/conf/
 RUN cp /tmp/dv/solrconfig.xml /opt/solr-7.3.1/server/solr/collection1/conf/solrconfig.xml
 
 # skipping glassfish user and solr user (run both as root)
@@ -58,6 +58,7 @@ COPY dv/install/ /opt/dv/
 COPY install.bash /opt/dv/
 COPY entrypoint.bash /opt/dv/
 COPY testdata /opt/dv/testdata
+COPY testdata/updateSchemaMDB.sh /opt/dv/testdata/
 COPY testscripts/* /opt/dv/testdata/
 COPY setupIT.bash /opt/dv
 WORKDIR /opt/dv
diff --git a/conf/solr/7.3.1/schema.xml b/conf/solr/7.3.1/schema.xml
index deabc789e2e..fd307a32f07 100644
--- a/conf/solr/7.3.1/schema.xml
+++ b/conf/solr/7.3.1/schema.xml
@@ -220,236 +220,9 @@
 
     <field name="dsPersistentId" type="text_en" multiValued="false" stored="true" indexed="true"/>
     <field name="filePersistentId" type="text_en" multiValued="false" stored="true" indexed="true"/>
+    
     <!-- Dynamic Dataverse fields from http://localhost:8080/api/admin/index/solr/schema -->
-    <field name="ARCS1" type="text_en" multiValued="false" stored="true" indexed="true"/>
-    <field name="ARCS2" type="text_en" multiValued="false" stored="true" indexed="true"/>
-    <field name="ARCS3" type="text_en" multiValued="false" stored="true" indexed="true"/>
-    <field name="ARCS4" type="text_en" multiValued="false" stored="true" indexed="true"/>
-    <field name="ARCS5" type="text_en" multiValued="false" stored="true" indexed="true"/>
-    <field name="PSRI1" type="text_en" multiValued="false" stored="true" indexed="true"/>
-    <field name="PSRI10" type="text_en" multiValued="false" stored="true" indexed="true"/>
-    <field name="PSRI11" type="text_en" multiValued="false" stored="true" indexed="true"/>
-    <field name="PSRI2" type="text_en" multiValued="false" stored="true" indexed="true"/>
-    <field name="PSRI3" type="text_en" multiValued="false" stored="true" indexed="true"/>
-    <field name="PSRI4" type="text_en" multiValued="false" stored="true" indexed="true"/>
-    <field name="PSRI5" type="text_en" multiValued="false" stored="true" indexed="true"/>
-    <field name="PSRI6" type="text_en" multiValued="false" stored="true" indexed="true"/>
-    <field name="PSRI7" type="text_en" multiValued="false" stored="true" indexed="true"/>
-    <field name="PSRI8" type="text_en" multiValued="false" stored="true" indexed="true"/>
-    <field name="PSRI9" type="text_en" multiValued="false" stored="true" indexed="true"/>
-    <field name="accessToSources" type="text_en" multiValued="false" stored="true" indexed="true"/>
-    <field name="actionsToMinimizeLoss" type="text_en" multiValued="false" stored="true" indexed="true"/>
-    <field name="alternativeTitle" type="text_en" multiValued="false" stored="true" indexed="true"/>
-    <field name="alternativeURL" type="text_en" multiValued="false" stored="true" indexed="true"/>
-    <field name="astroFacility" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="astroInstrument" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="astroObject" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="astroType" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="author" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="authorAffiliation" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="authorIdentifier" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="authorIdentifierScheme" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="authorName" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="characteristicOfSources" type="text_en" multiValued="false" stored="true" indexed="true"/>
-    <field name="city" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="classificationSchemaCHIA" type="text_en" multiValued="false" stored="true" indexed="true"/>
-    <field name="cleaningOperations" type="text_en" multiValued="false" stored="true" indexed="true"/>
-    <field name="collectionMode" type="text_en" multiValued="false" stored="true" indexed="true"/>
-    <field name="collectorTraining" type="text_en" multiValued="false" stored="true" indexed="true"/>
-    <field name="contributor" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="contributorName" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="contributorType" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="controlOperations" type="text_en" multiValued="false" stored="true" indexed="true"/>
-    <field name="country" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="coverage.Depth" type="text_en" multiValued="false" stored="true" indexed="true"/>
-    <field name="coverage.ObjectCount" type="text_en" multiValued="false" stored="true" indexed="true"/>
-    <field name="coverage.ObjectDensity" type="text_en" multiValued="false" stored="true" indexed="true"/>
-    <field name="coverage.Polarization" type="text_en" multiValued="false" stored="true" indexed="true"/>
-    <field name="coverage.Redshift.MaximumValue" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="coverage.Redshift.MinimumValue" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="coverage.RedshiftValue" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="coverage.SkyFraction" type="text_en" multiValued="false" stored="true" indexed="true"/>
-    <field name="coverage.Spatial" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="coverage.Spectral.Bandpass" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="coverage.Spectral.CentralWavelength" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="coverage.Spectral.MaximumWavelength" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="coverage.Spectral.MinimumWavelength" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="coverage.Spectral.Wavelength" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="coverage.Temporal" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="coverage.Temporal.StartTime" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="coverage.Temporal.StopTime" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="dataCollectionSituation" type="text_en" multiValued="false" stored="true" indexed="true"/>
-    <field name="dataCollector" type="text_en" multiValued="false" stored="true" indexed="true"/>
-    <field name="dataSources" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="datadePublicao" type="text_en" multiValued="false" stored="true" indexed="true"/>
-    <field name="datasetContact" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="datasetContactAffiliation" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="datasetContactEmail" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="datasetContactName" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="datasetLevelErrorNotes" type="text_en" multiValued="false" stored="true" indexed="true"/>
-    <field name="dateOfCollection" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="dateOfCollectionEnd" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="dateOfCollectionStart" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="dateOfDeposit" type="text_en" multiValued="false" stored="true" indexed="true"/>
-    <field name="datesAdditionalInformationCHIA" type="text_en" multiValued="false" stored="true" indexed="true"/>
-    <field name="depositor" type="text_en" multiValued="false" stored="true" indexed="true"/>
-    <field name="deviationsFromSampleDesign" type="text_en" multiValued="false" stored="true" indexed="true"/>
-    <field name="distributionDate" type="text_en" multiValued="false" stored="true" indexed="true"/>
-    <field name="distributor" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="distributorAbbreviation" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="distributorAffiliation" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="distributorLogoURL" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="distributorName" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="distributorURL" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="dsDescription" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="dsDescriptionDate" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="dsDescriptionValue" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="eastLongitude" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="frequencyOfDataCollection" type="text_en" multiValued="false" stored="true" indexed="true"/>
-    <field name="geographicBoundingBox" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="geographicCoverage" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="geographicUnit" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="grantNumber" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="grantNumberAgency" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="grantNumberValue" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="gsdAccreditation" type="text_en" multiValued="false" stored="true" indexed="true"/>
-    <field name="gsdCoordinator" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="gsdCourseName" type="text_en" multiValued="false" stored="true" indexed="true"/>
-    <field name="gsdFacultyName" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="gsdPrizes" type="text_en" multiValued="false" stored="true" indexed="true"/>
-    <field name="gsdProgramBrief" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="gsdRecommendation" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="gsdSemester" type="text_en" multiValued="false" stored="true" indexed="true"/>
-    <field name="gsdSiteType" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="gsdStudentName" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="gsdStudentProgram" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="gsdTags" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="gsdTypes" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="hbgdkiAnthropometry" type="text_en" multiValued="false" stored="true" indexed="true"/>
-    <field name="hbgdkiBiosampleType" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="hbgdkiBirthWeight" type="text_en" multiValued="false" stored="true" indexed="true"/>
-    <field name="hbgdkiFeedingCare" type="text_en" multiValued="false" stored="true" indexed="true"/>
-    <field name="hbgdkiGestationalAge" type="text_en" multiValued="false" stored="true" indexed="true"/>
-    <field name="hbgdkiImmunizations" type="text_en" multiValued="false" stored="true" indexed="true"/>
-    <field name="hbgdkiInfantChildhoodMorbidity" type="text_en" multiValued="false" stored="true" indexed="true"/>
-    <field name="hbgdkiIntervention" type="text_en" multiValued="false" stored="true" indexed="true"/>
-    <field name="hbgdkiLowerLimitAge" type="text_en" multiValued="false" stored="true" indexed="true"/>
-    <field name="hbgdkiMaternalChar" type="text_en" multiValued="false" stored="true" indexed="true"/>
-    <field name="hbgdkiNeurocognitiveDev" type="text_en" multiValued="false" stored="true" indexed="true"/>
-    <field name="hbgdkiOther" type="text_en" multiValued="false" stored="true" indexed="true"/>
-    <field name="hbgdkiPregnancyBirth" type="text_en" multiValued="false" stored="true" indexed="true"/>
-    <field name="hbgdkiSocioeconomicChar" type="text_en" multiValued="false" stored="true" indexed="true"/>
-    <field name="hbgdkiStudyName" type="text_en" multiValued="false" stored="true" indexed="true"/>
-    <field name="hbgdkiStudyRegistry" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="hbgdkiStudyRegistryNumber" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="hbgdkiStudyRegistryType" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="hbgdkiStudyType" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="hbgdkiUnitsLowerLimitAge" type="text_en" multiValued="false" stored="true" indexed="true"/>
-    <field name="hbgdkiUnitsUpperLimitAge" type="text_en" multiValued="false" stored="true" indexed="true"/>
-    <field name="hbgdkiUpperLimitAge" type="text_en" multiValued="false" stored="true" indexed="true"/>
-    <field name="hbgdkiWaterSanHygiene" type="text_en" multiValued="false" stored="true" indexed="true"/>
-    <field name="journalArticleType" type="text_en" multiValued="false" stored="true" indexed="true"/>
-    <field name="journalIssue" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="journalPubDate" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="journalVolume" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="journalVolumeIssue" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="keyword" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="keywordValue" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="keywordVocabulary" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="keywordVocabularyURI" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="kindOfData" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="language" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="localdePublicao" type="text_en" multiValued="false" stored="true" indexed="true"/>
-    <field name="mraCollection" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="northLongitude" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="notesText" type="text_en" multiValued="false" stored="true" indexed="true"/>
-    <field name="numero" type="text_en" multiValued="false" stored="true" indexed="true"/>
-    <field name="originOfSources" type="text_en" multiValued="false" stored="true" indexed="true"/>
-    <field name="otherDataAppraisal" type="text_en" multiValued="false" stored="true" indexed="true"/>
-    <field name="otherGeographicCoverage" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="otherId" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="otherIdAgency" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="otherIdValue" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="otherReferences" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="producer" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="producerAbbreviation" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="producerAffiliation" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="producerLogoURL" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="producerName" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="producerURL" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="productionDate" type="text_en" multiValued="false" stored="true" indexed="true"/>
-    <field name="productionPlace" type="text_en" multiValued="false" stored="true" indexed="true"/>
-    <field name="proprietrio" type="text_en" multiValued="false" stored="true" indexed="true"/>
-    <field name="provenanceCHIA" type="text_en" multiValued="false" stored="true" indexed="true"/>
-    <field name="psiBehavior" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="psiDonor" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="psiHealthArea" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="psiIntervention" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="psiPopulation" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="psiProductsServices" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="psiStudyDesignElement" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="psiStudyType" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="publication" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="publicationCitation" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="publicationIDNumber" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="publicationIDType" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="publicationURL" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="redshiftType" type="text_en" multiValued="false" stored="true" indexed="true"/>
-    <field name="relatedDatasets" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="relatedMaterial" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="researchInstrument" type="text_en" multiValued="false" stored="true" indexed="true"/>
-    <field name="resolution.Redshift" type="text_en" multiValued="false" stored="true" indexed="true"/>
-    <field name="resolution.Spatial" type="text_en" multiValued="false" stored="true" indexed="true"/>
-    <field name="resolution.Spectral" type="text_en" multiValued="false" stored="true" indexed="true"/>
-    <field name="resolution.Temporal" type="text_en" multiValued="false" stored="true" indexed="true"/>
-    <field name="responseRate" type="text_en" multiValued="false" stored="true" indexed="true"/>
-    <field name="rightsAvailabilityCHIA" type="text_en" multiValued="false" stored="true" indexed="true"/>
-    <field name="samplingErrorEstimates" type="text_en" multiValued="false" stored="true" indexed="true"/>
-    <field name="samplingProcedure" type="text_en" multiValued="false" stored="true" indexed="true"/>
-    <field name="series" type="text_en" multiValued="false" stored="true" indexed="true"/>
-    <field name="seriesInformation" type="text_en" multiValued="false" stored="true" indexed="true"/>
-    <field name="seriesName" type="text_en" multiValued="false" stored="true" indexed="true"/>
-    <field name="socialScienceNotes" type="text_en" multiValued="false" stored="true" indexed="true"/>
-    <field name="socialScienceNotesSubject" type="text_en" multiValued="false" stored="true" indexed="true"/>
-    <field name="socialScienceNotesText" type="text_en" multiValued="false" stored="true" indexed="true"/>
-    <field name="socialScienceNotesType" type="text_en" multiValued="false" stored="true" indexed="true"/>
-    <field name="software" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="softwareName" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="softwareVersion" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="sourceCHIA" type="text_en" multiValued="false" stored="true" indexed="true"/>
-    <field name="southLongitude" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="state" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="studyAssayCellType" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="studyAssayMeasurementType" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="studyAssayOrganism" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="studyAssayOtherMeasurmentType" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="studyAssayOtherOrganism" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="studyAssayPlatform" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="studyAssayTechnologyType" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="studyDesignType" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="studyFactorType" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="subject" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="subtitle" type="text_en" multiValued="false" stored="true" indexed="true"/>
-    <field name="targetSampleActualSize" type="text_en" multiValued="false" stored="true" indexed="true"/>
-    <field name="targetSampleSize" type="text_en" multiValued="false" stored="true" indexed="true"/>
-    <field name="targetSampleSizeFormula" type="text_en" multiValued="false" stored="true" indexed="true"/>
-    <field name="timeMethod" type="text_en" multiValued="false" stored="true" indexed="true"/>
-    <field name="timePeriodCovered" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="timePeriodCoveredEnd" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="timePeriodCoveredStart" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="title" type="text_en" multiValued="false" stored="true" indexed="true"/>
-    <field name="titulo" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="topicClassValue" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="topicClassVocab" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="topicClassVocabURI" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="topicClassification" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="unitOfAnalysis" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="universe" type="text_en" multiValued="true" stored="true" indexed="true"/>
-    <field name="variablesCHIA" type="text_en" multiValued="false" stored="true" indexed="true"/>
-    <field name="weighting" type="text_en" multiValued="false" stored="true" indexed="true"/>
-    <field name="westLongitude" type="text_en" multiValued="true" stored="true" indexed="true"/>
-
-
+    <xi:include href="schema_dv_mdb_fields.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
 
     <copyField source="description" dest="_text_" maxChars="3000"/>
 
@@ -506,233 +279,8 @@
     <!-- <copyField source="*_i" dest="_text_" maxChars="3000"/> -->
 
     <!-- Dataverse copyField from http://localhost:8080/api/admin/index/solr/schema -->
-    <copyField source="ARCS1" dest="_text_" maxChars="3000"/>
-    <copyField source="ARCS2" dest="_text_" maxChars="3000"/>
-    <copyField source="ARCS3" dest="_text_" maxChars="3000"/>
-    <copyField source="ARCS4" dest="_text_" maxChars="3000"/>
-    <copyField source="ARCS5" dest="_text_" maxChars="3000"/>
-    <copyField source="PSRI1" dest="_text_" maxChars="3000"/>
-    <copyField source="PSRI10" dest="_text_" maxChars="3000"/>
-    <copyField source="PSRI11" dest="_text_" maxChars="3000"/>
-    <copyField source="PSRI2" dest="_text_" maxChars="3000"/>
-    <copyField source="PSRI3" dest="_text_" maxChars="3000"/>
-    <copyField source="PSRI4" dest="_text_" maxChars="3000"/>
-    <copyField source="PSRI5" dest="_text_" maxChars="3000"/>
-    <copyField source="PSRI6" dest="_text_" maxChars="3000"/>
-    <copyField source="PSRI7" dest="_text_" maxChars="3000"/>
-    <copyField source="PSRI8" dest="_text_" maxChars="3000"/>
-    <copyField source="PSRI9" dest="_text_" maxChars="3000"/>
-    <copyField source="accessToSources" dest="_text_" maxChars="3000"/>
-    <copyField source="actionsToMinimizeLoss" dest="_text_" maxChars="3000"/>
-    <copyField source="alternativeTitle" dest="_text_" maxChars="3000"/>
-    <copyField source="alternativeURL" dest="_text_" maxChars="3000"/>
-    <copyField source="astroFacility" dest="_text_" maxChars="3000"/>
-    <copyField source="astroInstrument" dest="_text_" maxChars="3000"/>
-    <copyField source="astroObject" dest="_text_" maxChars="3000"/>
-    <copyField source="astroType" dest="_text_" maxChars="3000"/>
-    <copyField source="author" dest="_text_" maxChars="3000"/>
-    <copyField source="authorAffiliation" dest="_text_" maxChars="3000"/>
-    <copyField source="authorIdentifier" dest="_text_" maxChars="3000"/>
-    <copyField source="authorIdentifierScheme" dest="_text_" maxChars="3000"/>
-    <copyField source="authorName" dest="_text_" maxChars="3000"/>
-    <copyField source="characteristicOfSources" dest="_text_" maxChars="3000"/>
-    <copyField source="city" dest="_text_" maxChars="3000"/>
-    <copyField source="classificationSchemaCHIA" dest="_text_" maxChars="3000"/>
-    <copyField source="cleaningOperations" dest="_text_" maxChars="3000"/>
-    <copyField source="collectionMode" dest="_text_" maxChars="3000"/>
-    <copyField source="collectorTraining" dest="_text_" maxChars="3000"/>
-    <copyField source="contributor" dest="_text_" maxChars="3000"/>
-    <copyField source="contributorName" dest="_text_" maxChars="3000"/>
-    <copyField source="contributorType" dest="_text_" maxChars="3000"/>
-    <copyField source="controlOperations" dest="_text_" maxChars="3000"/>
-    <copyField source="country" dest="_text_" maxChars="3000"/>
-    <copyField source="coverage.Depth" dest="_text_" maxChars="3000"/>
-    <copyField source="coverage.ObjectCount" dest="_text_" maxChars="3000"/>
-    <copyField source="coverage.ObjectDensity" dest="_text_" maxChars="3000"/>
-    <copyField source="coverage.Polarization" dest="_text_" maxChars="3000"/>
-    <copyField source="coverage.Redshift.MaximumValue" dest="_text_" maxChars="3000"/>
-    <copyField source="coverage.Redshift.MinimumValue" dest="_text_" maxChars="3000"/>
-    <copyField source="coverage.RedshiftValue" dest="_text_" maxChars="3000"/>
-    <copyField source="coverage.SkyFraction" dest="_text_" maxChars="3000"/>
-    <copyField source="coverage.Spatial" dest="_text_" maxChars="3000"/>
-    <copyField source="coverage.Spectral.Bandpass" dest="_text_" maxChars="3000"/>
-    <copyField source="coverage.Spectral.CentralWavelength" dest="_text_" maxChars="3000"/>
-    <copyField source="coverage.Spectral.MaximumWavelength" dest="_text_" maxChars="3000"/>
-    <copyField source="coverage.Spectral.MinimumWavelength" dest="_text_" maxChars="3000"/>
-    <copyField source="coverage.Spectral.Wavelength" dest="_text_" maxChars="3000"/>
-    <copyField source="coverage.Temporal" dest="_text_" maxChars="3000"/>
-    <copyField source="coverage.Temporal.StartTime" dest="_text_" maxChars="3000"/>
-    <copyField source="coverage.Temporal.StopTime" dest="_text_" maxChars="3000"/>
-    <copyField source="dataCollectionSituation" dest="_text_" maxChars="3000"/>
-    <copyField source="dataCollector" dest="_text_" maxChars="3000"/>
-    <copyField source="dataSources" dest="_text_" maxChars="3000"/>
-    <copyField source="datadePublicao" dest="_text_" maxChars="3000"/>
-    <copyField source="datasetContact" dest="_text_" maxChars="3000"/>
-    <copyField source="datasetContactAffiliation" dest="_text_" maxChars="3000"/>
-    <copyField source="datasetContactEmail" dest="_text_" maxChars="3000"/>
-    <copyField source="datasetContactName" dest="_text_" maxChars="3000"/>
-    <copyField source="datasetLevelErrorNotes" dest="_text_" maxChars="3000"/>
-    <copyField source="dateOfCollection" dest="_text_" maxChars="3000"/>
-    <copyField source="dateOfCollectionEnd" dest="_text_" maxChars="3000"/>
-    <copyField source="dateOfCollectionStart" dest="_text_" maxChars="3000"/>
-    <copyField source="dateOfDeposit" dest="_text_" maxChars="3000"/>
-    <copyField source="datesAdditionalInformationCHIA" dest="_text_" maxChars="3000"/>
-    <copyField source="depositor" dest="_text_" maxChars="3000"/>
-    <copyField source="deviationsFromSampleDesign" dest="_text_" maxChars="3000"/>
-    <copyField source="distributionDate" dest="_text_" maxChars="3000"/>
-    <copyField source="distributor" dest="_text_" maxChars="3000"/>
-    <copyField source="distributorAbbreviation" dest="_text_" maxChars="3000"/>
-    <copyField source="distributorAffiliation" dest="_text_" maxChars="3000"/>
-    <copyField source="distributorLogoURL" dest="_text_" maxChars="3000"/>
-    <copyField source="distributorName" dest="_text_" maxChars="3000"/>
-    <copyField source="distributorURL" dest="_text_" maxChars="3000"/>
-    <copyField source="dsDescription" dest="_text_" maxChars="3000"/>
-    <copyField source="dsDescriptionDate" dest="_text_" maxChars="3000"/>
-    <copyField source="dsDescriptionValue" dest="_text_" maxChars="3000"/>
-    <copyField source="eastLongitude" dest="_text_" maxChars="3000"/>
-    <copyField source="frequencyOfDataCollection" dest="_text_" maxChars="3000"/>
-    <copyField source="geographicBoundingBox" dest="_text_" maxChars="3000"/>
-    <copyField source="geographicCoverage" dest="_text_" maxChars="3000"/>
-    <copyField source="geographicUnit" dest="_text_" maxChars="3000"/>
-    <copyField source="grantNumber" dest="_text_" maxChars="3000"/>
-    <copyField source="grantNumberAgency" dest="_text_" maxChars="3000"/>
-    <copyField source="grantNumberValue" dest="_text_" maxChars="3000"/>
-    <copyField source="gsdAccreditation" dest="_text_" maxChars="3000"/>
-    <copyField source="gsdCoordinator" dest="_text_" maxChars="3000"/>
-    <copyField source="gsdCourseName" dest="_text_" maxChars="3000"/>
-    <copyField source="gsdFacultyName" dest="_text_" maxChars="3000"/>
-    <copyField source="gsdPrizes" dest="_text_" maxChars="3000"/>
-    <copyField source="gsdProgramBrief" dest="_text_" maxChars="3000"/>
-    <copyField source="gsdRecommendation" dest="_text_" maxChars="3000"/>
-    <copyField source="gsdSemester" dest="_text_" maxChars="3000"/>
-    <copyField source="gsdSiteType" dest="_text_" maxChars="3000"/>
-    <copyField source="gsdStudentName" dest="_text_" maxChars="3000"/>
-    <copyField source="gsdStudentProgram" dest="_text_" maxChars="3000"/>
-    <copyField source="gsdTags" dest="_text_" maxChars="3000"/>
-    <copyField source="gsdTypes" dest="_text_" maxChars="3000"/>
-    <copyField source="hbgdkiAnthropometry" dest="_text_" maxChars="3000"/>
-    <copyField source="hbgdkiBiosampleType" dest="_text_" maxChars="3000"/>
-    <copyField source="hbgdkiBirthWeight" dest="_text_" maxChars="3000"/>
-    <copyField source="hbgdkiFeedingCare" dest="_text_" maxChars="3000"/>
-    <copyField source="hbgdkiGestationalAge" dest="_text_" maxChars="3000"/>
-    <copyField source="hbgdkiImmunizations" dest="_text_" maxChars="3000"/>
-    <copyField source="hbgdkiInfantChildhoodMorbidity" dest="_text_" maxChars="3000"/>
-    <copyField source="hbgdkiIntervention" dest="_text_" maxChars="3000"/>
-    <copyField source="hbgdkiLowerLimitAge" dest="_text_" maxChars="3000"/>
-    <copyField source="hbgdkiMaternalChar" dest="_text_" maxChars="3000"/>
-    <copyField source="hbgdkiNeurocognitiveDev" dest="_text_" maxChars="3000"/>
-    <copyField source="hbgdkiOther" dest="_text_" maxChars="3000"/>
-    <copyField source="hbgdkiPregnancyBirth" dest="_text_" maxChars="3000"/>
-    <copyField source="hbgdkiSocioeconomicChar" dest="_text_" maxChars="3000"/>
-    <copyField source="hbgdkiStudyName" dest="_text_" maxChars="3000"/>
-    <copyField source="hbgdkiStudyRegistry" dest="_text_" maxChars="3000"/>
-    <copyField source="hbgdkiStudyRegistryNumber" dest="_text_" maxChars="3000"/>
-    <copyField source="hbgdkiStudyRegistryType" dest="_text_" maxChars="3000"/>
-    <copyField source="hbgdkiStudyType" dest="_text_" maxChars="3000"/>
-    <copyField source="hbgdkiUnitsLowerLimitAge" dest="_text_" maxChars="3000"/>
-    <copyField source="hbgdkiUnitsUpperLimitAge" dest="_text_" maxChars="3000"/>
-    <copyField source="hbgdkiUpperLimitAge" dest="_text_" maxChars="3000"/>
-    <copyField source="hbgdkiWaterSanHygiene" dest="_text_" maxChars="3000"/>
-    <copyField source="journalArticleType" dest="_text_" maxChars="3000"/>
-    <copyField source="journalIssue" dest="_text_" maxChars="3000"/>
-    <copyField source="journalPubDate" dest="_text_" maxChars="3000"/>
-    <copyField source="journalVolume" dest="_text_" maxChars="3000"/>
-    <copyField source="journalVolumeIssue" dest="_text_" maxChars="3000"/>
-    <copyField source="keyword" dest="_text_" maxChars="3000"/>
-    <copyField source="keywordValue" dest="_text_" maxChars="3000"/>
-    <copyField source="keywordVocabulary" dest="_text_" maxChars="3000"/>
-    <copyField source="keywordVocabularyURI" dest="_text_" maxChars="3000"/>
-    <copyField source="kindOfData" dest="_text_" maxChars="3000"/>
-    <copyField source="language" dest="_text_" maxChars="3000"/>
-    <copyField source="localdePublicao" dest="_text_" maxChars="3000"/>
-    <copyField source="mraCollection" dest="_text_" maxChars="3000"/>
-    <copyField source="northLongitude" dest="_text_" maxChars="3000"/>
-    <copyField source="notesText" dest="_text_" maxChars="3000"/>
-    <copyField source="numero" dest="_text_" maxChars="3000"/>
-    <copyField source="originOfSources" dest="_text_" maxChars="3000"/>
-    <copyField source="otherDataAppraisal" dest="_text_" maxChars="3000"/>
-    <copyField source="otherGeographicCoverage" dest="_text_" maxChars="3000"/>
-    <copyField source="otherId" dest="_text_" maxChars="3000"/>
-    <copyField source="otherIdAgency" dest="_text_" maxChars="3000"/>
-    <copyField source="otherIdValue" dest="_text_" maxChars="3000"/>
-    <copyField source="otherReferences" dest="_text_" maxChars="3000"/>
-    <copyField source="producer" dest="_text_" maxChars="3000"/>
-    <copyField source="producerAbbreviation" dest="_text_" maxChars="3000"/>
-    <copyField source="producerAffiliation" dest="_text_" maxChars="3000"/>
-    <copyField source="producerLogoURL" dest="_text_" maxChars="3000"/>
-    <copyField source="producerName" dest="_text_" maxChars="3000"/>
-    <copyField source="producerURL" dest="_text_" maxChars="3000"/>
-    <copyField source="productionDate" dest="_text_" maxChars="3000"/>
-    <copyField source="productionPlace" dest="_text_" maxChars="3000"/>
-    <copyField source="proprietrio" dest="_text_" maxChars="3000"/>
-    <copyField source="provenanceCHIA" dest="_text_" maxChars="3000"/>
-    <copyField source="psiBehavior" dest="_text_" maxChars="3000"/>
-    <copyField source="psiDonor" dest="_text_" maxChars="3000"/>
-    <copyField source="psiHealthArea" dest="_text_" maxChars="3000"/>
-    <copyField source="psiIntervention" dest="_text_" maxChars="3000"/>
-    <copyField source="psiPopulation" dest="_text_" maxChars="3000"/>
-    <copyField source="psiProductsServices" dest="_text_" maxChars="3000"/>
-    <copyField source="psiStudyDesignElement" dest="_text_" maxChars="3000"/>
-    <copyField source="psiStudyType" dest="_text_" maxChars="3000"/>
-    <copyField source="publication" dest="_text_" maxChars="3000"/>
-    <copyField source="publicationCitation" dest="_text_" maxChars="3000"/>
-    <copyField source="publicationIDNumber" dest="_text_" maxChars="3000"/>
-    <copyField source="publicationIDType" dest="_text_" maxChars="3000"/>
-    <copyField source="publicationURL" dest="_text_" maxChars="3000"/>
-    <copyField source="redshiftType" dest="_text_" maxChars="3000"/>
-    <copyField source="relatedDatasets" dest="_text_" maxChars="3000"/>
-    <copyField source="relatedMaterial" dest="_text_" maxChars="3000"/>
-    <copyField source="researchInstrument" dest="_text_" maxChars="3000"/>
-    <copyField source="resolution.Redshift" dest="_text_" maxChars="3000"/>
-    <copyField source="resolution.Spatial" dest="_text_" maxChars="3000"/>
-    <copyField source="resolution.Spectral" dest="_text_" maxChars="3000"/>
-    <copyField source="resolution.Temporal" dest="_text_" maxChars="3000"/>
-    <copyField source="responseRate" dest="_text_" maxChars="3000"/>
-    <copyField source="rightsAvailabilityCHIA" dest="_text_" maxChars="3000"/>
-    <copyField source="samplingErrorEstimates" dest="_text_" maxChars="3000"/>
-    <copyField source="samplingProcedure" dest="_text_" maxChars="3000"/>
-    <copyField source="series" dest="_text_" maxChars="3000"/>
-    <copyField source="seriesInformation" dest="_text_" maxChars="3000"/>
-    <copyField source="seriesName" dest="_text_" maxChars="3000"/>
-    <copyField source="socialScienceNotes" dest="_text_" maxChars="3000"/>
-    <copyField source="socialScienceNotesSubject" dest="_text_" maxChars="3000"/>
-    <copyField source="socialScienceNotesText" dest="_text_" maxChars="3000"/>
-    <copyField source="socialScienceNotesType" dest="_text_" maxChars="3000"/>
-    <copyField source="software" dest="_text_" maxChars="3000"/>
-    <copyField source="softwareName" dest="_text_" maxChars="3000"/>
-    <copyField source="softwareVersion" dest="_text_" maxChars="3000"/>
-    <copyField source="sourceCHIA" dest="_text_" maxChars="3000"/>
-    <copyField source="southLongitude" dest="_text_" maxChars="3000"/>
-    <copyField source="state" dest="_text_" maxChars="3000"/>
-    <copyField source="studyAssayCellType" dest="_text_" maxChars="3000"/>
-    <copyField source="studyAssayMeasurementType" dest="_text_" maxChars="3000"/>
-    <copyField source="studyAssayOrganism" dest="_text_" maxChars="3000"/>
-    <copyField source="studyAssayOtherMeasurmentType" dest="_text_" maxChars="3000"/>
-    <copyField source="studyAssayOtherOrganism" dest="_text_" maxChars="3000"/>
-    <copyField source="studyAssayPlatform" dest="_text_" maxChars="3000"/>
-    <copyField source="studyAssayTechnologyType" dest="_text_" maxChars="3000"/>
-    <copyField source="studyDesignType" dest="_text_" maxChars="3000"/>
-    <copyField source="studyFactorType" dest="_text_" maxChars="3000"/>
-    <copyField source="subject" dest="_text_" maxChars="3000"/>
-    <copyField source="subtitle" dest="_text_" maxChars="3000"/>
-    <copyField source="targetSampleActualSize" dest="_text_" maxChars="3000"/>
-    <copyField source="targetSampleSize" dest="_text_" maxChars="3000"/>
-    <copyField source="targetSampleSizeFormula" dest="_text_" maxChars="3000"/>
-    <copyField source="timeMethod" dest="_text_" maxChars="3000"/>
-    <copyField source="timePeriodCovered" dest="_text_" maxChars="3000"/>
-    <copyField source="timePeriodCoveredEnd" dest="_text_" maxChars="3000"/>
-    <copyField source="timePeriodCoveredStart" dest="_text_" maxChars="3000"/>
-    <copyField source="title" dest="_text_" maxChars="3000"/>
-    <copyField source="titulo" dest="_text_" maxChars="3000"/>
-    <copyField source="topicClassValue" dest="_text_" maxChars="3000"/>
-    <copyField source="topicClassVocab" dest="_text_" maxChars="3000"/>
-    <copyField source="topicClassVocabURI" dest="_text_" maxChars="3000"/>
-    <copyField source="topicClassification" dest="_text_" maxChars="3000"/>
-    <copyField source="unitOfAnalysis" dest="_text_" maxChars="3000"/>
-    <copyField source="universe" dest="_text_" maxChars="3000"/>
-    <copyField source="variablesCHIA" dest="_text_" maxChars="3000"/>
-    <copyField source="weighting" dest="_text_" maxChars="3000"/>
-    <copyField source="westLongitude" dest="_text_" maxChars="3000"/>
+    <xi:include href="schema_dv_mdb_copies.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+    
 <!-- End: Dataverse Specific -->
     
     <!-- This can be enabled, in case the client does not know what fields may be searched. It isn't enabled by default
diff --git a/conf/solr/7.3.1/schema_dv_mdb_copies.xml b/conf/solr/7.3.1/schema_dv_mdb_copies.xml
new file mode 100644
index 00000000000..0208fdf3910
--- /dev/null
+++ b/conf/solr/7.3.1/schema_dv_mdb_copies.xml
@@ -0,0 +1,157 @@
+<schema>
+    <copyField source="accessToSources" dest="_text_" maxChars="3000"/>
+    <copyField source="actionsToMinimizeLoss" dest="_text_" maxChars="3000"/>
+    <copyField source="alternativeTitle" dest="_text_" maxChars="3000"/>
+    <copyField source="alternativeURL" dest="_text_" maxChars="3000"/>
+    <copyField source="astroFacility" dest="_text_" maxChars="3000"/>
+    <copyField source="astroInstrument" dest="_text_" maxChars="3000"/>
+    <copyField source="astroObject" dest="_text_" maxChars="3000"/>
+    <copyField source="astroType" dest="_text_" maxChars="3000"/>
+    <copyField source="author" dest="_text_" maxChars="3000"/>
+    <copyField source="authorAffiliation" dest="_text_" maxChars="3000"/>
+    <copyField source="authorIdentifier" dest="_text_" maxChars="3000"/>
+    <copyField source="authorIdentifierScheme" dest="_text_" maxChars="3000"/>
+    <copyField source="authorName" dest="_text_" maxChars="3000"/>
+    <copyField source="characteristicOfSources" dest="_text_" maxChars="3000"/>
+    <copyField source="city" dest="_text_" maxChars="3000"/>
+    <copyField source="cleaningOperations" dest="_text_" maxChars="3000"/>
+    <copyField source="collectionMode" dest="_text_" maxChars="3000"/>
+    <copyField source="collectorTraining" dest="_text_" maxChars="3000"/>
+    <copyField source="contributor" dest="_text_" maxChars="3000"/>
+    <copyField source="contributorName" dest="_text_" maxChars="3000"/>
+    <copyField source="contributorType" dest="_text_" maxChars="3000"/>
+    <copyField source="controlOperations" dest="_text_" maxChars="3000"/>
+    <copyField source="country" dest="_text_" maxChars="3000"/>
+    <copyField source="coverage.Depth" dest="_text_" maxChars="3000"/>
+    <copyField source="coverage.ObjectCount" dest="_text_" maxChars="3000"/>
+    <copyField source="coverage.ObjectDensity" dest="_text_" maxChars="3000"/>
+    <copyField source="coverage.Polarization" dest="_text_" maxChars="3000"/>
+    <copyField source="coverage.Redshift.MaximumValue" dest="_text_" maxChars="3000"/>
+    <copyField source="coverage.Redshift.MinimumValue" dest="_text_" maxChars="3000"/>
+    <copyField source="coverage.RedshiftValue" dest="_text_" maxChars="3000"/>
+    <copyField source="coverage.SkyFraction" dest="_text_" maxChars="3000"/>
+    <copyField source="coverage.Spatial" dest="_text_" maxChars="3000"/>
+    <copyField source="coverage.Spectral.Bandpass" dest="_text_" maxChars="3000"/>
+    <copyField source="coverage.Spectral.CentralWavelength" dest="_text_" maxChars="3000"/>
+    <copyField source="coverage.Spectral.MaximumWavelength" dest="_text_" maxChars="3000"/>
+    <copyField source="coverage.Spectral.MinimumWavelength" dest="_text_" maxChars="3000"/>
+    <copyField source="coverage.Spectral.Wavelength" dest="_text_" maxChars="3000"/>
+    <copyField source="coverage.Temporal" dest="_text_" maxChars="3000"/>
+    <copyField source="coverage.Temporal.StartTime" dest="_text_" maxChars="3000"/>
+    <copyField source="coverage.Temporal.StopTime" dest="_text_" maxChars="3000"/>
+    <copyField source="dataCollectionSituation" dest="_text_" maxChars="3000"/>
+    <copyField source="dataCollector" dest="_text_" maxChars="3000"/>
+    <copyField source="dataSources" dest="_text_" maxChars="3000"/>
+    <copyField source="datasetContact" dest="_text_" maxChars="3000"/>
+    <copyField source="datasetContactAffiliation" dest="_text_" maxChars="3000"/>
+    <copyField source="datasetContactEmail" dest="_text_" maxChars="3000"/>
+    <copyField source="datasetContactName" dest="_text_" maxChars="3000"/>
+    <copyField source="datasetLevelErrorNotes" dest="_text_" maxChars="3000"/>
+    <copyField source="dateOfCollection" dest="_text_" maxChars="3000"/>
+    <copyField source="dateOfCollectionEnd" dest="_text_" maxChars="3000"/>
+    <copyField source="dateOfCollectionStart" dest="_text_" maxChars="3000"/>
+    <copyField source="dateOfDeposit" dest="_text_" maxChars="3000"/>
+    <copyField source="depositor" dest="_text_" maxChars="3000"/>
+    <copyField source="deviationsFromSampleDesign" dest="_text_" maxChars="3000"/>
+    <copyField source="distributionDate" dest="_text_" maxChars="3000"/>
+    <copyField source="distributor" dest="_text_" maxChars="3000"/>
+    <copyField source="distributorAbbreviation" dest="_text_" maxChars="3000"/>
+    <copyField source="distributorAffiliation" dest="_text_" maxChars="3000"/>
+    <copyField source="distributorLogoURL" dest="_text_" maxChars="3000"/>
+    <copyField source="distributorName" dest="_text_" maxChars="3000"/>
+    <copyField source="distributorURL" dest="_text_" maxChars="3000"/>
+    <copyField source="dsDescription" dest="_text_" maxChars="3000"/>
+    <copyField source="dsDescriptionDate" dest="_text_" maxChars="3000"/>
+    <copyField source="dsDescriptionValue" dest="_text_" maxChars="3000"/>
+    <copyField source="eastLongitude" dest="_text_" maxChars="3000"/>
+    <copyField source="frequencyOfDataCollection" dest="_text_" maxChars="3000"/>
+    <copyField source="geographicBoundingBox" dest="_text_" maxChars="3000"/>
+    <copyField source="geographicCoverage" dest="_text_" maxChars="3000"/>
+    <copyField source="geographicUnit" dest="_text_" maxChars="3000"/>
+    <copyField source="grantNumber" dest="_text_" maxChars="3000"/>
+    <copyField source="grantNumberAgency" dest="_text_" maxChars="3000"/>
+    <copyField source="grantNumberValue" dest="_text_" maxChars="3000"/>
+    <copyField source="journalArticleType" dest="_text_" maxChars="3000"/>
+    <copyField source="journalIssue" dest="_text_" maxChars="3000"/>
+    <copyField source="journalPubDate" dest="_text_" maxChars="3000"/>
+    <copyField source="journalVolume" dest="_text_" maxChars="3000"/>
+    <copyField source="journalVolumeIssue" dest="_text_" maxChars="3000"/>
+    <copyField source="keyword" dest="_text_" maxChars="3000"/>
+    <copyField source="keywordValue" dest="_text_" maxChars="3000"/>
+    <copyField source="keywordVocabulary" dest="_text_" maxChars="3000"/>
+    <copyField source="keywordVocabularyURI" dest="_text_" maxChars="3000"/>
+    <copyField source="kindOfData" dest="_text_" maxChars="3000"/>
+    <copyField source="language" dest="_text_" maxChars="3000"/>
+    <copyField source="northLongitude" dest="_text_" maxChars="3000"/>
+    <copyField source="notesText" dest="_text_" maxChars="3000"/>
+    <copyField source="originOfSources" dest="_text_" maxChars="3000"/>
+    <copyField source="otherDataAppraisal" dest="_text_" maxChars="3000"/>
+    <copyField source="otherGeographicCoverage" dest="_text_" maxChars="3000"/>
+    <copyField source="otherId" dest="_text_" maxChars="3000"/>
+    <copyField source="otherIdAgency" dest="_text_" maxChars="3000"/>
+    <copyField source="otherIdValue" dest="_text_" maxChars="3000"/>
+    <copyField source="otherReferences" dest="_text_" maxChars="3000"/>
+    <copyField source="producer" dest="_text_" maxChars="3000"/>
+    <copyField source="producerAbbreviation" dest="_text_" maxChars="3000"/>
+    <copyField source="producerAffiliation" dest="_text_" maxChars="3000"/>
+    <copyField source="producerLogoURL" dest="_text_" maxChars="3000"/>
+    <copyField source="producerName" dest="_text_" maxChars="3000"/>
+    <copyField source="producerURL" dest="_text_" maxChars="3000"/>
+    <copyField source="productionDate" dest="_text_" maxChars="3000"/>
+    <copyField source="productionPlace" dest="_text_" maxChars="3000"/>
+    <copyField source="publication" dest="_text_" maxChars="3000"/>
+    <copyField source="publicationCitation" dest="_text_" maxChars="3000"/>
+    <copyField source="publicationIDNumber" dest="_text_" maxChars="3000"/>
+    <copyField source="publicationIDType" dest="_text_" maxChars="3000"/>
+    <copyField source="publicationURL" dest="_text_" maxChars="3000"/>
+    <copyField source="redshiftType" dest="_text_" maxChars="3000"/>
+    <copyField source="relatedDatasets" dest="_text_" maxChars="3000"/>
+    <copyField source="relatedMaterial" dest="_text_" maxChars="3000"/>
+    <copyField source="researchInstrument" dest="_text_" maxChars="3000"/>
+    <copyField source="resolution.Redshift" dest="_text_" maxChars="3000"/>
+    <copyField source="resolution.Spatial" dest="_text_" maxChars="3000"/>
+    <copyField source="resolution.Spectral" dest="_text_" maxChars="3000"/>
+    <copyField source="resolution.Temporal" dest="_text_" maxChars="3000"/>
+    <copyField source="responseRate" dest="_text_" maxChars="3000"/>
+    <copyField source="samplingErrorEstimates" dest="_text_" maxChars="3000"/>
+    <copyField source="samplingProcedure" dest="_text_" maxChars="3000"/>
+    <copyField source="series" dest="_text_" maxChars="3000"/>
+    <copyField source="seriesInformation" dest="_text_" maxChars="3000"/>
+    <copyField source="seriesName" dest="_text_" maxChars="3000"/>
+    <copyField source="socialScienceNotes" dest="_text_" maxChars="3000"/>
+    <copyField source="socialScienceNotesSubject" dest="_text_" maxChars="3000"/>
+    <copyField source="socialScienceNotesText" dest="_text_" maxChars="3000"/>
+    <copyField source="socialScienceNotesType" dest="_text_" maxChars="3000"/>
+    <copyField source="software" dest="_text_" maxChars="3000"/>
+    <copyField source="softwareName" dest="_text_" maxChars="3000"/>
+    <copyField source="softwareVersion" dest="_text_" maxChars="3000"/>
+    <copyField source="southLongitude" dest="_text_" maxChars="3000"/>
+    <copyField source="state" dest="_text_" maxChars="3000"/>
+    <copyField source="studyAssayCellType" dest="_text_" maxChars="3000"/>
+    <copyField source="studyAssayMeasurementType" dest="_text_" maxChars="3000"/>
+    <copyField source="studyAssayOrganism" dest="_text_" maxChars="3000"/>
+    <copyField source="studyAssayOtherMeasurmentType" dest="_text_" maxChars="3000"/>
+    <copyField source="studyAssayOtherOrganism" dest="_text_" maxChars="3000"/>
+    <copyField source="studyAssayPlatform" dest="_text_" maxChars="3000"/>
+    <copyField source="studyAssayTechnologyType" dest="_text_" maxChars="3000"/>
+    <copyField source="studyDesignType" dest="_text_" maxChars="3000"/>
+    <copyField source="studyFactorType" dest="_text_" maxChars="3000"/>
+    <copyField source="subject" dest="_text_" maxChars="3000"/>
+    <copyField source="subtitle" dest="_text_" maxChars="3000"/>
+    <copyField source="targetSampleActualSize" dest="_text_" maxChars="3000"/>
+    <copyField source="targetSampleSize" dest="_text_" maxChars="3000"/>
+    <copyField source="targetSampleSizeFormula" dest="_text_" maxChars="3000"/>
+    <copyField source="timeMethod" dest="_text_" maxChars="3000"/>
+    <copyField source="timePeriodCovered" dest="_text_" maxChars="3000"/>
+    <copyField source="timePeriodCoveredEnd" dest="_text_" maxChars="3000"/>
+    <copyField source="timePeriodCoveredStart" dest="_text_" maxChars="3000"/>
+    <copyField source="title" dest="_text_" maxChars="3000"/>
+    <copyField source="topicClassValue" dest="_text_" maxChars="3000"/>
+    <copyField source="topicClassVocab" dest="_text_" maxChars="3000"/>
+    <copyField source="topicClassVocabURI" dest="_text_" maxChars="3000"/>
+    <copyField source="topicClassification" dest="_text_" maxChars="3000"/>
+    <copyField source="unitOfAnalysis" dest="_text_" maxChars="3000"/>
+    <copyField source="universe" dest="_text_" maxChars="3000"/>
+    <copyField source="weighting" dest="_text_" maxChars="3000"/>
+    <copyField source="westLongitude" dest="_text_" maxChars="3000"/>
+</schema>
\ No newline at end of file
diff --git a/conf/solr/7.3.1/schema_dv_mdb_fields.xml b/conf/solr/7.3.1/schema_dv_mdb_fields.xml
new file mode 100644
index 00000000000..6caa7c6de69
--- /dev/null
+++ b/conf/solr/7.3.1/schema_dv_mdb_fields.xml
@@ -0,0 +1,157 @@
+<fields>
+    <field name="accessToSources" type="text_en" multiValued="false" stored="true" indexed="true"/>
+    <field name="actionsToMinimizeLoss" type="text_en" multiValued="false" stored="true" indexed="true"/>
+    <field name="alternativeTitle" type="text_en" multiValued="false" stored="true" indexed="true"/>
+    <field name="alternativeURL" type="text_en" multiValued="false" stored="true" indexed="true"/>
+    <field name="astroFacility" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="astroInstrument" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="astroObject" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="astroType" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="author" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="authorAffiliation" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="authorIdentifier" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="authorIdentifierScheme" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="authorName" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="characteristicOfSources" type="text_en" multiValued="false" stored="true" indexed="true"/>
+    <field name="city" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="cleaningOperations" type="text_en" multiValued="false" stored="true" indexed="true"/>
+    <field name="collectionMode" type="text_en" multiValued="false" stored="true" indexed="true"/>
+    <field name="collectorTraining" type="text_en" multiValued="false" stored="true" indexed="true"/>
+    <field name="contributor" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="contributorName" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="contributorType" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="controlOperations" type="text_en" multiValued="false" stored="true" indexed="true"/>
+    <field name="country" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="coverage.Depth" type="text_en" multiValued="false" stored="true" indexed="true"/>
+    <field name="coverage.ObjectCount" type="text_en" multiValued="false" stored="true" indexed="true"/>
+    <field name="coverage.ObjectDensity" type="text_en" multiValued="false" stored="true" indexed="true"/>
+    <field name="coverage.Polarization" type="text_en" multiValued="false" stored="true" indexed="true"/>
+    <field name="coverage.Redshift.MaximumValue" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="coverage.Redshift.MinimumValue" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="coverage.RedshiftValue" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="coverage.SkyFraction" type="text_en" multiValued="false" stored="true" indexed="true"/>
+    <field name="coverage.Spatial" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="coverage.Spectral.Bandpass" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="coverage.Spectral.CentralWavelength" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="coverage.Spectral.MaximumWavelength" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="coverage.Spectral.MinimumWavelength" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="coverage.Spectral.Wavelength" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="coverage.Temporal" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="coverage.Temporal.StartTime" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="coverage.Temporal.StopTime" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="dataCollectionSituation" type="text_en" multiValued="false" stored="true" indexed="true"/>
+    <field name="dataCollector" type="text_en" multiValued="false" stored="true" indexed="true"/>
+    <field name="dataSources" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="datasetContact" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="datasetContactAffiliation" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="datasetContactEmail" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="datasetContactName" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="datasetLevelErrorNotes" type="text_en" multiValued="false" stored="true" indexed="true"/>
+    <field name="dateOfCollection" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="dateOfCollectionEnd" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="dateOfCollectionStart" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="dateOfDeposit" type="text_en" multiValued="false" stored="true" indexed="true"/>
+    <field name="depositor" type="text_en" multiValued="false" stored="true" indexed="true"/>
+    <field name="deviationsFromSampleDesign" type="text_en" multiValued="false" stored="true" indexed="true"/>
+    <field name="distributionDate" type="text_en" multiValued="false" stored="true" indexed="true"/>
+    <field name="distributor" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="distributorAbbreviation" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="distributorAffiliation" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="distributorLogoURL" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="distributorName" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="distributorURL" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="dsDescription" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="dsDescriptionDate" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="dsDescriptionValue" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="eastLongitude" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="frequencyOfDataCollection" type="text_en" multiValued="false" stored="true" indexed="true"/>
+    <field name="geographicBoundingBox" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="geographicCoverage" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="geographicUnit" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="grantNumber" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="grantNumberAgency" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="grantNumberValue" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="journalArticleType" type="text_en" multiValued="false" stored="true" indexed="true"/>
+    <field name="journalIssue" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="journalPubDate" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="journalVolume" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="journalVolumeIssue" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="keyword" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="keywordValue" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="keywordVocabulary" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="keywordVocabularyURI" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="kindOfData" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="language" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="northLongitude" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="notesText" type="text_en" multiValued="false" stored="true" indexed="true"/>
+    <field name="originOfSources" type="text_en" multiValued="false" stored="true" indexed="true"/>
+    <field name="otherDataAppraisal" type="text_en" multiValued="false" stored="true" indexed="true"/>
+    <field name="otherGeographicCoverage" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="otherId" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="otherIdAgency" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="otherIdValue" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="otherReferences" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="producer" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="producerAbbreviation" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="producerAffiliation" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="producerLogoURL" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="producerName" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="producerURL" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="productionDate" type="text_en" multiValued="false" stored="true" indexed="true"/>
+    <field name="productionPlace" type="text_en" multiValued="false" stored="true" indexed="true"/>
+    <field name="publication" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="publicationCitation" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="publicationIDNumber" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="publicationIDType" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="publicationURL" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="redshiftType" type="text_en" multiValued="false" stored="true" indexed="true"/>
+    <field name="relatedDatasets" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="relatedMaterial" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="researchInstrument" type="text_en" multiValued="false" stored="true" indexed="true"/>
+    <field name="resolution.Redshift" type="text_en" multiValued="false" stored="true" indexed="true"/>
+    <field name="resolution.Spatial" type="text_en" multiValued="false" stored="true" indexed="true"/>
+    <field name="resolution.Spectral" type="text_en" multiValued="false" stored="true" indexed="true"/>
+    <field name="resolution.Temporal" type="text_en" multiValued="false" stored="true" indexed="true"/>
+    <field name="responseRate" type="text_en" multiValued="false" stored="true" indexed="true"/>
+    <field name="samplingErrorEstimates" type="text_en" multiValued="false" stored="true" indexed="true"/>
+    <field name="samplingProcedure" type="text_en" multiValued="false" stored="true" indexed="true"/>
+    <field name="series" type="text_en" multiValued="false" stored="true" indexed="true"/>
+    <field name="seriesInformation" type="text_en" multiValued="false" stored="true" indexed="true"/>
+    <field name="seriesName" type="text_en" multiValued="false" stored="true" indexed="true"/>
+    <field name="socialScienceNotes" type="text_en" multiValued="false" stored="true" indexed="true"/>
+    <field name="socialScienceNotesSubject" type="text_en" multiValued="false" stored="true" indexed="true"/>
+    <field name="socialScienceNotesText" type="text_en" multiValued="false" stored="true" indexed="true"/>
+    <field name="socialScienceNotesType" type="text_en" multiValued="false" stored="true" indexed="true"/>
+    <field name="software" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="softwareName" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="softwareVersion" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="southLongitude" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="state" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="studyAssayCellType" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="studyAssayMeasurementType" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="studyAssayOrganism" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="studyAssayOtherMeasurmentType" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="studyAssayOtherOrganism" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="studyAssayPlatform" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="studyAssayTechnologyType" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="studyDesignType" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="studyFactorType" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="subject" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="subtitle" type="text_en" multiValued="false" stored="true" indexed="true"/>
+    <field name="targetSampleActualSize" type="text_en" multiValued="false" stored="true" indexed="true"/>
+    <field name="targetSampleSize" type="text_en" multiValued="false" stored="true" indexed="true"/>
+    <field name="targetSampleSizeFormula" type="text_en" multiValued="false" stored="true" indexed="true"/>
+    <field name="timeMethod" type="text_en" multiValued="false" stored="true" indexed="true"/>
+    <field name="timePeriodCovered" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="timePeriodCoveredEnd" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="timePeriodCoveredStart" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="title" type="text_en" multiValued="false" stored="true" indexed="true"/>
+    <field name="topicClassValue" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="topicClassVocab" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="topicClassVocabURI" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="topicClassification" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="unitOfAnalysis" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="universe" type="text_en" multiValued="true" stored="true" indexed="true"/>
+    <field name="weighting" type="text_en" multiValued="false" stored="true" indexed="true"/>
+    <field name="westLongitude" type="text_en" multiValued="true" stored="true" indexed="true"/>
+</fields>
\ No newline at end of file
diff --git a/conf/solr/7.3.1/updateSchemaMDB.sh b/conf/solr/7.3.1/updateSchemaMDB.sh
new file mode 100755
index 00000000000..e4446083442
--- /dev/null
+++ b/conf/solr/7.3.1/updateSchemaMDB.sh
@@ -0,0 +1,79 @@
+#!/bin/sh
+set -euo pipefail
+
+# This script updates the <field> and <copyField> schema configuration necessary to properly
+# index custom metadata fields in Solr.
+# 1. Retrieve from Dataverse API endpoint
+# 2. Parse and write Solr schema files (which might replace the included files)
+# 3. Reload Solr
+#
+# List of variables:
+# ${DATAVERSE_URL}: URL to Dataverse. Defaults to http://localhost:8080
+# ${SOLR_URL}: URL to Solr. Defaults to http://localhost:8983
+# ${UNBLOCK_KEY}: File path to secret or unblock key as string. Only necessary on k8s or when you secured your installation.
+# ${TARGET}: Directory where to write the XML files. Defaults to /tmp
+#
+# Programs used (need to be available on your PATH):
+# coreutils: mktemp, csplit
+# curl
+
+usage() {
+  echo "usage: updateSchemaMDB.sh [options]"
+  echo "options:"
+  echo "    -d <url>      Dataverse URL, defaults to http://localhost:8080"
+  echo "    -h            Show this help text"
+  echo "    -s <url>      Solr URL, defaults to http://localhost:8983"
+  echo "    -t <path>     Directory where to write the XML files. Defaults to /tmp"
+  echo "    -u <key/file> Dataverse unblock key either as key string or path to keyfile"
+}
+
+### Init (with sane defaults)
+DATAVERSE_URL=${DATAVERSE_URL:-"http://localhost:8080"}
+SOLR_URL=${SOLR_URL:-"http://localhost:8983"}
+TARGET=${TARGET:-"/tmp"}
+UNBLOCK_KEY=${UNBLOCK_KEY:-""}
+
+# if cmdline args are given, override any env var setting (or defaults)
+while getopts ":d:hs:t:u:" opt
+do
+   case $opt in
+       d) DATAVERSE_URL=${OPTARG};;
+       h) usage; exit 0;;
+       s) SOLR_URL=${OPTARG};;
+       t) TARGET=${OPTARG};;
+       u) UNBLOCK_KEY=${OPTARG};;
+       :) echo "Missing option argument for -${OPTARG}. Use -h for help." >&2; exit 1;;
+      \?) echo "Unknown option -${OPTARG}." >&2; usage; exit 1;;
+   esac
+done
+
+# Special handling of unblock key depending on referencing a secret file or key in var
+if [ ! -z "${UNBLOCK_KEY}" ]; then
+  if [ -f "${UNBLOCK_KEY}" ]; then
+    UNBLOCK_KEY="?unblock-key=$(cat ${UNBLOCK_KEY})"
+  else
+    UNBLOCK_KEY="?unblock-key=${UNBLOCK_KEY}"
+  fi
+fi
+
+### Retrieval
+echo "Retrieve schema data from ${DATAVERSE_URL}/api/admin/index/solr/schema"
+TMPFILE=`mktemp`
+curl -f -sS "${DATAVERSE_URL}/api/admin/index/solr/schema${UNBLOCK_KEY}" > $TMPFILE
+
+### Processing
+echo "Writing ${TARGET}/schema_dv_mdb_fields.xml"
+echo "<fields>" > ${TARGET}/schema_dv_mdb_fields.xml
+cat ${TMPFILE} | grep ".*<field" >> ${TARGET}/schema_dv_mdb_fields.xml
+echo "</fields>" >> ${TARGET}/schema_dv_mdb_fields.xml
+
+echo "Writing ${TARGET}/schema_dv_mdb_copies.xml"
+echo "<schema>" > ${TARGET}/schema_dv_mdb_copies.xml
+cat ${TMPFILE} | grep ".*<copyField" >> ${TARGET}/schema_dv_mdb_copies.xml
+echo "</schema>" >> ${TARGET}/schema_dv_mdb_copies.xml
+
+rm ${TMPFILE}*
+
+### Reloading
+echo "Triggering Solr RELOAD at ${SOLR_URL}/solr/admin/cores?action=RELOAD&core=collection1"
+curl -f -sS "${SOLR_URL}/solr/admin/cores?action=RELOAD&core=collection1"
\ No newline at end of file
diff --git a/doc/release-notes/6142-flex-solr-schema.md b/doc/release-notes/6142-flex-solr-schema.md
new file mode 100644
index 00000000000..24fe9c6a3f8
--- /dev/null
+++ b/doc/release-notes/6142-flex-solr-schema.md
@@ -0,0 +1,15 @@
+### Upgrading: optionally reconfigure Solr
+
+With this release, we moved all fields in Solr search index that relate to the default metadata schemas from `schema.xml` to separate
+files. Custom metadata block configuration of the search index can be more easily automated that way. For details, 
+see admin/metadatacustomization.html#updating-the-solr-schema.
+
+This is optional, but all future changes will go to these files. It might be a good idea to reconfigure Solr now or be aware to
+look for changes to these files in the future, too. Here's how:
+
+1. You will need to replace or modify your `schema.xml` with the recent one (containing XML includes)
+2. Copy `schema_dv_mdb_fields.xml` and `schema_dv_mdb_copies.xml` to the same location as the `schema.xml`
+3. A re-index is not necessary as long no other changes happened, as this is only a reorganization of Solr fields from a single schema.xml file into multiple files.
+
+In case you use custom metadata blocks, you might find the new `updateSchemaMDB.sh` script beneficial. Again,
+see admin/metadatacustomization.html#updating-the-solr-schema.
diff --git a/doc/sphinx-guides/source/admin/metadatacustomization.rst b/doc/sphinx-guides/source/admin/metadatacustomization.rst
index 85145be95cf..1a41d329b3b 100644
--- a/doc/sphinx-guides/source/admin/metadatacustomization.rst
+++ b/doc/sphinx-guides/source/admin/metadatacustomization.rst
@@ -593,10 +593,31 @@ Running a curl command like "load" example above should make the new custom meta
 Updating the Solr Schema
 ~~~~~~~~~~~~~~~~~~~~~~~~
 
-Once you have enabled a new metadata block you should be able to see the new fields in the GUI but before you can save the dataset, you must add additional fields to your Solr schema. You should run the following curl command to have Dataverse output the "field name" and "copyField" elements for all the metadata fields that have been loaded into Dataverse:
+Once you have enabled a new metadata block you should be able to see the new fields in the GUI but before you can save
+the dataset, you must add additional fields to your Solr schema.
+
+An API endpoint of Dataverse provides you with a generated set of all fields that need to be added to the Solr schema
+configuration, including any enabled metadata schemas:
 
 ``curl http://localhost:8080/api/admin/index/solr/schema``
 
+For convenience and automation you can download and consider running :download:`updateSchemaMDB.sh <../../../../conf/solr/7.3.1/updateSchemaMDB.sh>`. It uses the API endpoint above and writes schema files to the filesystem (so be sure to run it on the Solr server itself as the Unix user who owns the Solr files) and then triggers a Solr reload.
+
+By default, it will download from Dataverse at `http://localhost:8080` and reload Solr at `http://localhost:8983`.
+You may use the following environment variables with this script or mix'n'match with options:
+
+====================  ======  ===============================================  =========================================================
+Environment variable  Option  Description                                      Example
+====================  ======  ===============================================  =========================================================
+`DATAVERSE_URL`       `-d`    Provide the URL to your Dataverse installation   *http://localhost:8080*
+`SOLR_URL`            `-s`    Provide the URL to your Solr instance            *http://localhost:8983*
+`UNBLOCK_KEY`         `-u`    If your installation has a blocked admin API     *xyz* or */secrets/unblock.key*
+                              endpoint, you can provide either the key itself
+                              or a path to a keyfile
+`TARGET`              `-t`    Provide the config directory of your Solr core   */usr/local/solr/solr-7.3.1/server/solr/collection1/conf*
+                              "collection1"
+====================  ======  ===============================================  =========================================================
+
 See the :doc:`/installation/prerequisites/` section of the Installation Guide for a suggested location on disk for the Solr schema file.
 
 Please note that if you are going to make a pull request updating ``conf/solr/7.3.1/schema.xml`` with fields you have added, you should first load all the custom metadata blocks in ``scripts/api/data/metadatablocks`` (including ones you don't care about) to create a complete list of fields.
diff --git a/doc/sphinx-guides/source/developers/dev-environment.rst b/doc/sphinx-guides/source/developers/dev-environment.rst
index 33d27584b60..82b2f0bcc56 100755
--- a/doc/sphinx-guides/source/developers/dev-environment.rst
+++ b/doc/sphinx-guides/source/developers/dev-environment.rst
@@ -151,7 +151,11 @@ To install Solr, execute the following commands:
 
 ``curl -O https://raw.githubusercontent.com/IQSS/dataverse/develop/conf/solr/7.3.1/schema.xml``
 
-``mv schema.xml collection1/conf``
+``curl -O https://raw.githubusercontent.com/IQSS/dataverse/develop/conf/solr/7.3.1/schema_dv_mdb_fields.xml``
+
+``curl -O https://raw.githubusercontent.com/IQSS/dataverse/develop/conf/solr/7.3.1/schema_dv_mdb_copies.xml``
+
+``mv schema*.xml collection1/conf``
 
 ``curl -O https://raw.githubusercontent.com/IQSS/dataverse/develop/conf/solr/7.3.1/solrconfig.xml``
 
diff --git a/doc/sphinx-guides/source/developers/tips.rst b/doc/sphinx-guides/source/developers/tips.rst
index f03ee8df2e1..9084f3d1993 100755
--- a/doc/sphinx-guides/source/developers/tips.rst
+++ b/doc/sphinx-guides/source/developers/tips.rst
@@ -129,6 +129,9 @@ By default, Glassfish reports analytics information. The administration guide su
 Solr
 ----
 
+.. TODO: This section should be moved into a dedicated guide about Solr for developers. It should be extended with
+         information about the way Solr is used within Dataverse, ideally explaining concepts and links to upstream docs.
+
 Once some dataverses, datasets, and files have been created and indexed, you can experiment with searches directly from Solr at http://localhost:8983/solr/#/collection1/query and look at the JSON output of searches, such as this wildcard search: http://localhost:8983/solr/collection1/select?q=*%3A*&wt=json&indent=true . You can also get JSON output of static fields Solr knows about: http://localhost:8983/solr/collection1/schema/fields
 
 You can simply double-click "start.jar" rather that running ``java -jar start.jar`` from the command line. Figuring out how to stop Solr after double-clicking it is an exercise for the reader.
diff --git a/doc/sphinx-guides/source/developers/troubleshooting.rst b/doc/sphinx-guides/source/developers/troubleshooting.rst
index 2f03e7b34d4..ec49b442016 100755
--- a/doc/sphinx-guides/source/developers/troubleshooting.rst
+++ b/doc/sphinx-guides/source/developers/troubleshooting.rst
@@ -92,7 +92,7 @@ If you have an old copy of the database and old Solr data and want to start fres
 - drop your old database
 - clear out your existing Solr index: ``scripts/search/clear``
 - run the installer script above - it will create the db, deploy the app, populate the db with reference data and run all the scripts that create the domain metadata fields. You no longer need to perform these steps separately.
-- confirm you are using the latest Dataverse-specific Solr schema.xml
+- confirm you are using the latest Dataverse-specific Solr schema.xml and included XML files (schema_dv_cmb_[copies|fields].xml)
 - confirm http://localhost:8080 is up
 - If you want to set some dataset-specific facets, go to the root dataverse (or any dataverse; the selections can be inherited) and click "General Information" and make choices under "Select Facets". There is a ticket to automate this: https://github.com/IQSS/dataverse/issues/619
 
diff --git a/doc/sphinx-guides/source/installation/prerequisites.rst b/doc/sphinx-guides/source/installation/prerequisites.rst
index 3e63a48c8e9..0d3c9a26177 100644
--- a/doc/sphinx-guides/source/installation/prerequisites.rst
+++ b/doc/sphinx-guides/source/installation/prerequisites.rst
@@ -206,7 +206,7 @@ Become the ``solr`` user and then download and configure Solr::
 
 You should already have a "dvinstall.zip" file that you downloaded from https://github.com/IQSS/dataverse/releases . Unzip it into ``/tmp``. Then copy the files into place::
 
-        cp /tmp/dvinstall/schema.xml /usr/local/solr/solr-7.3.1/server/solr/collection1/conf
+        cp /tmp/dvinstall/schema*.xml /usr/local/solr/solr-7.3.1/server/solr/collection1/conf
         cp /tmp/dvinstall/solrconfig.xml /usr/local/solr/solr-7.3.1/server/solr/collection1/conf
 
 Note: Dataverse has customized Solr to boost results that come from certain indexed elements inside Dataverse, for example prioritizing results from Dataverses over Datasets. If you would like to remove this, edit your ``solrconfig.xml`` and remove the ``<str name="qf">`` element and its contents. If you have ideas about how this boosting could be improved, feel free to contact us through our Google Group https://groups.google.com/forum/#!forum/dataverse-dev .
diff --git a/doc/sphinx-guides/source/user/appendix.rst b/doc/sphinx-guides/source/user/appendix.rst
index 891694eecea..8c769b3041a 100755
--- a/doc/sphinx-guides/source/user/appendix.rst
+++ b/doc/sphinx-guides/source/user/appendix.rst
@@ -25,5 +25,6 @@ Detailed below are what metadata schemas we support for Citation and Domain Spec
   `VOResource Schema format <http://www.ivoa.net/documents/latest/RM.html>`__ and is based on 
   `Virtual Observatory (VO) Discovery and Provenance Metadata <http://perma.cc/H5ZJ-4KKY>`__ (`see .tsv version <https://github.com/IQSS/dataverse/blob/master/scripts/api/data/metadatablocks/astrophysics.tsv>`__).
 - `Life Sciences Metadata <https://docs.google.com/spreadsheet/ccc?key=0AjeLxEN77UZodHFEWGpoa19ia3pldEFyVFR0aFVGa0E#gid=2>`__: based on `ISA-Tab Specification <https://isa-specs.readthedocs.io/en/latest/isamodel.html>`__, along with controlled vocabulary from subsets of the `OBI Ontology <http://bioportal.bioontology.org/ontologies/OBI>`__ and the `NCBI Taxonomy for Organisms <http://www.ncbi.nlm.nih.gov/Taxonomy/taxonomyhome.html/>`__ (`see .tsv version <https://github.com/IQSS/dataverse/blob/master/scripts/api/data/metadatablocks/biomedical.tsv>`__).
+- `Journal Metadata <https://docs.google.com/spreadsheets/d/13HP-jI_cwLDHBetn9UKTREPJ_F4iHdAvhjmlvmYdSSw/edit#gid=8>`__: based on the `Journal Archiving and Interchange Tag Set, version 1.2 <https://jats.nlm.nih.gov/archiving/tag-library/1.2/chapter/how-to-read.html>`__ (`see .tsv version <https://github.com/IQSS/dataverse/blob/master/scripts/api/data/metadatablocks/journals.tsv>`__).
 
 See also the `Dataverse 4.0 Metadata Crosswalk: DDI, DataCite, DC, DCTerms, VO, ISA-Tab <https://docs.google.com/spreadsheets/d/10Luzti7svVTVKTA-px27oq3RxCUM-QbiTkm8iMd5C54/edit?usp=sharing>`__ document and the :doc:`/admin/metadatacustomization` section of the Admin Guide.
diff --git a/scripts/api/setup-optional-harvard.sh b/scripts/api/setup-optional-harvard.sh
index b4dd6b33b53..39ccbb310b6 100755
--- a/scripts/api/setup-optional-harvard.sh
+++ b/scripts/api/setup-optional-harvard.sh
@@ -55,4 +55,5 @@ curl http://localhost:8080/api/admin/datasetfield/load -X POST --data-binary @da
 curl http://localhost:8080/api/admin/datasetfield/load -X POST --data-binary @data/metadatablocks/customCHIA.tsv -H "Content-type: text/tab-separated-values"
 curl http://localhost:8080/api/admin/datasetfield/load -X POST --data-binary @data/metadatablocks/customDigaai.tsv -H "Content-type: text/tab-separated-values"
 curl http://localhost:8080/api/admin/datasetfield/load -X POST --data-binary @data/metadatablocks/custom_hbgdki.tsv -H "Content-type: text/tab-separated-values"
+echo "Because you have loaded custom metadata blocks, you need to update the include files pulled in by Solr's schema.xml. On the Solr server, you can try running the updateSchemaMDB.sh script mentioned in the Metadata Customization section of the Admin Guide or follow the manual steps listed there."
 echo
diff --git a/scripts/installer/Makefile b/scripts/installer/Makefile
index 62caf35bd05..fda5c7cf3a6 100644
--- a/scripts/installer/Makefile
+++ b/scripts/installer/Makefile
@@ -6,7 +6,7 @@ API_SCRIPTS=${INSTALLER_ZIP_DIR}/setup-datasetfields.sh ${INSTALLER_ZIP_DIR}/set
 DB_SCRIPT=${INSTALLER_ZIP_DIR}/reference_data.sql
 JHOVE_CONFIG=${INSTALLER_ZIP_DIR}/jhove.conf
 JHOVE_SCHEMA=${INSTALLER_ZIP_DIR}/jhoveConfig.xsd
-SOLR_SCHEMA=${INSTALLER_ZIP_DIR}/schema.xml
+SOLR_SCHEMA=${INSTALLER_ZIP_DIR}/schema.xml ${INSTALLER_ZIP_DIR}/schema_dv_mdb_fields.xml ${INSTALLER_ZIP_DIR}/schema_dv_mdb_copies.xml ${INSTALLER_ZIP_DIR}/updateSchemaMDB.sh
 SOLR_CONFIG=${INSTALLER_ZIP_DIR}/solrconfig.xml
 INSTALL_SCRIPT=${INSTALLER_ZIP_DIR}/install
 
@@ -70,10 +70,10 @@ ${JHOVE_SCHEMA}:	../../conf/jhove/jhoveConfig.xsd
 	@mkdir -p ${INSTALLER_ZIP_DIR}
 	/bin/cp ../../conf/jhove/jhoveConfig.xsd ${INSTALLER_ZIP_DIR}
 
-${SOLR_SCHEMA}:		../../conf/solr/7.3.1/schema.xml
+${SOLR_SCHEMA}:		../../conf/solr/7.3.1/schema.xml ../../conf/solr/7.3.1/schema_dv_mdb_fields.xml ../../conf/solr/7.3.1/schema_dv_mdb_copies.xml ../../conf/solr/7.3.1/updateSchemaMDB.sh
 	@echo copying Solr schema file
 	@mkdir -p ${INSTALLER_ZIP_DIR}
-	/bin/cp ../../conf/solr/7.3.1/schema.xml ${INSTALLER_ZIP_DIR}
+	/bin/cp ../../conf/solr/7.3.1/schema*.xml ../../conf/solr/7.3.1/updateSchemaMDB.sh ${INSTALLER_ZIP_DIR}
 
 ${SOLR_CONFIG}:		../../conf/solr/7.3.1/solrconfig.xml
 	@echo copying Solr config file
diff --git a/scripts/installer/README.txt b/scripts/installer/README.txt
index b694c36b7ba..4407f179be0 100644
--- a/scripts/installer/README.txt
+++ b/scripts/installer/README.txt
@@ -43,4 +43,6 @@ jhove.conf
 SOLR schema and config files, from conf/solr/7.3.1: 
 
 schema.xml
+schema_dv_cmb_copies.xml
+schema_dv_cmb_fields.xml
 solrconfig.xml
diff --git a/scripts/vagrant/setup-solr.sh b/scripts/vagrant/setup-solr.sh
index 6bf96212fc0..a97924412f9 100755
--- a/scripts/vagrant/setup-solr.sh
+++ b/scripts/vagrant/setup-solr.sh
@@ -7,7 +7,7 @@ chown $SOLR_USER:$SOLR_USER $SOLR_HOME
 su $SOLR_USER -s /bin/sh -c "cp /downloads/solr-7.3.1.tgz $SOLR_HOME"
 su $SOLR_USER -s /bin/sh -c "cd $SOLR_HOME && tar xfz solr-7.3.1.tgz"
 su $SOLR_USER -s /bin/sh -c "cd $SOLR_HOME/solr-7.3.1/server/solr && cp -r configsets/_default . && mv _default collection1"
-su $SOLR_USER -s /bin/sh -c "cp /conf/solr/7.3.1/schema.xml $SOLR_HOME/solr-7.3.1/server/solr/collection1/conf/schema.xml"
+su $SOLR_USER -s /bin/sh -c "cp /conf/solr/7.3.1/schema*.xml $SOLR_HOME/solr-7.3.1/server/solr/collection1/conf/"
 su $SOLR_USER -s /bin/sh -c "cp /conf/solr/7.3.1/solrconfig.xml $SOLR_HOME/solr-7.3.1/server/solr/collection1/conf/solrconfig.xml"
 su $SOLR_USER -s /bin/sh -c "cd $SOLR_HOME/solr-7.3.1 && bin/solr start && bin/solr create_core -c collection1 -d server/solr/collection1/conf/"
 cp /dataverse/doc/sphinx-guides/source/_static/installation/files/etc/init.d/solr /etc/init.d/solr