diff --git a/conformance_test/core_language_tests/negative_tests/06_types_and_values.script b/conformance_test/core_language_tests/negative_tests/06_types_and_values.script
index 0f342af54435f59154fba9cd2f69aa38b6940921..9802bc9ff755b97f6698f843dc5a082cb7f7bf38 100644
--- a/conformance_test/core_language_tests/negative_tests/06_types_and_values.script
+++ b/conformance_test/core_language_tests/negative_tests/06_types_and_values.script
@@ -3859,6 +3859,446 @@ Dynamic test case error: Performing a valueof or send operation on a non-specifi
 <END_TC>
 :exmp
 
+*---------------------------------------------------------------------*
+:h3. NegSem_060203_records_and_sets_of_single_types_016 negative test
+.*---------------------------------------------------------------------*
+:xmp tab=0.
+
+<TC - array as a record-of value index on right hand side (less items than record-of dimension) >
+
+<COMPILE>
+
+<MODULE TTCN NegSem_060203_records_and_sets_of_single_types_016 NegSem_060203_records_and_sets_of_single_types_016.ttcn >
+/******************************************************************************
+ ** @version  0.0.1
+ ** @purpose  1:6.2.3, array as a record-of value index on right hand side (less items than record-of dimension)
+ ** @verdict  pass reject
+ ***************************************************/
+
+// The following requirement is tested:
+// For nested record of or set of types, an array or record of integer restricted 
+// to a single size can be used as a short-hand notation for a nested index
+// notation.
+
+module NegSem_060203_records_and_sets_of_single_types_016 {
+
+	type component GeneralComp {	    	    
+	}
+ 
+	type record of record of integer RoRoI;
+	
+	testcase TC_NegSem_060203_records_and_sets_of_single_types_016() runs on GeneralComp {
+
+		var RoRoI v_rec := {{0, 1}, {2, 3}};
+        var integer v_index[3] := { 1, 0, 0 }
+		if (v_rec[v_index] == 2) {
+			setverdict(pass);
+		} else {
+			setverdict(fail);
+		}
+	}
+	
+	control {
+		execute(TC_NegSem_060203_records_and_sets_of_single_types_016());
+	}
+
+}
+<END_MODULE>
+
+<RESULT COUNT 1>
+error: The type `integer\[3\]' contains too many indexes \(3\) in the short-hand notation for nested indexes.
+<END_RESULT>
+
+<END_TC>
+:exmp
+
+*---------------------------------------------------------------------*
+:h3. NegSem_060203_records_and_sets_of_single_types_017 negative test
+.*---------------------------------------------------------------------*
+:xmp tab=0.
+
+<TC - array as a record-of value index on left hand side (less items than record-of dimension) >
+
+<COMPILE>
+
+<MODULE TTCN NegSem_060203_records_and_sets_of_single_types_017 NegSem_060203_records_and_sets_of_single_types_017.ttcn >
+/******************************************************************************
+ ** @version  0.0.1
+ ** @purpose  1:6.2.3, array as a record-of value index on left hand side (less items than record-of dimension)
+ ** @verdict  pass reject
+ ***************************************************/
+
+// The following requirement is tested:
+// For nested record of or set of types, an array or record of integer restricted 
+// to a single size can be used as a short-hand notation for a nested index
+// notation.
+
+module NegSem_060203_records_and_sets_of_single_types_017 {
+
+	type component GeneralComp {	    	    
+	}
+ 
+	type record of record of integer RoRoI;
+	
+	testcase TC_NegSem_060203_records_and_sets_of_single_types_017() runs on GeneralComp {
+
+		var RoRoI v_rec := {{0, 1}, {2, 3}};
+        var integer v_index[3] := { 1, 0, 0 }
+        v_rec[v_index] := 10;
+		if (v_rec == {{0, 1}, {10, 3}}) {
+			setverdict(pass);
+		} else {
+			setverdict(fail);
+		}
+	}
+	
+	control {
+		execute(TC_NegSem_060203_records_and_sets_of_single_types_017());
+	}
+
+}
+<END_MODULE>
+
+<RESULT COUNT 1>
+error: The type `integer\[3\]' contains too many indexes \(3\) in the short-hand notation for nested indexes.
+<END_RESULT>
+
+<END_TC>
+:exmp
+
+*---------------------------------------------------------------------*
+:h3. NegSem_060203_records_and_sets_of_single_types_018 negative test
+.*---------------------------------------------------------------------*
+:xmp tab=0.
+
+<TC - fixed-size record-of as a record-of value index on right hand side (less items than record-of dimension) >
+
+<COMPILE>
+
+<MODULE TTCN NegSem_060203_records_and_sets_of_single_types_018 NegSem_060203_records_and_sets_of_single_types_018.ttcn >
+/******************************************************************************
+ ** @version  0.0.1
+ ** @purpose  1:6.2.3, fixed-size record-of as a record-of value index on right hand side (less items than record-of dimension)
+ ** @verdict  pass reject
+ ***************************************************/
+
+// The following requirement is tested:
+// For nested record of or set of types, an array or record of integer restricted 
+// to a single size can be used as a short-hand notation for a nested index
+// notation.
+
+module NegSem_060203_records_and_sets_of_single_types_018 {
+
+	type component GeneralComp {	    	    
+	}
+ 
+    type record length(3) of integer Indexer;
+	type record of record of integer RoRoI;
+	
+	testcase TC_NegSem_060203_records_and_sets_of_single_types_018() runs on GeneralComp {
+
+		var RoRoI v_rec := {{0, 1}, {2, 3}};
+        var Indexer v_index := { 1, 0, 0 }
+		if (v_rec[v_index] == 2) {
+			setverdict(pass);
+		} else {
+			setverdict(fail);
+		}
+	}
+	
+	control {
+		execute(TC_NegSem_060203_records_and_sets_of_single_types_018());
+	}
+
+}
+<END_MODULE>
+
+<RESULT COUNT 1>
+error: The type `@NegSem_060203_records_and_sets_of_single_types_018.Indexer' contains too many indexes \(3\) in the short-hand notation for nested indexes.
+<END_RESULT>
+
+<END_TC>
+:exmp
+
+*---------------------------------------------------------------------*
+:h3. NegSem_060203_records_and_sets_of_single_types_019 negative test
+.*---------------------------------------------------------------------*
+:xmp tab=0.
+
+<TC - fixed-size record-of as a record-of value index on left hand side (less items than record-of dimension) >
+
+<COMPILE>
+
+<MODULE TTCN NegSem_060203_records_and_sets_of_single_types_019 NegSem_060203_records_and_sets_of_single_types_019.ttcn >
+/******************************************************************************
+ ** @version  0.0.1
+ ** @purpose  1:6.2.3, fixed-size record-of as a record-of value index on left hand side (less items than record-of dimension)
+ ** @verdict  pass reject
+ ***************************************************/
+
+// The following requirement is tested:
+// For nested record of or set of types, an array or record of integer restricted 
+// to a single size can be used as a short-hand notation for a nested index
+// notation.
+
+module NegSem_060203_records_and_sets_of_single_types_019 {
+
+	type component GeneralComp {	    	    
+	}
+ 
+    type record length(3) of integer Indexer;
+	type record of record of integer RoRoI;
+	
+	testcase TC_NegSem_060203_records_and_sets_of_single_types_019() runs on GeneralComp {
+
+		var RoRoI v_rec := {{0, 1}, {2, 3}};
+        var Indexer v_index := { 1, 0, 0 }
+        v_rec[v_index] := 10;
+		if (v_rec == {{0, 1}, {10, 3}}) {
+			setverdict(pass);
+		} else {
+			setverdict(fail);
+		}
+	}
+	
+	control {
+		execute(TC_NegSem_060203_records_and_sets_of_single_types_019());
+	}
+
+}
+<END_MODULE>
+
+<RESULT COUNT 1>
+error: The type `@NegSem_060203_records_and_sets_of_single_types_019.Indexer' contains too many indexes \(3\) in the short-hand notation for nested indexes.
+<END_RESULT>
+
+<END_TC>
+:exmp
+
+*---------------------------------------------------------------------*
+:h3. NegSem_060203_records_and_sets_of_single_types_020 negative test
+.*---------------------------------------------------------------------*
+:xmp tab=0.
+
+<TC - fixed-size set-of as a record-of value index on right hand side >
+
+<COMPILE>
+
+<MODULE TTCN NegSem_060203_records_and_sets_of_single_types_020 NegSem_060203_records_and_sets_of_single_types_020.ttcn >
+/******************************************************************************
+ ** @version  0.0.1
+ ** @purpose  1:6.2.3, fixed-size set-of as a record-of value index on right hand side
+ ** @verdict  pass reject
+ ***************************************************/
+
+// The following requirement is tested:
+// For nested record of or set of types, an array or record of integer restricted 
+// to a single size can be used as a short-hand notation for a nested index
+// notation.
+
+module NegSem_060203_records_and_sets_of_single_types_020 {
+
+	type component GeneralComp {	    	    
+	}
+ 
+    type set length(2) of integer Indexer;
+	type record of record of integer RoRoI;
+	
+	testcase TC_NegSem_060203_records_and_sets_of_single_types_020() runs on GeneralComp {
+
+		var RoRoI v_rec := {{0, 1}, {2, 3}};
+        var Indexer v_index := { 1, 0 }
+		if (v_rec[v_index] == 2) {
+			setverdict(pass);
+		} else {
+			setverdict(fail);
+		}
+	}
+	
+	control {
+		execute(TC_NegSem_060203_records_and_sets_of_single_types_020());
+	}
+
+}
+<END_MODULE>
+
+<RESULT COUNT 1>
+error: A value or expression of type integer was expected
+<END_RESULT>
+<RESULT COUNT 1>
+error: The operands of operation `==' should be of compatible types
+<END_RESULT>
+
+<END_TC>
+:exmp
+
+*---------------------------------------------------------------------*
+:h3. NegSem_060203_records_and_sets_of_single_types_021 negative test
+.*---------------------------------------------------------------------*
+:xmp tab=0.
+
+<TC - fixed-size set-of as a record-of value index on left hand side >
+
+<COMPILE>
+
+<MODULE TTCN NegSem_060203_records_and_sets_of_single_types_021 NegSem_060203_records_and_sets_of_single_types_021.ttcn >
+/******************************************************************************
+ ** @version  0.0.1
+ ** @purpose  1:6.2.3, fixed-size set-of as a record-of value index on left hand side
+ ** @verdict  pass reject
+ ***************************************************/
+
+// The following requirement is tested:
+// For nested record of or set of types, an array or record of integer restricted 
+// to a single size can be used as a short-hand notation for a nested index
+// notation.
+
+module NegSem_060203_records_and_sets_of_single_types_021 {
+
+	type component GeneralComp {	    	    
+	}
+ 
+    type set length(2) of integer Indexer;
+	type record of record of integer RoRoI;
+	
+	testcase TC_NegSem_060203_records_and_sets_of_single_types_021() runs on GeneralComp {
+
+		var RoRoI v_rec := {{0, 1}, {2, 3}};
+        var Indexer v_index := { 1, 0 }
+        v_rec[v_index] := 10;
+		if (v_rec == {{0, 1}, {10, 3}}) {
+			setverdict(pass);
+		} else {
+			setverdict(fail);
+		}
+	}
+	
+	control {
+		execute(TC_NegSem_060203_records_and_sets_of_single_types_021());
+	}
+
+}
+<END_MODULE>
+
+<RESULT COUNT 1>
+error: A value or expression of type integer was expected
+<END_RESULT>
+<RESULT COUNT 1>
+error: record of value was expected
+<END_RESULT>
+
+<END_TC>
+:exmp
+
+*---------------------------------------------------------------------*
+:h3. NegSem_060203_records_and_sets_of_single_types_022 negative test
+.*---------------------------------------------------------------------*
+:xmp tab=0.
+
+<TC - variable-size record-of as a record-of value index on right hand side >
+
+<COMPILE>
+
+<MODULE TTCN NegSem_060203_records_and_sets_of_single_types_022 NegSem_060203_records_and_sets_of_single_types_022.ttcn >
+/******************************************************************************
+ ** @version  0.0.1
+ ** @purpose  1:6.2.3, variable-size record-of as a record-of value index on right hand side
+ ** @verdict  pass reject
+ ***************************************************/
+
+// The following requirement is tested:
+// For nested record of or set of types, an array or record of integer restricted 
+// to a single size can be used as a short-hand notation for a nested index
+// notation.
+
+module NegSem_060203_records_and_sets_of_single_types_022 {
+
+	type component GeneralComp {	    	    
+	}
+ 
+    type record of integer Indexer;
+	type record of record of integer RoRoI;
+	
+	testcase TC_NegSem_060203_records_and_sets_of_single_types_022() runs on GeneralComp {
+
+		var RoRoI v_rec := {{0, 1}, {2, 3}};
+        var Indexer v_index := { 1, 0 }
+		if (v_rec[v_index] == 2) {
+			setverdict(pass);
+		} else {
+			setverdict(fail);
+		}
+	}
+	
+	control {
+		execute(TC_NegSem_060203_records_and_sets_of_single_types_022());
+	}
+
+}
+<END_MODULE>
+
+<RESULT COUNT 1>
+error: The type `@NegSem_060203_records_and_sets_of_single_types_022.Indexer' must have single size length restriction when used as a short-hand notation for nested indexes.
+<END_RESULT>
+
+<END_TC>
+:exmp
+
+*---------------------------------------------------------------------*
+:h3. NegSem_060203_records_and_sets_of_single_types_023 negative test
+.*---------------------------------------------------------------------*
+:xmp tab=0.
+
+<TC - variable-size record-of as a record-of value index on left hand side (less items than record-of dimension) >
+
+<COMPILE>
+
+<MODULE TTCN NegSem_060203_records_and_sets_of_single_types_023 NegSem_060203_records_and_sets_of_single_types_023.ttcn >
+/******************************************************************************
+ ** @version  0.0.1
+ ** @purpose  1:6.2.3, variable-size record-of as a record-of value index on left hand side (less items than record-of dimension)
+ ** @verdict  pass reject
+ ***************************************************/
+
+// The following requirement is tested:
+// For nested record of or set of types, an array or record of integer restricted 
+// to a single size can be used as a short-hand notation for a nested index
+// notation.
+
+module NegSem_060203_records_and_sets_of_single_types_023 {
+
+	type component GeneralComp {	    	    
+	}
+ 
+    type record of integer Indexer;
+	type record of record of integer RoRoI;
+	
+	testcase TC_NegSem_060203_records_and_sets_of_single_types_023() runs on GeneralComp {
+
+		var RoRoI v_rec := {{0, 1}, {2, 3}};
+        var Indexer v_index := { 1, 0 }
+        v_rec[v_index] := 10;
+		if (v_rec == {{0, 1}, {10, 3}}) {
+			setverdict(pass);
+		} else {
+			setverdict(fail);
+		}
+	}
+	
+	control {
+		execute(TC_NegSem_060203_records_and_sets_of_single_types_023());
+	}
+
+}
+<END_MODULE>
+
+<RESULT COUNT 1>
+error: The type `@NegSem_060203_records_and_sets_of_single_types_023.Indexer' must have single size length restriction when used as a short-hand notation for nested indexes.
+<END_RESULT>
+
+<END_TC>
+:exmp
+
 *---------------------------------------------------------------------*
 :h3. NegSyn_060203_records_and_sets_of_single_types_001 negative test
 .*---------------------------------------------------------------------*
@@ -5867,6 +6307,105 @@ error: A value or expression of type integer was expected
 <END_TC>
 :exmp
 
+*---------------------------------------------------------------------*
+:h3. NegSem_060207_arrays_020 negative test
+.*---------------------------------------------------------------------*
+:xmp tab=0.
+
+<TC - integer array with too many items as multidimensional array index >
+
+<COMPILE>
+
+<MODULE TTCN NegSem_060207_arrays_020 NegSem_060207_arrays_020.ttcn >
+/******************************************************************************
+ ** @version  0.0.1
+ ** @purpose  1:6.2.7, integer array with too many items as multidimensional array index
+ ** @verdict  pass reject
+ ***************************************************/
+
+// The following requirement is tested:
+// An array or record of integer restricted to a single size can be used in the 
+// index notation as a short-hand for the repeated index notation.
+
+module NegSem_060207_arrays_020 {
+
+	type component GeneralComp {
+	}
+	
+	testcase TC_NegSem_060207_arrays_020() runs on GeneralComp {        
+        var integer v_rhindexes[3] := { 0, 1, 0 }, v_lhindexes[3] := { 1, 2, 0 }
+        var integer v_arr[2][3] := { { 1, 2, 3 }, { 4, 5, 6 } };
+        // testing both RH and LH side:
+        v_arr[v_lhindexes] := v_arr[v_rhindexes];        
+        if (v_arr == { { 1, 2, 3 }, { 4, 5, 2} }) { setverdict(pass); }
+        else { setverdict(fail); }
+	}
+	
+	control {
+		execute(TC_NegSem_060207_arrays_020());
+	}
+
+}
+<END_MODULE>
+
+<RESULT COUNT 1>
+error: The type `integer\[3\]' contains too many indexes \(3\) in the short-hand notation for nested indexes.
+<END_RESULT>
+
+<END_TC>
+:exmp
+
+*---------------------------------------------------------------------*
+:h3. NegSem_060207_arrays_021 negative test
+.*---------------------------------------------------------------------*
+:xmp tab=0.
+
+<TC - variable-size record of integer as multidimensional array index >
+
+<COMPILE>
+
+<MODULE TTCN NegSem_060207_arrays_021 NegSem_060207_arrays_021.ttcn >
+/******************************************************************************
+ ** @version  0.0.1
+ ** @purpose  1:6.2.7, variable-size record of integer as multidimensional array index
+ ** @verdict  pass reject
+ ***************************************************/
+
+// The following requirement is tested:
+// An array or record of integer restricted to a single size can be used in the 
+// index notation as a short-hand for the repeated index notation.
+
+module NegSem_060207_arrays_021 {
+
+	type component GeneralComp {
+	}
+    
+    type record length(1..2) of integer RI;
+	
+	testcase TC_NegSem_060207_arrays_021() runs on GeneralComp {        
+        var RI v_rhindexes := { 0, 1 }, v_lhindexes := { 1, 2 }
+        var integer v_arr[2][3] := { { 1, 2, 3 }, { 4, 5, 6 } };
+        // testing both RH and LH side:
+        v_arr[v_lhindexes] := v_arr[v_rhindexes];        
+        if (v_arr == { { 1, 2, 3 }, { 4, 5, 2} }) { setverdict(pass); }
+        else { setverdict(fail); }
+	}
+	
+	control {
+		execute(TC_NegSem_060207_arrays_021());
+	}
+
+}
+<END_MODULE>
+
+<RESULT COUNT 1>
+error: The type `@NegSem_060207_arrays_021.RI' must have single size length restriction when used as a short-hand notation for nested indexes.
+<END_RESULT>
+
+<END_TC>
+:exmp
+
+
 *---------------------------------------------------------------------*
 :h3. NegSem_060207_arrays_022 negative test
 .*---------------------------------------------------------------------*
diff --git a/conformance_test/core_language_tests/negative_tests/07-14_folder.script b/conformance_test/core_language_tests/negative_tests/07-14_folder.script
index f7348d9209bc225ee9ceedafd2367e42c4c0fdfa..3d866526a2be1a5c8be58d31e71b4d02a4925edd 100644
--- a/conformance_test/core_language_tests/negative_tests/07-14_folder.script
+++ b/conformance_test/core_language_tests/negative_tests/07-14_folder.script
@@ -1798,6 +1798,129 @@ error: at or before token `control': syntax error, unexpected ControlKeyword, ex
 :h2. 09_test_configurations folder
 .*---------------------------------------------------------------------*
 
+*---------------------------------------------------------------------*
+:h3. NegSem_0901_Communication_ports_002 negative test
+.*---------------------------------------------------------------------*
+:xmp tab=0.
+
+<TC - Ensure that it is not possible to connect a mapped port  >
+
+<COMPILE>
+<EXECUTE_PARALLEL>
+
+<MODULE TTCN NegSem_0901_Communication_ports_002 NegSem_0901_Communication_ports_002.ttcn >
+/******************************************************************************
+ ** @version  0.0.1
+ ** @purpose  1:9, Ensure that it is not possible to connect a mapped port
+ ** @verdict  pass reject
+ ***************************************************/
+
+/*NOTE: see Figure 7(f): connection of two TSI ports is not allowed
+ * */
+
+module NegSem_0901_Communication_ports_002{ 
+
+
+    type port loopbackPort message { 
+	  inout integer
+	} with {extension "internal"}
+
+	type component GeneralComp {	    	    
+		  port loopbackPort p1;
+		 
+	}	
+
+	type component System {	    	    
+		  port loopbackPort p1;
+		 
+	}	
+
+	testcase TC_NegSem_0901_Communication_ports_002() runs on GeneralComp system System {
+		
+		var GeneralComp v_ptc := GeneralComp.create;
+		map(self:p1, system:p1);		
+		connect(self:p1, v_ptc:p1); // error: mtc.p1 is already mapped to SystemComp.p1
+		setverdict(pass);
+	 
+	}
+
+	control{
+		execute(TC_NegSem_0901_Communication_ports_002());
+	}
+
+}
+<END_MODULE>
+
+<RESULT COUNT 1>
+Dynamic test case error: Connect operation cannot be performed on a mapped port \(p1\)
+<END_RESULT>
+
+<END_TC>
+:exmp
+
+*---------------------------------------------------------------------*
+:h3. NegSem_0901_Communication_ports_004 negative test
+.*---------------------------------------------------------------------*
+:xmp tab=0.
+
+<TC - Verify that it is not possible to map a connected port  >
+
+<COMPILE>
+<EXECUTE_PARALLEL>
+
+<MODULE TTCN NegSem_0901_Communication_ports_004 NegSem_0901_Communication_ports_004.ttcn >
+/******************************************************************************
+ ** @version  0.0.1
+ ** @purpose  1:9.1, Verify that it is not possible to map a connected port
+ ** @verdict  pass reject
+ ***************************************************/
+
+/*NOTE: see Figure 7(b): GeneralComp port p1 is mapped to a TSI port P1.
+ * Therefore mapping GeneralComp port p2 with TSI port P1 gives an error.
+ * */
+
+
+
+module NegSem_0901_Communication_ports_004 {
+  
+    type port MyPort message {
+        inout integer
+    } with {extension "internal"}
+
+    type component GeneralComp
+    {
+        port MyPort p1;
+        port MyPort p2;
+    }
+    
+    type component SystemComp
+    {
+        port MyPort p1;
+    }
+	
+    testcase TC_NegSem_0901_Communication_ports_004() runs on GeneralComp system SystemComp {
+		
+	//create a test component        
+        var GeneralComp v_ptc := GeneralComp.create;
+		connect(self:p1, v_ptc:p1);
+		map(self:p1, system:p1); // error: mtc.p1 is already connected to v_ptc.p1
+		setverdict(pass);
+    }
+	
+    control{
+        execute(TC_NegSem_0901_Communication_ports_004());
+    }
+}
+
+<END_MODULE>
+
+<RESULT COUNT 1>
+Dynamic test case error: Map operation is not allowed on a connected port \(p1\).
+<END_RESULT>
+
+<END_TC>
+:exmp
+
 *---------------------------------------------------------------------*
 :h3. NegSem_0901_Communication_ports_007 negative test
 .*---------------------------------------------------------------------*
@@ -1906,7 +2029,7 @@ error: Both endpoints of the mapping are system ports
 
 <COMPILE>
 
-<MODULE TTCN NegSyn_0901_Communication_ports_001 NegSem_0901_Communication_ports_001.ttcn >
+<MODULE TTCN NegSyn_0901_Communication_ports_001 NegSyn_0901_Communication_ports_001.ttcn >
 /***************************************************
  ** @version  0.0.1
  ** @purpose  1:9.1, Verify that a two TSI port cannot be connected
diff --git a/conformance_test/core_language_tests/positive_tests/09_test_configurations/0901_communication_ports/NegSem_0901_Communication_ports_002.ttcn b/conformance_test/core_language_tests/positive_tests/09_test_configurations/0901_communication_ports/NegSem_0901_Communication_ports_002.ttcn
index 7075bce4b18467e0c40f4fd0b107db2db3b5b0ac..bca9884d658e33634e96fe37034d36ac75482555 100644
--- a/conformance_test/core_language_tests/positive_tests/09_test_configurations/0901_communication_ports/NegSem_0901_Communication_ports_002.ttcn
+++ b/conformance_test/core_language_tests/positive_tests/09_test_configurations/0901_communication_ports/NegSem_0901_Communication_ports_002.ttcn
@@ -32,7 +32,7 @@ module NegSem_0901_Communication_ports_002{
 		
 		var GeneralComp v_ptc := GeneralComp.create;
 		map(self:p1, system:p1);		
-		connect(self:p1, v_ptc:p1); // error: v_ptc.p1 is already connected to SystemComp.p1
+		connect(self:p1, v_ptc:p1); // error: mtc.p1 is already mapped to SystemComp.p1
 		setverdict(pass);
 	 
 	}
diff --git a/conformance_test/core_language_tests/positive_tests/09_test_configurations/0901_communication_ports/NegSem_0901_Communication_ports_004.ttcn b/conformance_test/core_language_tests/positive_tests/09_test_configurations/0901_communication_ports/NegSem_0901_Communication_ports_004.ttcn
index 17da3cf4a3cd98e67b1657ce920ed95a579e0861..1413dc30eebe71f65786db28b584e4f1b07ffe76 100644
--- a/conformance_test/core_language_tests/positive_tests/09_test_configurations/0901_communication_ports/NegSem_0901_Communication_ports_004.ttcn
+++ b/conformance_test/core_language_tests/positive_tests/09_test_configurations/0901_communication_ports/NegSem_0901_Communication_ports_004.ttcn
@@ -36,7 +36,7 @@ module NegSem_0901_Communication_ports_004 {
 	//create a test component        
         var GeneralComp v_ptc := GeneralComp.create;
 		connect(self:p1, v_ptc:p1);
-		map(self:p1, system:p1); // error: v_ptc.p1 is already mapped to SystemComp.p1
+		map(self:p1, system:p1); // error: mtc.p1 is already connected to v_ptc.p1
 		setverdict(pass);
     }
 	
diff --git a/conformance_test/core_language_tests/positive_tests/22_communication_operations/2202_message_based_communication/220202_receive_operation/Sem_220202_ReceiveOperation_026.ttcn b/conformance_test/core_language_tests/positive_tests/22_communication_operations/2202_message_based_communication/220202_receive_operation/Sem_220202_ReceiveOperation_026.ttcn
index bc866d22d78762c15f9fd5453ccb876014eccfdb..f221fa0d834d395951ac723f77de862f4fae1a24 100644
--- a/conformance_test/core_language_tests/positive_tests/22_communication_operations/2202_message_based_communication/220202_receive_operation/Sem_220202_ReceiveOperation_026.ttcn
+++ b/conformance_test/core_language_tests/positive_tests/22_communication_operations/2202_message_based_communication/220202_receive_operation/Sem_220202_ReceiveOperation_026.ttcn
@@ -32,7 +32,7 @@ module Sem_220202_ReceiveOperation_026 {
         p[1].send(2);
         p[1].send(3);
 
-        any from p.receive(integer:?) -> @index v_int;
+        any from p.receive(integer:?) -> @index value v_int;
 
         if (v_int == 1) { // evaluation of @lazy (receive shall not be called again)
             alt {
diff --git a/conformance_test/core_language_tests/positive_tests/22_communication_operations/2202_message_based_communication/220203_trigger_operation/Sem_220203_TriggerOperation_025.ttcn b/conformance_test/core_language_tests/positive_tests/22_communication_operations/2202_message_based_communication/220203_trigger_operation/Sem_220203_TriggerOperation_025.ttcn
index 517c1132d6ba96067410cb30b94493f0ab5d0c32..4036efc603f93cfbe7518e589bbc34e031c2721c 100644
--- a/conformance_test/core_language_tests/positive_tests/22_communication_operations/2202_message_based_communication/220203_trigger_operation/Sem_220203_TriggerOperation_025.ttcn
+++ b/conformance_test/core_language_tests/positive_tests/22_communication_operations/2202_message_based_communication/220203_trigger_operation/Sem_220203_TriggerOperation_025.ttcn
@@ -30,7 +30,7 @@ module Sem_220203_TriggerOperation_025 {
         p[1].send(1);
         p[1].send(2);
         p[1].send(3);
-        any from p.trigger(integer:?) -> @index v_int;
+        any from p.trigger(integer:?) -> @index value v_int;
 
         if (v_int == 1) { // evaluation of @lazy (receive shall not be called again)
             alt {
diff --git a/conformance_test/core_language_tests/positive_tests/pos_conf_tests.cfg b/conformance_test/core_language_tests/positive_tests/pos_conf_tests.cfg
index 25ab99a3f5978a815060516455186840cf5b8305..2295ff53e41f50c23db261f47cd750c53491b74d 100644
--- a/conformance_test/core_language_tests/positive_tests/pos_conf_tests.cfg
+++ b/conformance_test/core_language_tests/positive_tests/pos_conf_tests.cfg
@@ -386,6 +386,22 @@ Sem_060203_records_and_sets_of_single_types_019.control
 Sem_060203_records_and_sets_of_single_types_020.control
 Sem_060203_records_and_sets_of_single_types_021.control
 Sem_060203_records_and_sets_of_single_types_022.control
+Sem_060203_records_and_sets_of_single_types_023.control
+Sem_060203_records_and_sets_of_single_types_024.control
+Sem_060203_records_and_sets_of_single_types_025.control
+Sem_060203_records_and_sets_of_single_types_026.control
+Sem_060203_records_and_sets_of_single_types_027.control
+Sem_060203_records_and_sets_of_single_types_028.control
+Sem_060203_records_and_sets_of_single_types_029.control
+Sem_060203_records_and_sets_of_single_types_030.control
+Sem_060203_records_and_sets_of_single_types_031.control
+Sem_060203_records_and_sets_of_single_types_032.control
+Sem_060203_records_and_sets_of_single_types_033.control
+Sem_060203_records_and_sets_of_single_types_034.control
+Sem_060203_records_and_sets_of_single_types_035.control
+Sem_060203_records_and_sets_of_single_types_036.control
+Sem_060203_records_and_sets_of_single_types_037.control
+Sem_060203_records_and_sets_of_single_types_038.control
 Sem_060204_enumerated_type_and_values_001.control
 Sem_060204_enumerated_type_and_values_002.control
 Sem_060204_enumerated_type_and_values_003.control
@@ -432,6 +448,9 @@ Sem_060207_arrays_013.control
 Sem_060207_arrays_014.control
 Sem_060207_arrays_015.control
 Sem_060207_arrays_016.control
+Sem_060207_arrays_017.control
+Sem_060207_arrays_018.control
+Sem_060207_arrays_019.control
 Sem_060207_arrays_020.control
 Sem_060207_arrays_021.control
 Sem_060207_arrays_022.control
@@ -1021,6 +1040,8 @@ Sem_220202_ReceiveOperation_019.control
 Sem_220202_ReceiveOperation_020.control
 Sem_220202_ReceiveOperation_021.control
 Sem_220202_ReceiveOperation_022.control
+Sem_220202_ReceiveOperation_024.control
+Sem_220202_ReceiveOperation_026.control
 Sem_220203_TriggerOperation_001.control
 Sem_220203_TriggerOperation_002.control
 Sem_220203_TriggerOperation_003.control
@@ -1038,6 +1059,8 @@ Sem_220203_TriggerOperation_019.control
 Sem_220203_TriggerOperation_020.control
 Sem_220203_TriggerOperation_021.control
 Sem_220203_TriggerOperation_022.control
+Sem_220203_TriggerOperation_023.control
+Sem_220203_TriggerOperation_025.control
 Sem_220301_CallOperation_001.control
 Sem_220301_CallOperation_002.control
 Sem_220301_CallOperation_003.control
diff --git a/conformance_test/core_language_tests/positive_tests/pos_conf_tests.tpd b/conformance_test/core_language_tests/positive_tests/pos_conf_tests.tpd
index 0dd5920b68256b3e76366415a860d36785030a25..6260c3c015bc3fc23eebd8585de79d8aac46dc0b 100644
--- a/conformance_test/core_language_tests/positive_tests/pos_conf_tests.tpd
+++ b/conformance_test/core_language_tests/positive_tests/pos_conf_tests.tpd
@@ -1014,22 +1014,22 @@
     <FileResource projectRelativePath="06_types_and_values/0602_structured_types_and_values/060203_records_and_sets_of_single_types/Sem_060203_records_and_sets_of_single_types_020.ttcn" relativeURI="06_types_and_values/0602_structured_types_and_values/060203_records_and_sets_of_single_types/Sem_060203_records_and_sets_of_single_types_020.ttcn"/>
     <FileResource projectRelativePath="06_types_and_values/0602_structured_types_and_values/060203_records_and_sets_of_single_types/Sem_060203_records_and_sets_of_single_types_021.ttcn" relativeURI="06_types_and_values/0602_structured_types_and_values/060203_records_and_sets_of_single_types/Sem_060203_records_and_sets_of_single_types_021.ttcn"/>
     <FileResource projectRelativePath="06_types_and_values/0602_structured_types_and_values/060203_records_and_sets_of_single_types/Sem_060203_records_and_sets_of_single_types_022.ttcn" relativeURI="06_types_and_values/0602_structured_types_and_values/060203_records_and_sets_of_single_types/Sem_060203_records_and_sets_of_single_types_022.ttcn"/>
-<!--    <FileResource projectRelativePath="06_types_and_values/0602_structured_types_and_values/060203_records_and_sets_of_single_types/Sem_060203_records_and_sets_of_single_types_023.ttcn" relativeURI="06_types_and_values/0602_structured_types_and_values/060203_records_and_sets_of_single_types/Sem_060203_records_and_sets_of_single_types_023.ttcn"/>-->
-<!--    <FileResource projectRelativePath="06_types_and_values/0602_structured_types_and_values/060203_records_and_sets_of_single_types/Sem_060203_records_and_sets_of_single_types_024.ttcn" relativeURI="06_types_and_values/0602_structured_types_and_values/060203_records_and_sets_of_single_types/Sem_060203_records_and_sets_of_single_types_024.ttcn"/>-->
-<!--    <FileResource projectRelativePath="06_types_and_values/0602_structured_types_and_values/060203_records_and_sets_of_single_types/Sem_060203_records_and_sets_of_single_types_025.ttcn" relativeURI="06_types_and_values/0602_structured_types_and_values/060203_records_and_sets_of_single_types/Sem_060203_records_and_sets_of_single_types_025.ttcn"/>-->
-<!--    <FileResource projectRelativePath="06_types_and_values/0602_structured_types_and_values/060203_records_and_sets_of_single_types/Sem_060203_records_and_sets_of_single_types_026.ttcn" relativeURI="06_types_and_values/0602_structured_types_and_values/060203_records_and_sets_of_single_types/Sem_060203_records_and_sets_of_single_types_026.ttcn"/>-->
-<!--    <FileResource projectRelativePath="06_types_and_values/0602_structured_types_and_values/060203_records_and_sets_of_single_types/Sem_060203_records_and_sets_of_single_types_027.ttcn" relativeURI="06_types_and_values/0602_structured_types_and_values/060203_records_and_sets_of_single_types/Sem_060203_records_and_sets_of_single_types_027.ttcn"/>-->
-<!--    <FileResource projectRelativePath="06_types_and_values/0602_structured_types_and_values/060203_records_and_sets_of_single_types/Sem_060203_records_and_sets_of_single_types_028.ttcn" relativeURI="06_types_and_values/0602_structured_types_and_values/060203_records_and_sets_of_single_types/Sem_060203_records_and_sets_of_single_types_028.ttcn"/>-->
-<!--    <FileResource projectRelativePath="06_types_and_values/0602_structured_types_and_values/060203_records_and_sets_of_single_types/Sem_060203_records_and_sets_of_single_types_029.ttcn" relativeURI="06_types_and_values/0602_structured_types_and_values/060203_records_and_sets_of_single_types/Sem_060203_records_and_sets_of_single_types_029.ttcn"/>-->
-<!--    <FileResource projectRelativePath="06_types_and_values/0602_structured_types_and_values/060203_records_and_sets_of_single_types/Sem_060203_records_and_sets_of_single_types_030.ttcn" relativeURI="06_types_and_values/0602_structured_types_and_values/060203_records_and_sets_of_single_types/Sem_060203_records_and_sets_of_single_types_030.ttcn"/>-->
-<!--    <FileResource projectRelativePath="06_types_and_values/0602_structured_types_and_values/060203_records_and_sets_of_single_types/Sem_060203_records_and_sets_of_single_types_031.ttcn" relativeURI="06_types_and_values/0602_structured_types_and_values/060203_records_and_sets_of_single_types/Sem_060203_records_and_sets_of_single_types_031.ttcn"/>-->
-<!--    <FileResource projectRelativePath="06_types_and_values/0602_structured_types_and_values/060203_records_and_sets_of_single_types/Sem_060203_records_and_sets_of_single_types_032.ttcn" relativeURI="06_types_and_values/0602_structured_types_and_values/060203_records_and_sets_of_single_types/Sem_060203_records_and_sets_of_single_types_032.ttcn"/>-->
-<!--    <FileResource projectRelativePath="06_types_and_values/0602_structured_types_and_values/060203_records_and_sets_of_single_types/Sem_060203_records_and_sets_of_single_types_033.ttcn" relativeURI="06_types_and_values/0602_structured_types_and_values/060203_records_and_sets_of_single_types/Sem_060203_records_and_sets_of_single_types_033.ttcn"/>-->
-<!--    <FileResource projectRelativePath="06_types_and_values/0602_structured_types_and_values/060203_records_and_sets_of_single_types/Sem_060203_records_and_sets_of_single_types_034.ttcn" relativeURI="06_types_and_values/0602_structured_types_and_values/060203_records_and_sets_of_single_types/Sem_060203_records_and_sets_of_single_types_034.ttcn"/>-->
-<!--    <FileResource projectRelativePath="06_types_and_values/0602_structured_types_and_values/060203_records_and_sets_of_single_types/Sem_060203_records_and_sets_of_single_types_035.ttcn" relativeURI="06_types_and_values/0602_structured_types_and_values/060203_records_and_sets_of_single_types/Sem_060203_records_and_sets_of_single_types_035.ttcn"/>-->
-<!--    <FileResource projectRelativePath="06_types_and_values/0602_structured_types_and_values/060203_records_and_sets_of_single_types/Sem_060203_records_and_sets_of_single_types_036.ttcn" relativeURI="06_types_and_values/0602_structured_types_and_values/060203_records_and_sets_of_single_types/Sem_060203_records_and_sets_of_single_types_036.ttcn"/>-->
-<!--    <FileResource projectRelativePath="06_types_and_values/0602_structured_types_and_values/060203_records_and_sets_of_single_types/Sem_060203_records_and_sets_of_single_types_037.ttcn" relativeURI="06_types_and_values/0602_structured_types_and_values/060203_records_and_sets_of_single_types/Sem_060203_records_and_sets_of_single_types_037.ttcn"/>-->
-<!--    <FileResource projectRelativePath="06_types_and_values/0602_structured_types_and_values/060203_records_and_sets_of_single_types/Sem_060203_records_and_sets_of_single_types_038.ttcn" relativeURI="06_types_and_values/0602_structured_types_and_values/060203_records_and_sets_of_single_types/Sem_060203_records_and_sets_of_single_types_038.ttcn"/>-->
+    <FileResource projectRelativePath="06_types_and_values/0602_structured_types_and_values/060203_records_and_sets_of_single_types/Sem_060203_records_and_sets_of_single_types_023.ttcn" relativeURI="06_types_and_values/0602_structured_types_and_values/060203_records_and_sets_of_single_types/Sem_060203_records_and_sets_of_single_types_023.ttcn"/>
+    <FileResource projectRelativePath="06_types_and_values/0602_structured_types_and_values/060203_records_and_sets_of_single_types/Sem_060203_records_and_sets_of_single_types_024.ttcn" relativeURI="06_types_and_values/0602_structured_types_and_values/060203_records_and_sets_of_single_types/Sem_060203_records_and_sets_of_single_types_024.ttcn"/>
+    <FileResource projectRelativePath="06_types_and_values/0602_structured_types_and_values/060203_records_and_sets_of_single_types/Sem_060203_records_and_sets_of_single_types_025.ttcn" relativeURI="06_types_and_values/0602_structured_types_and_values/060203_records_and_sets_of_single_types/Sem_060203_records_and_sets_of_single_types_025.ttcn"/>
+    <FileResource projectRelativePath="06_types_and_values/0602_structured_types_and_values/060203_records_and_sets_of_single_types/Sem_060203_records_and_sets_of_single_types_026.ttcn" relativeURI="06_types_and_values/0602_structured_types_and_values/060203_records_and_sets_of_single_types/Sem_060203_records_and_sets_of_single_types_026.ttcn"/>
+    <FileResource projectRelativePath="06_types_and_values/0602_structured_types_and_values/060203_records_and_sets_of_single_types/Sem_060203_records_and_sets_of_single_types_027.ttcn" relativeURI="06_types_and_values/0602_structured_types_and_values/060203_records_and_sets_of_single_types/Sem_060203_records_and_sets_of_single_types_027.ttcn"/>
+    <FileResource projectRelativePath="06_types_and_values/0602_structured_types_and_values/060203_records_and_sets_of_single_types/Sem_060203_records_and_sets_of_single_types_028.ttcn" relativeURI="06_types_and_values/0602_structured_types_and_values/060203_records_and_sets_of_single_types/Sem_060203_records_and_sets_of_single_types_028.ttcn"/>
+    <FileResource projectRelativePath="06_types_and_values/0602_structured_types_and_values/060203_records_and_sets_of_single_types/Sem_060203_records_and_sets_of_single_types_029.ttcn" relativeURI="06_types_and_values/0602_structured_types_and_values/060203_records_and_sets_of_single_types/Sem_060203_records_and_sets_of_single_types_029.ttcn"/>
+    <FileResource projectRelativePath="06_types_and_values/0602_structured_types_and_values/060203_records_and_sets_of_single_types/Sem_060203_records_and_sets_of_single_types_030.ttcn" relativeURI="06_types_and_values/0602_structured_types_and_values/060203_records_and_sets_of_single_types/Sem_060203_records_and_sets_of_single_types_030.ttcn"/>
+    <FileResource projectRelativePath="06_types_and_values/0602_structured_types_and_values/060203_records_and_sets_of_single_types/Sem_060203_records_and_sets_of_single_types_031.ttcn" relativeURI="06_types_and_values/0602_structured_types_and_values/060203_records_and_sets_of_single_types/Sem_060203_records_and_sets_of_single_types_031.ttcn"/>
+    <FileResource projectRelativePath="06_types_and_values/0602_structured_types_and_values/060203_records_and_sets_of_single_types/Sem_060203_records_and_sets_of_single_types_032.ttcn" relativeURI="06_types_and_values/0602_structured_types_and_values/060203_records_and_sets_of_single_types/Sem_060203_records_and_sets_of_single_types_032.ttcn"/>
+    <FileResource projectRelativePath="06_types_and_values/0602_structured_types_and_values/060203_records_and_sets_of_single_types/Sem_060203_records_and_sets_of_single_types_033.ttcn" relativeURI="06_types_and_values/0602_structured_types_and_values/060203_records_and_sets_of_single_types/Sem_060203_records_and_sets_of_single_types_033.ttcn"/>
+    <FileResource projectRelativePath="06_types_and_values/0602_structured_types_and_values/060203_records_and_sets_of_single_types/Sem_060203_records_and_sets_of_single_types_034.ttcn" relativeURI="06_types_and_values/0602_structured_types_and_values/060203_records_and_sets_of_single_types/Sem_060203_records_and_sets_of_single_types_034.ttcn"/>
+    <FileResource projectRelativePath="06_types_and_values/0602_structured_types_and_values/060203_records_and_sets_of_single_types/Sem_060203_records_and_sets_of_single_types_035.ttcn" relativeURI="06_types_and_values/0602_structured_types_and_values/060203_records_and_sets_of_single_types/Sem_060203_records_and_sets_of_single_types_035.ttcn"/>
+    <FileResource projectRelativePath="06_types_and_values/0602_structured_types_and_values/060203_records_and_sets_of_single_types/Sem_060203_records_and_sets_of_single_types_036.ttcn" relativeURI="06_types_and_values/0602_structured_types_and_values/060203_records_and_sets_of_single_types/Sem_060203_records_and_sets_of_single_types_036.ttcn"/>
+    <FileResource projectRelativePath="06_types_and_values/0602_structured_types_and_values/060203_records_and_sets_of_single_types/Sem_060203_records_and_sets_of_single_types_037.ttcn" relativeURI="06_types_and_values/0602_structured_types_and_values/060203_records_and_sets_of_single_types/Sem_060203_records_and_sets_of_single_types_037.ttcn"/>
+    <FileResource projectRelativePath="06_types_and_values/0602_structured_types_and_values/060203_records_and_sets_of_single_types/Sem_060203_records_and_sets_of_single_types_038.ttcn" relativeURI="06_types_and_values/0602_structured_types_and_values/060203_records_and_sets_of_single_types/Sem_060203_records_and_sets_of_single_types_038.ttcn"/>
 <!--    <FileResource projectRelativePath="06_types_and_values/0602_structured_types_and_values/060204_enumerated_type_and_values/NegSem_060204_enumerated_type_and_values_001.ttcn" relativeURI="06_types_and_values/0602_structured_types_and_values/060204_enumerated_type_and_values/NegSem_060204_enumerated_type_and_values_001.ttcn"/>-->
 <!--    <FileResource projectRelativePath="06_types_and_values/0602_structured_types_and_values/060204_enumerated_type_and_values/NegSem_060204_enumerated_type_and_values_002.ttcn" relativeURI="06_types_and_values/0602_structured_types_and_values/060204_enumerated_type_and_values/NegSem_060204_enumerated_type_and_values_002.ttcn"/>-->
 <!--    <FileResource projectRelativePath="06_types_and_values/0602_structured_types_and_values/060204_enumerated_type_and_values/NegSem_060204_enumerated_type_and_values_003.ttcn" relativeURI="06_types_and_values/0602_structured_types_and_values/060204_enumerated_type_and_values/NegSem_060204_enumerated_type_and_values_003.ttcn"/>-->
@@ -1156,9 +1156,9 @@
    <FileResource projectRelativePath="06_types_and_values/0602_structured_types_and_values/060207_arrays/Sem_060207_arrays_014.ttcn" relativeURI="06_types_and_values/0602_structured_types_and_values/060207_arrays/Sem_060207_arrays_014.ttcn"/>
     <FileResource projectRelativePath="06_types_and_values/0602_structured_types_and_values/060207_arrays/Sem_060207_arrays_015.ttcn" relativeURI="06_types_and_values/0602_structured_types_and_values/060207_arrays/Sem_060207_arrays_015.ttcn"/>
     <FileResource projectRelativePath="06_types_and_values/0602_structured_types_and_values/060207_arrays/Sem_060207_arrays_016.ttcn" relativeURI="06_types_and_values/0602_structured_types_and_values/060207_arrays/Sem_060207_arrays_016.ttcn"/>
-<!--    <FileResource projectRelativePath="06_types_and_values/0602_structured_types_and_values/060207_arrays/Sem_060207_arrays_017.ttcn" relativeURI="06_types_and_values/0602_structured_types_and_values/060207_arrays/Sem_060207_arrays_017.ttcn"/>-->
-<!--    <FileResource projectRelativePath="06_types_and_values/0602_structured_types_and_values/060207_arrays/Sem_060207_arrays_018.ttcn" relativeURI="06_types_and_values/0602_structured_types_and_values/060207_arrays/Sem_060207_arrays_018.ttcn"/>-->
-<!--    <FileResource projectRelativePath="06_types_and_values/0602_structured_types_and_values/060207_arrays/Sem_060207_arrays_019.ttcn" relativeURI="06_types_and_values/0602_structured_types_and_values/060207_arrays/Sem_060207_arrays_019.ttcn"/>-->
+    <FileResource projectRelativePath="06_types_and_values/0602_structured_types_and_values/060207_arrays/Sem_060207_arrays_017.ttcn" relativeURI="06_types_and_values/0602_structured_types_and_values/060207_arrays/Sem_060207_arrays_017.ttcn"/>
+    <FileResource projectRelativePath="06_types_and_values/0602_structured_types_and_values/060207_arrays/Sem_060207_arrays_018.ttcn" relativeURI="06_types_and_values/0602_structured_types_and_values/060207_arrays/Sem_060207_arrays_018.ttcn"/>
+    <FileResource projectRelativePath="06_types_and_values/0602_structured_types_and_values/060207_arrays/Sem_060207_arrays_019.ttcn" relativeURI="06_types_and_values/0602_structured_types_and_values/060207_arrays/Sem_060207_arrays_019.ttcn"/>
     <FileResource projectRelativePath="06_types_and_values/0602_structured_types_and_values/060207_arrays/Sem_060207_arrays_020.ttcn" relativeURI="06_types_and_values/0602_structured_types_and_values/060207_arrays/Sem_060207_arrays_020.ttcn"/>
     <FileResource projectRelativePath="06_types_and_values/0602_structured_types_and_values/060207_arrays/Sem_060207_arrays_021.ttcn" relativeURI="06_types_and_values/0602_structured_types_and_values/060207_arrays/Sem_060207_arrays_021.ttcn"/>
     <FileResource projectRelativePath="06_types_and_values/0602_structured_types_and_values/060207_arrays/Sem_060207_arrays_022.ttcn" relativeURI="06_types_and_values/0602_structured_types_and_values/060207_arrays/Sem_060207_arrays_022.ttcn"/>
@@ -2655,9 +2655,9 @@
     <FileResource projectRelativePath="22_communication_operations/2202_message_based_communication/220202_receive_operation/Sem_220202_ReceiveOperation_021.ttcn" relativeURI="22_communication_operations/2202_message_based_communication/220202_receive_operation/Sem_220202_ReceiveOperation_021.ttcn"/>
    <FileResource projectRelativePath="22_communication_operations/2202_message_based_communication/220202_receive_operation/Sem_220202_ReceiveOperation_022.ttcn" relativeURI="22_communication_operations/2202_message_based_communication/220202_receive_operation/Sem_220202_ReceiveOperation_022.ttcn"/> 
 <!--    <FileResource projectRelativePath="22_communication_operations/2202_message_based_communication/220202_receive_operation/Sem_220202_ReceiveOperation_023.ttcn" relativeURI="22_communication_operations/2202_message_based_communication/220202_receive_operation/Sem_220202_ReceiveOperation_023.ttcn"/>-->
-<!--    <FileResource projectRelativePath="22_communication_operations/2202_message_based_communication/220202_receive_operation/Sem_220202_ReceiveOperation_024.ttcn" relativeURI="22_communication_operations/2202_message_based_communication/220202_receive_operation/Sem_220202_ReceiveOperation_024.ttcn"/>-->
+    <FileResource projectRelativePath="22_communication_operations/2202_message_based_communication/220202_receive_operation/Sem_220202_ReceiveOperation_024.ttcn" relativeURI="22_communication_operations/2202_message_based_communication/220202_receive_operation/Sem_220202_ReceiveOperation_024.ttcn"/>
 <!--    <FileResource projectRelativePath="22_communication_operations/2202_message_based_communication/220202_receive_operation/Sem_220202_ReceiveOperation_025.ttcn" relativeURI="22_communication_operations/2202_message_based_communication/220202_receive_operation/Sem_220202_ReceiveOperation_025.ttcn"/>-->
-<!--    <FileResource projectRelativePath="22_communication_operations/2202_message_based_communication/220202_receive_operation/Sem_220202_ReceiveOperation_026.ttcn" relativeURI="22_communication_operations/2202_message_based_communication/220202_receive_operation/Sem_220202_ReceiveOperation_026.ttcn"/>-->
+    <FileResource projectRelativePath="22_communication_operations/2202_message_based_communication/220202_receive_operation/Sem_220202_ReceiveOperation_026.ttcn" relativeURI="22_communication_operations/2202_message_based_communication/220202_receive_operation/Sem_220202_ReceiveOperation_026.ttcn"/>
 <!--    <FileResource projectRelativePath="22_communication_operations/2202_message_based_communication/220202_receive_operation/Sem_220202_ReceiveOperation_027.ttcn" relativeURI="22_communication_operations/2202_message_based_communication/220202_receive_operation/Sem_220202_ReceiveOperation_027.ttcn"/>-->
 <!--    <FileResource projectRelativePath="22_communication_operations/2202_message_based_communication/220202_receive_operation/Sem_220202_ReceiveOperation_028.ttcn" relativeURI="22_communication_operations/2202_message_based_communication/220202_receive_operation/Sem_220202_ReceiveOperation_028.ttcn"/>-->
 <!--    <FileResource projectRelativePath="22_communication_operations/2202_message_based_communication/220202_receive_operation/Sem_220202_ReceiveOperation_029.ttcn" relativeURI="22_communication_operations/2202_message_based_communication/220202_receive_operation/Sem_220202_ReceiveOperation_029.ttcn"/>-->
@@ -2706,9 +2706,9 @@
     <FileResource projectRelativePath="22_communication_operations/2202_message_based_communication/220203_trigger_operation/Sem_220203_TriggerOperation_020.ttcn" relativeURI="22_communication_operations/2202_message_based_communication/220203_trigger_operation/Sem_220203_TriggerOperation_020.ttcn"/>
     <FileResource projectRelativePath="22_communication_operations/2202_message_based_communication/220203_trigger_operation/Sem_220203_TriggerOperation_021.ttcn" relativeURI="22_communication_operations/2202_message_based_communication/220203_trigger_operation/Sem_220203_TriggerOperation_021.ttcn"/>
     <FileResource projectRelativePath="22_communication_operations/2202_message_based_communication/220203_trigger_operation/Sem_220203_TriggerOperation_022.ttcn" relativeURI="22_communication_operations/2202_message_based_communication/220203_trigger_operation/Sem_220203_TriggerOperation_022.ttcn"/>
-<!--    <FileResource projectRelativePath="22_communication_operations/2202_message_based_communication/220203_trigger_operation/Sem_220203_TriggerOperation_023.ttcn" relativeURI="22_communication_operations/2202_message_based_communication/220203_trigger_operation/Sem_220203_TriggerOperation_023.ttcn"/>-->
+    <FileResource projectRelativePath="22_communication_operations/2202_message_based_communication/220203_trigger_operation/Sem_220203_TriggerOperation_023.ttcn" relativeURI="22_communication_operations/2202_message_based_communication/220203_trigger_operation/Sem_220203_TriggerOperation_023.ttcn"/>
 <!--    <FileResource projectRelativePath="22_communication_operations/2202_message_based_communication/220203_trigger_operation/Sem_220203_TriggerOperation_024.ttcn" relativeURI="22_communication_operations/2202_message_based_communication/220203_trigger_operation/Sem_220203_TriggerOperation_024.ttcn"/>-->
-<!--    <FileResource projectRelativePath="22_communication_operations/2202_message_based_communication/220203_trigger_operation/Sem_220203_TriggerOperation_025.ttcn" relativeURI="22_communication_operations/2202_message_based_communication/220203_trigger_operation/Sem_220203_TriggerOperation_025.ttcn"/>-->
+    <FileResource projectRelativePath="22_communication_operations/2202_message_based_communication/220203_trigger_operation/Sem_220203_TriggerOperation_025.ttcn" relativeURI="22_communication_operations/2202_message_based_communication/220203_trigger_operation/Sem_220203_TriggerOperation_025.ttcn"/>
 <!--    <FileResource projectRelativePath="22_communication_operations/2202_message_based_communication/220203_trigger_operation/Sem_220203_TriggerOperation_026.ttcn" relativeURI="22_communication_operations/2202_message_based_communication/220203_trigger_operation/Sem_220203_TriggerOperation_026.ttcn"/>-->
 <!--    <FileResource projectRelativePath="22_communication_operations/2202_message_based_communication/220203_trigger_operation/Sem_220203_TriggerOperation_027.ttcn" relativeURI="22_communication_operations/2202_message_based_communication/220203_trigger_operation/Sem_220203_TriggerOperation_027.ttcn"/>-->
 <!--    <FileResource projectRelativePath="22_communication_operations/2202_message_based_communication/220203_trigger_operation/Sem_220203_TriggerOperation_028.ttcn" relativeURI="22_communication_operations/2202_message_based_communication/220203_trigger_operation/Sem_220203_TriggerOperation_028.ttcn"/>-->
diff --git a/usrguide/SoC_TITAN.docx b/usrguide/SoC_TITAN.docx
index 99d53408c019d10060da32ab15e4cf1d3acdb5f8..e45382ebce34fe39668ff7101df3fd058efec68f 100644
Binary files a/usrguide/SoC_TITAN.docx and b/usrguide/SoC_TITAN.docx differ