Index: DamClients/DamUI/branches/nwoUI_18.1/src/DamClientsLibrary/Deltares.Dam.Data/CsvExportCharacteristicPoints.cs
===================================================================
diff -u -r1849 -r1851
--- DamClients/DamUI/branches/nwoUI_18.1/src/DamClientsLibrary/Deltares.Dam.Data/CsvExportCharacteristicPoints.cs	(.../CsvExportCharacteristicPoints.cs)	(revision 1849)
+++ DamClients/DamUI/branches/nwoUI_18.1/src/DamClientsLibrary/Deltares.Dam.Data/CsvExportCharacteristicPoints.cs	(.../CsvExportCharacteristicPoints.cs)	(revision 1851)
@@ -201,6 +201,34 @@
         public double SurfaceLevelInsideY { get { return GetYfromPoint(surfaceLine, CharacteristicPointType.SurfaceLevelInside); } }
         [CsvExportColumn(CharacteristicPointCsvIdentifiers.SurfaceLevelInsideZ, 49)]
         public double SurfaceLevelInsideZ { get { return GetZfromPoint(surfaceLine, CharacteristicPointType.SurfaceLevelInside); } }
+        [CsvExportColumn(CharacteristicPointCsvIdentifiers.NonWaterRetainingObjectPoint1X, 50)]
+        public double NonWaterRetainingObjectPoint1X { get { return GetXfromPoint(surfaceLine, CharacteristicPointType.NonWaterRetainingObjectPoint1); } }
+        [CsvExportColumn(CharacteristicPointCsvIdentifiers.NonWaterRetainingObjectPoint1Y, 51)]
+        public double NonWaterRetainingObjectPoint1Y { get { return GetYfromPoint(surfaceLine, CharacteristicPointType.NonWaterRetainingObjectPoint1); } }
+        [CsvExportColumn(CharacteristicPointCsvIdentifiers.NonWaterRetainingObjectPoint1Z, 52)]
+        public double NonWaterRetainingObjectPoint1Z { get { return GetZfromPoint(surfaceLine, CharacteristicPointType.NonWaterRetainingObjectPoint1); } }
 
+        [CsvExportColumn(CharacteristicPointCsvIdentifiers.NonWaterRetainingObjectPoint2X, 53)]
+        public double NonWaterRetainingObjectPoint2X { get { return GetXfromPoint(surfaceLine, CharacteristicPointType.NonWaterRetainingObjectPoint2); } }
+        [CsvExportColumn(CharacteristicPointCsvIdentifiers.NonWaterRetainingObjectPoint2Y, 54)]
+        public double NonWaterRetainingObjectPoint2Y { get { return GetYfromPoint(surfaceLine, CharacteristicPointType.NonWaterRetainingObjectPoint2); } }
+        [CsvExportColumn(CharacteristicPointCsvIdentifiers.NonWaterRetainingObjectPoint2Z, 55)]
+        public double NonWaterRetainingObjectPoint2Z { get { return GetZfromPoint(surfaceLine, CharacteristicPointType.NonWaterRetainingObjectPoint2); } }
+
+        [CsvExportColumn(CharacteristicPointCsvIdentifiers.NonWaterRetainingObjectPoint3X, 56)]
+        public double NonWaterRetainingObjectPoint3X { get { return GetXfromPoint(surfaceLine, CharacteristicPointType.NonWaterRetainingObjectPoint3); } }
+        [CsvExportColumn(CharacteristicPointCsvIdentifiers.NonWaterRetainingObjectPoint3Y, 57)]
+        public double NonWaterRetainingObjectPoint3Y { get { return GetYfromPoint(surfaceLine, CharacteristicPointType.NonWaterRetainingObjectPoint3); } }
+        [CsvExportColumn(CharacteristicPointCsvIdentifiers.NonWaterRetainingObjectPoint3Z, 58)]
+        public double NonWaterRetainingObjectPoint3Z { get { return GetZfromPoint(surfaceLine, CharacteristicPointType.NonWaterRetainingObjectPoint3); } }
+
+        [CsvExportColumn(CharacteristicPointCsvIdentifiers.NonWaterRetainingObjectPoint4X, 59)]
+        public double NonWaterRetainingObjectPoint4X { get { return GetXfromPoint(surfaceLine, CharacteristicPointType.NonWaterRetainingObjectPoint4); } }
+        [CsvExportColumn(CharacteristicPointCsvIdentifiers.NonWaterRetainingObjectPoint4Y, 60)]
+        public double NonWaterRetainingObjectPoint4Y { get { return GetYfromPoint(surfaceLine, CharacteristicPointType.NonWaterRetainingObjectPoint4); } }
+        [CsvExportColumn(CharacteristicPointCsvIdentifiers.NonWaterRetainingObjectPoint4Z, 61)]
+        public double NonWaterRetainingObjectPoint4Z { get { return GetZfromPoint(surfaceLine, CharacteristicPointType.NonWaterRetainingObjectPoint4); } }
+
+
     }
 }
Index: DamClients/DamUI/branches/nwoUI_18.1/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/ConversionHelper.cs
===================================================================
diff -u -r1849 -r1851
--- DamClients/DamUI/branches/nwoUI_18.1/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/ConversionHelper.cs	(.../ConversionHelper.cs)	(revision 1849)
+++ DamClients/DamUI/branches/nwoUI_18.1/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/ConversionHelper.cs	(.../ConversionHelper.cs)	(revision 1851)
@@ -166,6 +166,11 @@
         public const int CpDitchPolderSide = 19; // Insteek sloot polderzijde
         public const int CpSurfaceLevelInside = 25; // Maaiveld binnenwaarts        
 
+        public const int CpNonWaterRetainingObjectPoint1 = 20;
+        public const int CpNonWaterRetainingObjectPoint2 = 21;
+        public const int CpNonWaterRetainingObjectPoint3 = 23;
+        public const int CpNonWaterRetainingObjectPoint4 = 24;
+
         /// <summary>
         /// Converts the type of to dam point.
         /// </summary>
@@ -192,6 +197,12 @@
                                                     {CpBottomDitchDikeSide, CharacteristicPointType.BottomDitchDikeSide},
                                                     {CpBottomDitchPolderSide, CharacteristicPointType.BottomDitchPolderSide},
                                                     {CpDitchPolderSide, CharacteristicPointType.DitchPolderSide},
+
+                                                    {CpNonWaterRetainingObjectPoint1,CharacteristicPointType.NonWaterRetainingObjectPoint1},
+                                                    {CpNonWaterRetainingObjectPoint2,CharacteristicPointType.NonWaterRetainingObjectPoint2},
+                                                    {CpNonWaterRetainingObjectPoint3,CharacteristicPointType.NonWaterRetainingObjectPoint3},
+                                                    {CpNonWaterRetainingObjectPoint4,CharacteristicPointType.NonWaterRetainingObjectPoint4},
+
                                                     {CpSurfaceLevelInside, CharacteristicPointType.SurfaceLevelInside}
                                                };
             return translationTable[inputPointType];
@@ -230,6 +241,12 @@
                                                     {CharacteristicPointType.BottomDitchDikeSide, CpBottomDitchDikeSide},
                                                     {CharacteristicPointType.BottomDitchPolderSide, CpBottomDitchPolderSide},
                                                     {CharacteristicPointType.DitchPolderSide, CpDitchPolderSide},
+                                                    
+                                                    {CharacteristicPointType.NonWaterRetainingObjectPoint1, CpNonWaterRetainingObjectPoint1},
+                                                    {CharacteristicPointType.NonWaterRetainingObjectPoint2, CpNonWaterRetainingObjectPoint2},
+                                                    {CharacteristicPointType.NonWaterRetainingObjectPoint3, CpNonWaterRetainingObjectPoint3},
+                                                    {CharacteristicPointType.NonWaterRetainingObjectPoint4, CpNonWaterRetainingObjectPoint4},
+
                                                     {CharacteristicPointType.SurfaceLevelInside, CpSurfaceLevelInside}
                                                };
             return translationTable[characteristicPointType];
@@ -343,7 +360,6 @@
         public const int InputFailureMechanismStabilityOutside = 1;
         public const int InputFailureMechanismPiping = 2;
         public const int InputFailureMechanismHorizontalBalance = 3;
-        
         /// <summary>
         /// Converts the Dam failure mechanism type to the input failure mechanism type .
         /// </summary>
@@ -490,7 +506,6 @@
                                                };
             return translationTable[analysisType];
         }
-        
         /// <summary>
         /// Converts the input analysis type to the Dam analysis type.
         /// </summary>
@@ -550,7 +565,6 @@
                                                };
             return translationTable[inputZoneType];
         }
-        
         /// <summary>
         /// Converts the Dam message type to the input message type.
         /// </summary>
Index: DamClients/DamUI/branches/nwoUI_18.1/doc/combineTrunkAndBranch.docx
===================================================================
diff -u
Binary files differ
Index: DamClients/DamUI/branches/nwoUI_18.1/src/DamClientsLibrary/Deltares.Dam.Data/CsvImporters/CsvImporterCharacteristicPoints.cs
===================================================================
diff -u -r1849 -r1851
--- DamClients/DamUI/branches/nwoUI_18.1/src/DamClientsLibrary/Deltares.Dam.Data/CsvImporters/CsvImporterCharacteristicPoints.cs	(.../CsvImporterCharacteristicPoints.cs)	(revision 1849)
+++ DamClients/DamUI/branches/nwoUI_18.1/src/DamClientsLibrary/Deltares.Dam.Data/CsvImporters/CsvImporterCharacteristicPoints.cs	(.../CsvImporterCharacteristicPoints.cs)	(revision 1851)
@@ -317,8 +317,23 @@
                     //optional, do not check
                     int YTeenGeulCol = CsvReaderUtilities.GetHeaderIndexByString(headers, CharacteristicPointCsvIdentifiers.BottomRiverChannelY);
                     //optional, do not check
-                    int ZTeenGeulCol = CsvReaderUtilities.GetHeaderIndexByString(headers, CharacteristicPointCsvIdentifiers.BottomRiverChannelZ);                    
+                    int ZTeenGeulCol = CsvReaderUtilities.GetHeaderIndexByString(headers, CharacteristicPointCsvIdentifiers.BottomRiverChannelZ);
 
+                    int XNWO1 = CsvReaderUtilities.GetHeaderIndexByString(headers, CharacteristicPointCsvIdentifiers.NonWaterRetainingObjectPoint1X);
+                    int YNWO1 = CsvReaderUtilities.GetHeaderIndexByString(headers, CharacteristicPointCsvIdentifiers.NonWaterRetainingObjectPoint1Y);
+                    int ZNWO1 = CsvReaderUtilities.GetHeaderIndexByString(headers, CharacteristicPointCsvIdentifiers.NonWaterRetainingObjectPoint1Z);
+
+                    int XNWO2 = CsvReaderUtilities.GetHeaderIndexByString(headers, CharacteristicPointCsvIdentifiers.NonWaterRetainingObjectPoint2X);
+                    int YNWO2 = CsvReaderUtilities.GetHeaderIndexByString(headers, CharacteristicPointCsvIdentifiers.NonWaterRetainingObjectPoint2Y);
+                    int ZNWO2 = CsvReaderUtilities.GetHeaderIndexByString(headers, CharacteristicPointCsvIdentifiers.NonWaterRetainingObjectPoint2Z);
+
+                    int XNWO3 = CsvReaderUtilities.GetHeaderIndexByString(headers, CharacteristicPointCsvIdentifiers.NonWaterRetainingObjectPoint3X);
+                    int YNWO3 = CsvReaderUtilities.GetHeaderIndexByString(headers, CharacteristicPointCsvIdentifiers.NonWaterRetainingObjectPoint3Y);
+                    int ZNWO3 = CsvReaderUtilities.GetHeaderIndexByString(headers, CharacteristicPointCsvIdentifiers.NonWaterRetainingObjectPoint3Z);
+
+                    int XNWO4 = CsvReaderUtilities.GetHeaderIndexByString(headers, CharacteristicPointCsvIdentifiers.NonWaterRetainingObjectPoint4X);
+                    int YNWO4 = CsvReaderUtilities.GetHeaderIndexByString(headers, CharacteristicPointCsvIdentifiers.NonWaterRetainingObjectPoint4Y);
+                    int ZNWO4 = CsvReaderUtilities.GetHeaderIndexByString(headers, CharacteristicPointCsvIdentifiers.NonWaterRetainingObjectPoint4Z);
                     // optional so do not check
                     const string fieldVolgnummer = "Volgnummer";
                     int VolgnummerCol = CsvReaderUtilities.GetHeaderIndexByString(headers, fieldVolgnummer);
@@ -467,6 +482,48 @@
                                 characteristicPoints.Points.Add(irc);
                             }
 
+
+                            if (XNWO1 > 0)
+                            {
+                                CharPoint nwo1 = new CharPoint();
+                                nwo1.Type = CharacteristicPointType.NonWaterRetainingObjectPoint1;
+                                nwo1.X = Convert.ToDouble(csv[XNWO1]);
+                                nwo1.Y = Convert.ToDouble(csv[YNWO1]);
+                                nwo1.Z = Convert.ToDouble(csv[ZNWO1]);
+                                characteristicPoints.Points.Add(nwo1);
+                            }
+
+                            if (XNWO2 > 0)
+                            {
+                                CharPoint nwo2 = new CharPoint();
+                                nwo2.Type = CharacteristicPointType.NonWaterRetainingObjectPoint2;
+                                nwo2.X = Convert.ToDouble(csv[XNWO2]);
+                                nwo2.Y = Convert.ToDouble(csv[YNWO2]);
+                                nwo2.Z = Convert.ToDouble(csv[ZNWO2]);
+                                characteristicPoints.Points.Add(nwo2);
+                            }
+
+                            if (XNWO3 > 0)
+                            {
+                                CharPoint nwo3 = new CharPoint();
+                                nwo3.Type = CharacteristicPointType.NonWaterRetainingObjectPoint3;
+                                nwo3.X = Convert.ToDouble(csv[XNWO3]);
+                                nwo3.Y = Convert.ToDouble(csv[YNWO3]);
+                                nwo3.Z = Convert.ToDouble(csv[ZNWO3]);
+                                characteristicPoints.Points.Add(nwo3);
+                            }
+
+                            if (XNWO4 > 0)
+                            {
+                                CharPoint nwo4 = new CharPoint();
+                                nwo4.Type = CharacteristicPointType.NonWaterRetainingObjectPoint4;
+                                nwo4.X = Convert.ToDouble(csv[XNWO4]);
+                                nwo4.Y = Convert.ToDouble(csv[YNWO4]);
+                                nwo4.Z = Convert.ToDouble(csv[ZNWO4]);
+                                characteristicPoints.Points.Add(nwo4);
+                            }
+
+
                             characteristicPointsRecords.Add(characteristicPoints);
                         }
                         catch (Exception e)