Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Location.cs
===================================================================
diff -u -r4539 -r4807
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Location.cs	(.../Location.cs)	(revision 4539)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Location.cs	(.../Location.cs)	(revision 4807)
@@ -2211,7 +2211,9 @@
 
     #region Backwards compatibility
 
+#pragma warning disable CS0618 // Type or member is obsolete
     private SurfaceLine surfaceLine;
+#pragma warning restore CS0618 // Type or member is obsolete
 
     [Obsolete("Do not use this property; Only exists for backwards compatibility.", true)]
     [Browsable(false)]
Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/IO/FailureMechanismeParamatersMStabXmlHandler.cs
===================================================================
diff -u -r4539 -r4807
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/IO/FailureMechanismeParamatersMStabXmlHandler.cs	(.../FailureMechanismeParamatersMStabXmlHandler.cs)	(revision 4539)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/IO/FailureMechanismeParamatersMStabXmlHandler.cs	(.../FailureMechanismeParamatersMStabXmlHandler.cs)	(revision 4807)
@@ -68,7 +68,9 @@
     /// <param name="value">The value to handle</param>
     public void HandleObject(object target, object value)
     {
+#pragma warning disable CS0618 // Type or member is obsolete
         var oldSurfaceLine = value as BaseSurfaceLine;
+#pragma warning restore CS0618 // Type or member is obsolete
         if (null != oldSurfaceLine)
         {
             ((FailureMechanismeParamatersMStab) target).SurfaceLine = (new OldSurfaceLineToNewConverter()).Convert(oldSurfaceLine);
Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/IO/FailureMechanismeParamatersMStabXmlHandlerTest.cs
===================================================================
diff -u -r4638 -r4807
--- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/IO/FailureMechanismeParamatersMStabXmlHandlerTest.cs	(.../FailureMechanismeParamatersMStabXmlHandlerTest.cs)	(revision 4638)
+++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/IO/FailureMechanismeParamatersMStabXmlHandlerTest.cs	(.../FailureMechanismeParamatersMStabXmlHandlerTest.cs)	(revision 4807)
@@ -100,7 +100,9 @@
             // setup
             var failureMechanism = new FailureMechanismeParamatersMStab();
             string locationSurfaceLineProperty = failureMechanism.GetMemberName(x => x.SurfaceLine);
+#pragma warning disable CS0618 // Type or member is obsolete
             var surfaceLine = new SurfaceLine();
+#pragma warning restore CS0618 // Type or member is obsolete
 
             Assert.That(failureMechanism.SurfaceLine, Is.Null);
 
Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Dike.cs
===================================================================
diff -u -r4749 -r4807
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Dike.cs	(.../Dike.cs)	(revision 4749)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Dike.cs	(.../Dike.cs)	(revision 4807)
@@ -66,7 +66,9 @@
         locations = new List<Location>();
         soilProfiles = new List<SoilProfile1D>();
 
+#pragma warning disable CS0618 // Type or member is obsolete
         surfaceLines = new DelegatedList<SurfaceLine>
+#pragma warning restore CS0618 // Type or member is obsolete
         {
             AddMethod = ConvertAddedOldSurfaceLineToNewFormat
         };
@@ -546,7 +548,9 @@
 
     #region Backwards compatibility
 
+#pragma warning disable CS0618 // Type or member is obsolete
     private IList<SurfaceLine> surfaceLines;
+#pragma warning restore CS0618 // Type or member is obsolete
 
     /// <summary>
     ///     Gets or sets all surface lines instances associated with this dike.
@@ -567,7 +571,9 @@
     ///     surfaceline, and ensures that shared references are set correctly.
     /// </summary>
     /// <param name="argument">Persisted version of the old-style surfaceline.</param>
+#pragma warning disable CS0618 // Type or member is obsolete
     private void ConvertAddedOldSurfaceLineToNewFormat(SurfaceLine argument)
+#pragma warning restore CS0618 // Type or member is obsolete
     {
         SurfaceLine2 surfaceLine2 = new OldSurfaceLineToNewConverter().Convert(argument);
         SurfaceLines2.Add(surfaceLine2);
Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.TestHelper/TestUtils/FactoryForSurfaceLineTests.cs
===================================================================
diff -u -r4539 -r4807
--- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.TestHelper/TestUtils/FactoryForSurfaceLineTests.cs	(.../FactoryForSurfaceLineTests.cs)	(revision 4539)
+++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.TestHelper/TestUtils/FactoryForSurfaceLineTests.cs	(.../FactoryForSurfaceLineTests.cs)	(revision 4807)
@@ -65,10 +65,14 @@
             return surfaceLine;
         }
 
+#pragma warning disable CS0618 // Type or member is obsolete
         public static SurfaceLine CreateSurfaceLineTutorial2()
+#pragma warning restore CS0618 // Type or member is obsolete
         {
             //Surface line tutorial 1
+#pragma warning disable CS0618 // Type or member is obsolete
             var surfaceLine = new SurfaceLine
+#pragma warning restore CS0618 // Type or member is obsolete
             {
                 Name = "Tutorial1"
             };
@@ -435,9 +439,13 @@
             return surfaceLine;
         }
 
+#pragma warning disable CS0618 // Type or member is obsolete
         public static SurfaceLine CreateSimpleSurfaceLineForExitPointTest()
+#pragma warning restore CS0618 // Type or member is obsolete
         {
+#pragma warning disable CS0618 // Type or member is obsolete
             var surfaceLine = new SurfaceLine
+#pragma warning restore CS0618 // Type or member is obsolete
             {
                 Name = "SimpleExitPoint"
             };
@@ -453,9 +461,13 @@
             return surfaceLine;
         }
 
+#pragma warning disable CS0618 // Type or member is obsolete
         public static SurfaceLine CreateHorizontalSurfaceLineForBenchmark1()
+#pragma warning restore CS0618 // Type or member is obsolete
         {
+#pragma warning disable CS0618 // Type or member is obsolete
             var surfaceLine = new SurfaceLine
+#pragma warning restore CS0618 // Type or member is obsolete
             {
                 Name = "HorizontalLine"
             };
@@ -466,9 +478,13 @@
             return surfaceLine;
         }
 
+#pragma warning disable CS0618 // Type or member is obsolete
         public static SurfaceLine CreateDescendingSurfaceLineForBenchmark2()
+#pragma warning restore CS0618 // Type or member is obsolete
         {
+#pragma warning disable CS0618 // Type or member is obsolete
             var surfaceLine = new SurfaceLine
+#pragma warning restore CS0618 // Type or member is obsolete
             {
                 Name = "NonHorizontalLine"
             };
@@ -479,9 +495,13 @@
             return surfaceLine;
         }
 
+#pragma warning disable CS0618 // Type or member is obsolete
         public static SurfaceLine CreateHorizontalSurfaceLineWithSymmetricalDitchForBenchmark5()
+#pragma warning restore CS0618 // Type or member is obsolete
         {
+#pragma warning disable CS0618 // Type or member is obsolete
             var surfaceLine = new SurfaceLine
+#pragma warning restore CS0618 // Type or member is obsolete
             {
                 Name = "HorizontalLineWithSymmetricalDitch"
             };
@@ -496,9 +516,13 @@
             return surfaceLine;
         }
 
+#pragma warning disable CS0618 // Type or member is obsolete
         public static SurfaceLine CreateNonHorizontalLineWithAsymmetricalDitchForBenchmark6()
+#pragma warning restore CS0618 // Type or member is obsolete
         {
+#pragma warning disable CS0618 // Type or member is obsolete
             var surfaceLine = new SurfaceLine
+#pragma warning restore CS0618 // Type or member is obsolete
             {
                 Name = "NonHorizontalLineWithAsymmetricalDitch"
             };
@@ -513,9 +537,13 @@
             return surfaceLine;
         }
 
+#pragma warning disable CS0618 // Type or member is obsolete
         public static SurfaceLine CreateSurfaceLineWithAsymmetricalDitchHighPolderSide()
+#pragma warning restore CS0618 // Type or member is obsolete
         {
+#pragma warning disable CS0618 // Type or member is obsolete
             var surfaceLine = new SurfaceLine
+#pragma warning restore CS0618 // Type or member is obsolete
             {
                 Name = "AsymmetricalDitchHighPolderSide"
             };
@@ -530,9 +558,13 @@
             return surfaceLine;
         }
 
+#pragma warning disable CS0618 // Type or member is obsolete
         public static SurfaceLine CreateSurfaceLineWithAsymmetricalDitchHighDikeSide()
+#pragma warning restore CS0618 // Type or member is obsolete
         {
+#pragma warning disable CS0618 // Type or member is obsolete
             var surfaceLine = new SurfaceLine
+#pragma warning restore CS0618 // Type or member is obsolete
             {
                 Name = "AsymmetricalDitchHighPolderSide"
             };