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 6677992f7f898c219cd5677eace9fc7dc556b10c..21265f338788e9f1210a5cadc5085a8289ce7b43 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
@@ -2286,7 +2286,7 @@ module NegSem_1101_ValueVars_001 {
<END_MODULE>
<RESULT COUNT 1>
-error: at or before token `\?': syntax error, unexpected '\?'
+error: integer value was expected
<END_RESULT>
<END_TC>
diff --git a/conformance_test/core_language_tests/negative_tests/15_templates.script b/conformance_test/core_language_tests/negative_tests/15_templates.script
index 354be89bb08ea2d6362e6c2de55c7a43cd13d35e..9fb9c5e93839f3274816101beea9f3ee12e7d261 100644
--- a/conformance_test/core_language_tests/negative_tests/15_templates.script
+++ b/conformance_test/core_language_tests/negative_tests/15_templates.script
@@ -4580,7 +4580,7 @@ module NegSem_1511_ConcatenatingTemplatesOfStringAndListTypes_004 {
<END_MODULE>
<RESULT COUNT 1>
-error: at or before token `\*': syntax error, unexpected '\*'
+error: Operands of charstring template concatenation must be specific value templates
<END_RESULT>
<END_TC>
@@ -4644,52 +4644,6 @@ error: at or before token `\*': syntax error, unexpected '\*', expecting Identif
<END_TC>
:exmp
-*---------------------------------------------------------------------*
-:h3. NegSem_1511_ConcatenatingTemplatesOfStringAndListTypes_006 negative test
-.*---------------------------------------------------------------------*
-:xmp tab=0.
-
-<TC - Ensure that concatenation of octetstring types and ? patterns works as expected. >
-
-<COMPILE>
-
-<MODULE TTCN NegSem_1511_ConcatenatingTemplatesOfStringAndListTypes_006 NegSem_1511_ConcatenatingTemplatesOfStringAndListTypes_006.ttcn >
-/*****************************************************************
- ** @version 0.0.1
- ** @purpose 1:15.11, Ensure that concatenation of octetstring types and ? patterns works as expected.
- ** @verdict pass reject
- *****************************************************************/
-
-module NegSem_1511_ConcatenatingTemplatesOfStringAndListTypes_006 {
-
- type component GeneralComp { }
-
- testcase TC_NegSem_1511_ConcatenatingTemplatesOfStringAndListTypes_006() runs on GeneralComp {
- var template octetstring v_myString1 := 'ABCD'O & ? length(2) length (6); //missing parenthesis
- if (match('ABCD12'O, v_myString1)) {
- setverdict(pass);
- } else {
- setverdict(fail);
- }
- }
-
- control{
- execute(TC_NegSem_1511_ConcatenatingTemplatesOfStringAndListTypes_006());
- }
-
-}
-<END_MODULE>
-
-<RESULT COUNT 1>
-error: at or before token `\?': syntax error, unexpected '\?'
-<END_RESULT>
-<RESULT COUNT 1>
-error: at or before token `else': syntax error, unexpected ElseKeyword
-<END_RESULT>
-
-<END_TC>
-:exmp
-
.*---------------------------------------------------------------------*
:h1.References
.*---------------------------------------------------------------------*
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 c7acd2e4d4cee9572c226bce5def22a52717e5fe..ea1faf55c4fd7b7cb707a856a2ee55a4b55bd2d0 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
@@ -781,8 +781,10 @@ Sem_1509_MatchOperation_008.control
Sem_1509_MatchOperation_010.control
Sem_1510_ValueOfOperation_001.control
Sem_1511_ConcatenatingTemplatesOfStringAndListTypes_001.control
+Sem_1511_ConcatenatingTemplatesOfStringAndListTypes_002.control
Sem_1511_ConcatenatingTemplatesOfStringAndListTypes_006.control
Sem_1511_ConcatenatingTemplatesOfStringAndListTypes_010.control
+Sem_1511_ConcatenatingTemplatesOfStringAndListTypes_013.control
Sem_1511_ConcatenatingTemplatesOfStringAndListTypes_014.control
Sem_160101_invoking_functions_001.control
Sem_160102_predefined_functions_001.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 ef1da6a85665d441122ecee6c5b221bfb719d250..145df060a130d00149507c59b65342f1f3ff3aac 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
@@ -2034,7 +2034,7 @@
<!-- <FileResource projectRelativePath="15_templates/1511_concatenating_templates_of_string_and_list_types/NegSem_1511_ConcatenatingTemplatesOfStringAndListTypes_005.ttcn" relativeURI="15_templates/1511_concatenating_templates_of_string_and_list_types/NegSem_1511_ConcatenatingTemplatesOfStringAndListTypes_005.ttcn"/>-->
<!-- <FileResource projectRelativePath="15_templates/1511_concatenating_templates_of_string_and_list_types/NegSem_1511_ConcatenatingTemplatesOfStringAndListTypes_006.ttcn" relativeURI="15_templates/1511_concatenating_templates_of_string_and_list_types/NegSem_1511_ConcatenatingTemplatesOfStringAndListTypes_006.ttcn"/>-->
<FileResource projectRelativePath="15_templates/1511_concatenating_templates_of_string_and_list_types/Sem_1511_ConcatenatingTemplatesOfStringAndListTypes_001.ttcn" relativeURI="15_templates/1511_concatenating_templates_of_string_and_list_types/Sem_1511_ConcatenatingTemplatesOfStringAndListTypes_001.ttcn"/>
-<!-- <FileResource projectRelativePath="15_templates/1511_concatenating_templates_of_string_and_list_types/Sem_1511_ConcatenatingTemplatesOfStringAndListTypes_002.ttcn" relativeURI="15_templates/1511_concatenating_templates_of_string_and_list_types/Sem_1511_ConcatenatingTemplatesOfStringAndListTypes_002.ttcn"/>-->
+ <FileResource projectRelativePath="15_templates/1511_concatenating_templates_of_string_and_list_types/Sem_1511_ConcatenatingTemplatesOfStringAndListTypes_002.ttcn" relativeURI="15_templates/1511_concatenating_templates_of_string_and_list_types/Sem_1511_ConcatenatingTemplatesOfStringAndListTypes_002.ttcn"/>
<!-- <FileResource projectRelativePath="15_templates/1511_concatenating_templates_of_string_and_list_types/Sem_1511_ConcatenatingTemplatesOfStringAndListTypes_003.ttcn" relativeURI="15_templates/1511_concatenating_templates_of_string_and_list_types/Sem_1511_ConcatenatingTemplatesOfStringAndListTypes_003.ttcn"/>-->
<!-- <FileResource projectRelativePath="15_templates/1511_concatenating_templates_of_string_and_list_types/Sem_1511_ConcatenatingTemplatesOfStringAndListTypes_004.ttcn" relativeURI="15_templates/1511_concatenating_templates_of_string_and_list_types/Sem_1511_ConcatenatingTemplatesOfStringAndListTypes_004.ttcn"/>-->
<!-- <FileResource projectRelativePath="15_templates/1511_concatenating_templates_of_string_and_list_types/Sem_1511_ConcatenatingTemplatesOfStringAndListTypes_005.ttcn" relativeURI="15_templates/1511_concatenating_templates_of_string_and_list_types/Sem_1511_ConcatenatingTemplatesOfStringAndListTypes_005.ttcn"/>-->
@@ -2045,7 +2045,7 @@
<FileResource projectRelativePath="15_templates/1511_concatenating_templates_of_string_and_list_types/Sem_1511_ConcatenatingTemplatesOfStringAndListTypes_010.ttcn" relativeURI="15_templates/1511_concatenating_templates_of_string_and_list_types/Sem_1511_ConcatenatingTemplatesOfStringAndListTypes_010.ttcn"/>
<!-- <FileResource projectRelativePath="15_templates/1511_concatenating_templates_of_string_and_list_types/Sem_1511_ConcatenatingTemplatesOfStringAndListTypes_011.ttcn" relativeURI="15_templates/1511_concatenating_templates_of_string_and_list_types/Sem_1511_ConcatenatingTemplatesOfStringAndListTypes_011.ttcn"/>-->
<!-- <FileResource projectRelativePath="15_templates/1511_concatenating_templates_of_string_and_list_types/Sem_1511_ConcatenatingTemplatesOfStringAndListTypes_012.ttcn" relativeURI="15_templates/1511_concatenating_templates_of_string_and_list_types/Sem_1511_ConcatenatingTemplatesOfStringAndListTypes_012.ttcn"/>-->
-<!-- <FileResource projectRelativePath="15_templates/1511_concatenating_templates_of_string_and_list_types/Sem_1511_ConcatenatingTemplatesOfStringAndListTypes_013.ttcn" relativeURI="15_templates/1511_concatenating_templates_of_string_and_list_types/Sem_1511_ConcatenatingTemplatesOfStringAndListTypes_013.ttcn"/>-->
+ <FileResource projectRelativePath="15_templates/1511_concatenating_templates_of_string_and_list_types/Sem_1511_ConcatenatingTemplatesOfStringAndListTypes_013.ttcn" relativeURI="15_templates/1511_concatenating_templates_of_string_and_list_types/Sem_1511_ConcatenatingTemplatesOfStringAndListTypes_013.ttcn"/>
<FileResource projectRelativePath="15_templates/1511_concatenating_templates_of_string_and_list_types/Sem_1511_ConcatenatingTemplatesOfStringAndListTypes_014.ttcn" relativeURI="15_templates/1511_concatenating_templates_of_string_and_list_types/Sem_1511_ConcatenatingTemplatesOfStringAndListTypes_014.ttcn"/>
<!-- <FileResource projectRelativePath="15_templates/15_toplevel/NegSem_15_TopLevel_001.ttcn" relativeURI="15_templates/15_toplevel/NegSem_15_TopLevel_001.ttcn"/>-->
<!-- <FileResource projectRelativePath="15_templates/15_toplevel/NegSem_15_TopLevel_002.ttcn" relativeURI="15_templates/15_toplevel/NegSem_15_TopLevel_002.ttcn"/>-->
diff --git a/usrguide/SoC_TITAN.docx b/usrguide/SoC_TITAN.docx
index 6aefad26685ee94f9d0316086602e24ce7d35ba6..bf8e7d7f9e75100e8f6b43fcafc184a24d3ad326 100644
Binary files a/usrguide/SoC_TITAN.docx and b/usrguide/SoC_TITAN.docx differ