Index: Riskeer/Integration/src/Riskeer.Integration.Plugin/Handlers/HydraulicBoundaryDatabaseUpdateHandler.cs
===================================================================
diff -u -r1ceb376282c1b8c7efc172811cbca4993693e58e -r7aa40a2aaf78e4491dab935e8e9c9b36fcbb1b6d
--- Riskeer/Integration/src/Riskeer.Integration.Plugin/Handlers/HydraulicBoundaryDatabaseUpdateHandler.cs	(.../HydraulicBoundaryDatabaseUpdateHandler.cs)	(revision 1ceb376282c1b8c7efc172811cbca4993693e58e)
+++ Riskeer/Integration/src/Riskeer.Integration.Plugin/Handlers/HydraulicBoundaryDatabaseUpdateHandler.cs	(.../HydraulicBoundaryDatabaseUpdateHandler.cs)	(revision 7aa40a2aaf78e4491dab935e8e9c9b36fcbb1b6d)
@@ -162,9 +162,11 @@
                 }
             }
 
-            HydraulicLocationConfigurationSettingsUpdateHelper.SetHydraulicLocationConfigurationSettings(hydraulicBoundaryDatabase.HydraulicLocationConfigurationSettings,
-                                                                                                         readHydraulicLocationConfigurationDatabase.ReadHydraulicLocationConfigurationDatabaseSettings?.Single(),
-                                                                                                         hlcdFilePath);
+            HydraulicLocationConfigurationSettingsUpdateHelper.SetHydraulicLocationConfigurationSettings(
+                hydraulicBoundaryDatabase.HydraulicLocationConfigurationSettings,
+                readHydraulicLocationConfigurationDatabase.ReadHydraulicLocationConfigurationDatabaseSettings?.Single(),
+                readHydraulicLocationConfigurationDatabase.UsePreprocessorClosure,
+                hlcdFilePath);
 
             return changedObjects;
         }
Index: Riskeer/Integration/src/Riskeer.Integration.Plugin/Handlers/HydraulicLocationConfigurationDatabaseUpdateHandler.cs
===================================================================
diff -u -r1ceb376282c1b8c7efc172811cbca4993693e58e -r7aa40a2aaf78e4491dab935e8e9c9b36fcbb1b6d
--- Riskeer/Integration/src/Riskeer.Integration.Plugin/Handlers/HydraulicLocationConfigurationDatabaseUpdateHandler.cs	(.../HydraulicLocationConfigurationDatabaseUpdateHandler.cs)	(revision 1ceb376282c1b8c7efc172811cbca4993693e58e)
+++ Riskeer/Integration/src/Riskeer.Integration.Plugin/Handlers/HydraulicLocationConfigurationDatabaseUpdateHandler.cs	(.../HydraulicLocationConfigurationDatabaseUpdateHandler.cs)	(revision 7aa40a2aaf78e4491dab935e8e9c9b36fcbb1b6d)
@@ -81,7 +81,7 @@
 
             HydraulicLocationConfigurationSettingsUpdateHelper.SetHydraulicLocationConfigurationSettings(
                 hydraulicBoundaryDatabase.HydraulicLocationConfigurationSettings,
-                readHydraulicLocationConfigurationDatabaseSettings, hlcdFilePath);
+                readHydraulicLocationConfigurationDatabaseSettings, false, hlcdFilePath);
 
             var changedObjects = new List<IObservable>
             {
Index: Riskeer/Integration/src/Riskeer.Integration.Plugin/Helpers/HydraulicLocationConfigurationSettingsUpdateHelper.cs
===================================================================
diff -u -r56523c0a7ce1c083093e745596681050ac23d18d -r7aa40a2aaf78e4491dab935e8e9c9b36fcbb1b6d
--- Riskeer/Integration/src/Riskeer.Integration.Plugin/Helpers/HydraulicLocationConfigurationSettingsUpdateHelper.cs	(.../HydraulicLocationConfigurationSettingsUpdateHelper.cs)	(revision 56523c0a7ce1c083093e745596681050ac23d18d)
+++ Riskeer/Integration/src/Riskeer.Integration.Plugin/Helpers/HydraulicLocationConfigurationSettingsUpdateHelper.cs	(.../HydraulicLocationConfigurationSettingsUpdateHelper.cs)	(revision 7aa40a2aaf78e4491dab935e8e9c9b36fcbb1b6d)
@@ -39,11 +39,13 @@
         /// </summary>
         /// <param name="hydraulicLocationConfigurationSettings">The hydraulic location configuration settings to set on.</param>
         /// <param name="readHydraulicLocationConfigurationDatabaseSettings">The read settings to set.</param>
+        /// <param name="usePreprocessorClosure">Indicator whether to use the preprocessor closure.</param>
         /// <param name="hlcdFilePath">The hlcd file path.</param>
         /// <exception cref="ArgumentNullException">Thrown when <paramref name="hydraulicLocationConfigurationSettings"/>
         /// or <paramref name="hlcdFilePath"/> is <c>null</c>.</exception>
         public static void SetHydraulicLocationConfigurationSettings(HydraulicLocationConfigurationSettings hydraulicLocationConfigurationSettings,
                                                                      ReadHydraulicLocationConfigurationDatabaseSettings readHydraulicLocationConfigurationDatabaseSettings,
+                                                                     bool usePreprocessorClosure,
                                                                      string hlcdFilePath)
         {
             if (hydraulicLocationConfigurationSettings == null)
@@ -63,7 +65,7 @@
                     readHydraulicLocationConfigurationDatabaseSettings.ScenarioName,
                     readHydraulicLocationConfigurationDatabaseSettings.Year,
                     readHydraulicLocationConfigurationDatabaseSettings.Scope,
-                    false,
+                    usePreprocessorClosure,
                     readHydraulicLocationConfigurationDatabaseSettings.SeaLevel,
                     readHydraulicLocationConfigurationDatabaseSettings.RiverDischarge,
                     readHydraulicLocationConfigurationDatabaseSettings.LakeLevel,
@@ -80,7 +82,7 @@
                     HydraulicLocationConfigurationSettingsConstants.MandatoryConfigurationPropertyDefaultValue,
                     HydraulicLocationConfigurationSettingsConstants.YearDefaultValue,
                     HydraulicLocationConfigurationSettingsConstants.MandatoryConfigurationPropertyDefaultValue,
-                    false,
+                    usePreprocessorClosure,
                     HydraulicLocationConfigurationSettingsConstants.OptionalConfigurationPropertyDefaultValue,
                     HydraulicLocationConfigurationSettingsConstants.OptionalConfigurationPropertyDefaultValue,
                     HydraulicLocationConfigurationSettingsConstants.OptionalConfigurationPropertyDefaultValue,
Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Handlers/HydraulicBoundaryDatabaseUpdateHandlerTest.cs
===================================================================
diff -u -r01ac28cffccda3451783c513b8d2d9130ff0ec60 -r7aa40a2aaf78e4491dab935e8e9c9b36fcbb1b6d
--- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Handlers/HydraulicBoundaryDatabaseUpdateHandlerTest.cs	(.../HydraulicBoundaryDatabaseUpdateHandlerTest.cs)	(revision 01ac28cffccda3451783c513b8d2d9130ff0ec60)
+++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Handlers/HydraulicBoundaryDatabaseUpdateHandlerTest.cs	(.../HydraulicBoundaryDatabaseUpdateHandlerTest.cs)	(revision 7aa40a2aaf78e4491dab935e8e9c9b36fcbb1b6d)
@@ -566,6 +566,7 @@
             Assert.IsTrue(hydraulicBoundaryDatabase.IsLinked());
             Assert.AreEqual(hydraulicBoundaryDatabaseFilePath, hydraulicBoundaryDatabase.FilePath);
             Assert.AreEqual(readHydraulicBoundaryDatabase.Version, hydraulicBoundaryDatabase.Version);
+            Assert.AreEqual(hydraulicBoundaryDatabase.HydraulicLocationConfigurationSettings.UsePreprocessorClosure, readHydraulicLocationConfigurationDatabase.UsePreprocessorClosure);
 
             AssertHydraulicBoundaryLocations(readHydraulicBoundaryDatabase.Locations, readHydraulicLocationConfigurationDatabase, hydraulicBoundaryDatabase.Locations);
             AssertHydraulicBoundaryLocationsAndCalculations(hydraulicBoundaryDatabase.Locations, assessmentSection);
@@ -698,6 +699,7 @@
             Assert.AreEqual(expectedSettings.ScenarioName, actualSettings.ScenarioName);
             Assert.AreEqual(expectedSettings.Year, actualSettings.Year);
             Assert.AreEqual(expectedSettings.Scope, actualSettings.Scope);
+            Assert.AreEqual(readHydraulicLocationConfigurationDatabase.UsePreprocessorClosure, actualSettings.UsePreprocessorClosure);
             Assert.AreEqual(expectedSettings.SeaLevel, actualSettings.SeaLevel);
             Assert.AreEqual(expectedSettings.RiverDischarge, actualSettings.RiverDischarge);
             Assert.AreEqual(expectedSettings.LakeLevel, actualSettings.LakeLevel);
@@ -745,6 +747,7 @@
             Assert.AreEqual("WBI2017", actualSettings.ScenarioName);
             Assert.AreEqual(2023, actualSettings.Year);
             Assert.AreEqual("WBI2017", actualSettings.Scope);
+            Assert.AreEqual(readHydraulicLocationConfigurationDatabase.UsePreprocessorClosure, actualSettings.UsePreprocessorClosure);
             Assert.AreEqual("Conform WBI2017", actualSettings.SeaLevel);
             Assert.AreEqual("Conform WBI2017", actualSettings.RiverDischarge);
             Assert.AreEqual("Conform WBI2017", actualSettings.LakeLevel);
Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Helpers/HydraulicLocationConfigurationSettingsUpdateHelperTest.cs
===================================================================
diff -u -r56523c0a7ce1c083093e745596681050ac23d18d -r7aa40a2aaf78e4491dab935e8e9c9b36fcbb1b6d
--- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Helpers/HydraulicLocationConfigurationSettingsUpdateHelperTest.cs	(.../HydraulicLocationConfigurationSettingsUpdateHelperTest.cs)	(revision 56523c0a7ce1c083093e745596681050ac23d18d)
+++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Helpers/HydraulicLocationConfigurationSettingsUpdateHelperTest.cs	(.../HydraulicLocationConfigurationSettingsUpdateHelperTest.cs)	(revision 7aa40a2aaf78e4491dab935e8e9c9b36fcbb1b6d)
@@ -37,7 +37,7 @@
         {
             // Call
             TestDelegate call = () => HydraulicLocationConfigurationSettingsUpdateHelper.SetHydraulicLocationConfigurationSettings(
-                null, ReadHydraulicLocationConfigurationDatabaseSettingsTestFactory.Create(), "");
+                null, ReadHydraulicLocationConfigurationDatabaseSettingsTestFactory.Create(), false, "");
 
             // Assert
             var exception = Assert.Throws<ArgumentNullException>(call);
@@ -49,7 +49,7 @@
         {
             // Call
             TestDelegate call = () => HydraulicLocationConfigurationSettingsUpdateHelper.SetHydraulicLocationConfigurationSettings(
-                new HydraulicLocationConfigurationSettings(), ReadHydraulicLocationConfigurationDatabaseSettingsTestFactory.Create(), null);
+                new HydraulicLocationConfigurationSettings(), ReadHydraulicLocationConfigurationDatabaseSettingsTestFactory.Create(), false, null);
 
             // Assert
             var exception = Assert.Throws<ArgumentNullException>(call);
@@ -62,9 +62,11 @@
             // Setup
             const string filePath = "some/file/path";
             var settings = new HydraulicLocationConfigurationSettings();
+            bool usePreprocessorClosure = new Random(21).NextBoolean();
 
             // Call
-            Action call = () => HydraulicLocationConfigurationSettingsUpdateHelper.SetHydraulicLocationConfigurationSettings(settings, null, filePath);
+            Action call = () => HydraulicLocationConfigurationSettingsUpdateHelper.SetHydraulicLocationConfigurationSettings(
+                settings, null, usePreprocessorClosure, filePath);
 
             // Assert
             const string expectedMessage = "De tabel 'ScenarioInformation' in het HLCD bestand is niet aanwezig, er worden standaardwaarden " +
@@ -75,7 +77,7 @@
             Assert.AreEqual("WBI2017", settings.ScenarioName);
             Assert.AreEqual(2023, settings.Year);
             Assert.AreEqual("WBI2017", settings.Scope);
-            Assert.IsFalse(settings.UsePreprocessorClosure);
+            Assert.AreEqual(usePreprocessorClosure, settings.UsePreprocessorClosure);
             Assert.AreEqual("Conform WBI2017", settings.SeaLevel);
             Assert.AreEqual("Conform WBI2017", settings.RiverDischarge);
             Assert.AreEqual("Conform WBI2017", settings.LakeLevel);
@@ -91,9 +93,11 @@
             const string filePath = "some/file/path";
             var settings = new HydraulicLocationConfigurationSettings();
             ReadHydraulicLocationConfigurationDatabaseSettings readSettings = ReadHydraulicLocationConfigurationDatabaseSettingsTestFactory.Create();
+            bool usePreprocessorClosure = new Random(21).NextBoolean();
 
             // Call
-            Action call = () => HydraulicLocationConfigurationSettingsUpdateHelper.SetHydraulicLocationConfigurationSettings(settings, readSettings, filePath);
+            Action call = () => HydraulicLocationConfigurationSettingsUpdateHelper.SetHydraulicLocationConfigurationSettings(
+                settings, readSettings, usePreprocessorClosure, filePath);
 
             // Assert
             TestHelper.AssertLogMessagesCount(call, 0);
@@ -102,7 +106,7 @@
             Assert.AreEqual(readSettings.ScenarioName, settings.ScenarioName);
             Assert.AreEqual(readSettings.Year, settings.Year);
             Assert.AreEqual(readSettings.Scope, settings.Scope);
-            Assert.IsFalse(settings.UsePreprocessorClosure);
+            Assert.AreEqual(usePreprocessorClosure, settings.UsePreprocessorClosure);
             Assert.AreEqual(readSettings.SeaLevel, settings.SeaLevel);
             Assert.AreEqual(readSettings.RiverDischarge, settings.RiverDischarge);
             Assert.AreEqual(readSettings.LakeLevel, settings.LakeLevel);