Index: System tests/AutomatedSystemTests/AutomatedSystemTests/Script17.rxtst
===================================================================
diff -u -r3faa8d441449ec2bc7795930a3aa34479150294f -r5043695b06b2829651e6944c5d5e7bf6fe35adac
--- System tests/AutomatedSystemTests/AutomatedSystemTests/Script17.rxtst	(.../Script17.rxtst)	(revision 3faa8d441449ec2bc7795930a3aa34479150294f)
+++ System tests/AutomatedSystemTests/AutomatedSystemTests/Script17.rxtst	(.../Script17.rxtst)	(revision 5043695b06b2829651e6944c5d5e7bf6fe35adac)
@@ -195,6 +195,10 @@
 				</parameters>
 			</smartfoldernode>
 			<smartfoldernode
+			id="1c70f8c7-5565-4fc8-be03-751b650dd2c8"
+			name="HRD2">
+			</smartfoldernode>
+			<smartfoldernode
 			id="1c75df49-5c64-4837-9005-47afa99cfa24"
 			name="CloseView">
 			</smartfoldernode>
@@ -1280,6 +1284,20 @@
 					</param>
 				</parameters>
 			</smartfoldernode>
+			<testmodule
+			id="76c62980-5c1d-4a50-b671-04d9d37dc08e"
+			name="SelectGenericItemInProjectExplorer"
+			ref="ff04c0e9-5dfd-4aa7-b9fc-b8ec84f1399e"
+			type="Recording">
+				<databinding>
+					<var
+					dataname="pathToHRDInPE"
+					datasourceid="6e262def-ea48-4168-bbec-fd066c51ec61"
+					variableid="a31c9d25-98bf-4be6-a0e1-d56bcf8fe1d8"
+					variablename="pathToItemInProjectExplorer">
+					</var>
+				</databinding>
+			</testmodule>
 			<smartfoldernode
 			id="77362e1c-e91c-490a-a2fa-6ad4e89abde8"
 			name="ImportStructures">
@@ -1410,6 +1428,44 @@
 					value="">
 					</param>
 				</parameters>
+				<conditiongroup
+				comparison="AND"
+				enabled="True">
+					<condition
+					comparison="IsEqual">
+						<leftvalue>
+							<datavaluesource>
+								<databinding
+								bindingtype="DataConnector"
+								dataname="labelFM"
+								id="6e262def-ea48-4168-bbec-fd066c51ec61">
+								</databinding>
+							</datavaluesource>
+						</leftvalue>
+						<rightvalue>
+							<simplevaluesource
+							value="STPH">
+							</simplevaluesource>
+						</rightvalue>
+					</condition>
+					<condition
+					comparison="IsEqual">
+						<leftvalue>
+							<datavaluesource>
+								<databinding
+								bindingtype="DataConnector"
+								dataname="labelFM"
+								id="6e262def-ea48-4168-bbec-fd066c51ec61">
+								</databinding>
+							</datavaluesource>
+						</leftvalue>
+						<rightvalue>
+							<simplevaluesource
+							value="STBI">
+							</simplevaluesource>
+						</rightvalue>
+					</condition>
+				</conditiongroup>
 			</smartfoldernode>
 			<smartfoldernode
 			id="845a0f1b-0238-48b0-9af2-c881f2f42ca8"
@@ -1827,7 +1883,7 @@
 			</testmodule>
 			<smartfoldernode
 			id="a813ea1d-a889-49ec-ad43-21d4738bcd61"
-			name="HRD">
+			name="HRD1">
 			</smartfoldernode>
 			<testmodule
 			id="a86d1a3a-c15b-44a3-92d7-fa9cec1e3838"
@@ -1936,7 +1992,7 @@
 			type="Recording">
 				<databinding>
 					<var
-					dataname="pathToHBCFile"
+					dataname="pathToHRDFile1"
 					datasourceid="6e262def-ea48-4168-bbec-fd066c51ec61"
 					variableid="fb8a2c11-63e9-414f-85f9-04a5eb026a9f"
 					variablename="fileNameToOpen">
@@ -2002,6 +2058,20 @@
 					</condition>
 				</conditiongroup>
 			</smartfoldernode>
+			<testmodule
+			id="b9d78b60-f643-4827-b5ac-7476458ede48"
+			name="AddHRDFile"
+			ref="e9443dc8-83ae-41cf-a26f-36e5dbd3e114"
+			type="Recording">
+				<databinding>
+					<var
+					dataname="pathToHRDFile2"
+					datasourceid="6e262def-ea48-4168-bbec-fd066c51ec61"
+					variableid="fb8a2c11-63e9-414f-85f9-04a5eb026a9f"
+					variablename="fileNameToOpen">
+					</var>
+				</databinding>
+			</testmodule>
 			<smartfoldernode
 			id="bb4e6ced-45f5-4fb2-b1a4-a8e9cd73e7ce"
 			name="Piping">
@@ -2708,7 +2778,7 @@
 										</smartfoldernode>
 										<smartfoldernode
 										id="a813ea1d-a889-49ec-ad43-21d4738bcd61"
-										name="HRD">
+										name="HRD1">
 											<testmodule
 											id="4d4bd7ad-73cf-4cfa-9929-2b46c3eb6a5a"
 											name="SelectGenericItemInProjectExplorer">
@@ -2718,6 +2788,18 @@
 											name="AddHRDFile">
 											</testmodule>
 										</smartfoldernode>
+										<smartfoldernode
+										id="1c70f8c7-5565-4fc8-be03-751b650dd2c8"
+										name="HRD2">
+											<testmodule
+											id="76c62980-5c1d-4a50-b671-04d9d37dc08e"
+											name="SelectGenericItemInProjectExplorer">
+											</testmodule>
+											<testmodule
+											id="b9d78b60-f643-4827-b5ac-7476458ede48"
+											name="AddHRDFile">
+											</testmodule>
+										</smartfoldernode>
 									</smartfoldernode>
 									<smartfoldernode
 									id="7ffe4128-a68c-4b59-90ee-fdb9262eadda"
@@ -3384,9 +3466,12 @@
 					pathToHLCDFile
 				</column>
 				<column>
-					pathToHBCFile
+					pathToHRDFile1
 				</column>
 				<column>
+					pathToHRDFile2
+				</column>
+				<column>
 					pathToSectionsDivisionsFile
 				</column>
 				<column>
@@ -3479,9 +3564,12 @@
 						pathToHLCDFile
 					</th>
 					<th>
-						pathToHBCFile
+						pathToHRDFile1
 					</th>
 					<th>
+						pathToHRDFile2
+					</th>
+					<th>
 						pathToSectionsDivisionsFile
 					</th>
 					<th>
@@ -3565,12 +3653,15 @@
 						12-2&gt;@GEKB
 					</td>
 					<td>
-						X:\commonData\databases\WBI2017_IJsselmeer_12-2_v02\hlcd.sqlite
+						X:\commonData\databases\WBI2017_IJsselmeer_12-2_12-1_v02\hlcd.sqlite
 					</td>
 					<td>
-						X:\commonData\databases\WBI2017_IJsselmeer_12-2_v02\WBI2017_IJsselmeer_12-2_v02.sqlite
+						X:\commonData\databases\WBI2017_IJsselmeer_12-2_12-1_v02\WBI2017_IJsselmeer_12-2_v02.sqlite
 					</td>
 					<td>
+						X:\commonData\databases\WBI2017_IJsselmeer_12-2_12-1_v02\WBI2017_Waddenzee_West_12-1_v03.sqlite
+					</td>
+					<td>
 						X:\script17\STPH\vakindeling_12-2.shp
 					</td>
 					<td>
@@ -3656,6 +3747,9 @@
 						X:\commonData\databases\WBI2017_IJsselmeer_12-2_12-1_v02\WBI2017_IJsselmeer_12-2_v02.sqlite
 					</td>
 					<td>
+						X:\commonData\databases\WBI2017_IJsselmeer_12-2_12-1_v02\WBI2017_Waddenzee_West_12-1_v03.sqlite
+					</td>
+					<td>
 						X:\script17\GEKB\vakindeling Grasbekledingen erosie kruin en binnentalud 12-2.shp
 					</td>
 					<td>
@@ -3673,7 +3767,6 @@
 						[Berekeningen-&gt;[profiel001-&gt;[Opmerkingen][Invoer][Resultaat-&gt;[Sterkte berekening][HBN][Overslagdebiet]]][profiel002-&gt;[Opmerkingen][Invoer][Resultaat-&gt;[Sterkte berekening][HBN][Overslagdebiet]]][profiel003-&gt;[Opmerkingen][Invoer][Resultaat-&gt;[Sterkte berekening][HBN][Overslagdebiet]]][profiel004-&gt;[Opmerkingen][Invoer][Resultaat-&gt;[Sterkte berekening][HBN][Overslagdebiet]]][profiel005-&gt;[Opmerkingen][Invoer][Resultaat-&gt;[Sterkte berekening][HBN][Overslagdebiet]]][Nieuwe berekening-&gt;[Opmerkingen][Invoer][Resultaat-&gt;[Sterkte berekening][HBN][Overslagdebiet]]]]
 					</td>
 					<td>
-						0,2,4,7,8
 					</td>
 					<td>
 						2-6
@@ -3735,12 +3828,15 @@
 						41-1&gt;@HTKW
 					</td>
 					<td>
-						X:\commonData\databases\WBI2017_Bovenrijn_41-1_v04\hlcd.sqlite
+						X:\commonData\databases\WBI2017_Bovenrijn_41-1_41-2_v04\hlcd.sqlite
 					</td>
 					<td>
-						X:\commonData\databases\WBI2017_Bovenrijn_41-1_v04\WBI2017_Bovenrijn_41-1_v04.sqlite
+						X:\commonData\databases\WBI2017_Bovenrijn_41-1_41-2_v04\WBI2017_Bovenrijn_41-1_v04.sqlite
 					</td>
 					<td>
+						X:\commonData\databases\WBI2017_Bovenrijn_41-1_41-2_v04\WBI2017_Bovenrijn_41-2_v04.sqlite
+					</td>
+					<td>
 						X:\script17\STBI\vakindeling_41-1.shp
 					</td>
 					<td>
@@ -3821,12 +3917,15 @@
 						36-2&gt;@BSKW
 					</td>
 					<td>
-						X:\commonData\databases\WBI2017_Bovenmaas_36-2_v03\hlcd.sqlite
+						X:\commonData\databases\WBI2017_Bovenmaas_36-1_36-2_v03\hlcd.sqlite
 					</td>
 					<td>
-						X:\commonData\databases\WBI2017_Bovenmaas_36-2_v03\WBI2017_Bovenmaas_36-2_v03.sqlite
+						X:\commonData\databases\WBI2017_Bovenmaas_36-1_36-2_v03\WBI2017_Bovenmaas_36-2_v03.sqlite
 					</td>
 					<td>
+						X:\commonData\databases\WBI2017_Bovenmaas_36-1_36-2_v03\WBI2017_Bovenmaas_36-1_v03.sqlite
+					</td>
+					<td>
 						X:\script17\HTKW\vakindeling_traject_36-2.shp
 					</td>
 					<td>
@@ -3845,7 +3944,6 @@
 						[Berekeningen-&gt;['Keersluis Cuijk'-&gt;[Opmerkingen][Invoer][Resultaat]]['Gemaal van Sasse'-&gt;[Opmerkingen][Invoer][Resultaat]][Nieuwe berekening-&gt;[Opmerkingen][Invoer][Resultaat]]]
 					</td>
 					<td>
-						16,112
 					</td>
 					<td>
 						8-9
@@ -3907,12 +4005,15 @@
 						34-1&gt;@STKWp
 					</td>
 					<td>
-						X:\commonData\databases\WBI2017_Benedenrijn_34-1_v04\hlcd.sqlite
+						X:\commonData\databases\WBI2017_Benedenrijn_34-1_34-2_v04\hlcd.sqlite
 					</td>
 					<td>
-						X:\commonData\databases\WBI2017_Benedenrijn_34-1_v04\WBI2017_Benedenrijn_34-1_v04.sqlite
+						X:\commonData\databases\WBI2017_Benedenrijn_34-1_34-2_v04\WBI2017_Benedenrijn_34-1_v04.sqlite
 					</td>
 					<td>
+						X:\commonData\databases\WBI2017_Benedenrijn_34-1_34-2_v04\WBI2017_Benedenrijn_34-2_v04.sqlite
+					</td>
+					<td>
 						X:\script17\BSKW\vakindeling_traject_34-1.shp
 					</td>
 					<td>
@@ -3931,7 +4032,6 @@
 						[Berekeningen-&gt;['Amersluis'-&gt;[Opmerkingen][Invoer][Resultaat]]['Gemaal Schuddebeurs'-&gt;[Opmerkingen][Invoer][Resultaat]]['Gemaal Hollandsch Diep'-&gt;[Opmerkingen][Invoer][Resultaat]][Nieuwe berekening-&gt;[Opmerkingen][Invoer][Resultaat]]]
 					</td>
 					<td>
-						169,216,229
 					</td>
 					<td>
 						10-12
@@ -3993,12 +4093,15 @@
 						44-2&gt;@STKWp&gt;Berekeningen
 					</td>
 					<td>
-						X:\commonData\databases\WBI2017_Markermeer_13-9_13a-1_44-2_v02\hlcd.sqlite
+						X:\commonData\databases\WBI2017_Markermeer_13-9_13a_13b-1_44-2_v02\hlcd.sqlite
 					</td>
 					<td>
-						X:\commonData\databases\WBI2017_Markermeer_13-9_13a-1_44-2_v02\WBI2017_Markermeer_13-9_13a-1_44-2_v02.sqlite
+						X:\commonData\databases\WBI2017_Markermeer_13-9_13a_13b-1_44-2_v02\WBI2017_Markermeer_13-9_13a-1_44-2_v02.sqlite
 					</td>
 					<td>
+						X:\commonData\databases\WBI2017_Markermeer_13-9_13a_13b-1_44-2_v02\WBI2017_Markermeer_13b-1_v02.sqlite
+					</td>
+					<td>
 						X:\script17\STKWp\vakindeling_traject_44-2.shp
 					</td>
 					<td>
@@ -4017,7 +4120,6 @@
 						[Berekeningen-&gt;[Kunstwerk1-&gt;[Opmerkingen][Invoer][Resultaat]][Kunstwerk2-&gt;[Opmerkingen][Invoer][Resultaat]][Kunstwerk3-&gt;[Opmerkingen][Invoer][Resultaat]][Kunstwerk4-&gt;[Opmerkingen][Invoer][Resultaat]][Nieuwe berekening-&gt;[Opmerkingen][Invoer][Resultaat]]]
 					</td>
 					<td>
-						18,21,32
 					</td>
 					<td>
 						13-16
@@ -6063,6 +6165,9 @@
 			id="1c3a1372-3a8c-416d-bfed-95b1fb6a9ae0">
 			</testcontainer>
 			<testcontainer
+			id="1c70f8c7-5565-4fc8-be03-751b650dd2c8">
+			</testcontainer>
+			<testcontainer
 			id="1c75df49-5c64-4837-9005-47afa99cfa24">
 			</testcontainer>
 			<testcontainer