diff --git a/conformance_test/xml_tests/negative_test/UsefulTtcn3Types.txt b/conformance_test/xml_tests/negative_test/UsefulTtcn3Types.txt
index fa840aa04d61546def50071c4554b979a31a7943..e18439aca0891ce3931ad77811ee7d331e07eb67 100644
--- a/conformance_test/xml_tests/negative_test/UsefulTtcn3Types.txt
+++ b/conformance_test/xml_tests/negative_test/UsefulTtcn3Types.txt
@@ -33,9 +33,9 @@ module UsefulTtcn3Types {
type integer unsignedlong (0 .. 4294967295) with { variant "/*unsigned 32 bit*/" };
- type integer longlong /* ( -9223372036854775808 .. 9223372036854775807 ) */ with { variant "/*64 bit*/" };
+ type integer longlong ( -9223372036854775808 .. 9223372036854775807 ) with { variant "/*64 bit*/" };
- type integer unsignedlonglong /* ( 0 .. 18446744073709551615 ) */ with { variant "/*unsigned 64 bit*/" };
+ type integer unsignedlonglong ( 0 .. 18446744073709551615 ) with { variant "/*unsigned 64 bit*/" };
type float IEEE754float with { variant "/*IEEE754 float*/" };
diff --git a/conformance_test/xml_tests/positive_tests/ATS/07_mapping_xsd_components/0706_complextype_components/070608_mixed_content/Pos_070608_mixed_content_002/Pos_070608_mixed_content_002.ttcn b/conformance_test/xml_tests/positive_tests/ATS/07_mapping_xsd_components/0706_complextype_components/070608_mixed_content/Pos_070608_mixed_content_002/Pos_070608_mixed_content_002.ttcn
index e025ae33074b2724a72d6f25a51c3ba4df2d8c85..0f97a526f6f600156740d0ace710fca88339bf65 100644
--- a/conformance_test/xml_tests/positive_tests/ATS/07_mapping_xsd_components/0706_complextype_components/070608_mixed_content/Pos_070608_mixed_content_002/Pos_070608_mixed_content_002.ttcn
+++ b/conformance_test/xml_tests/positive_tests/ATS/07_mapping_xsd_components/0706_complextype_components/070608_mixed_content/Pos_070608_mixed_content_002/Pos_070608_mixed_content_002.ttcn
@@ -60,7 +60,7 @@ module Pos_070608_mixed_content_002 {
testcase TC_Pos_070608_mixed_content_002() runs on C system C {
var Raw v_rcv;
- var Raw v_Raw:= "<ns205:MyType xmlns:ns205='schema:Pos_070608_mixed_content_002'>The ordered <a>car</a> has arrived <b>false</b> the ordered <a>bycicle</a> has arrived! <b>true</b>Wait for further information.</ns205:MyType>\n";
+ var Raw v_Raw:= "<ns205:MyType xmlns:ns205='schema:Pos_070608_mixed_content_002'>The ordered <a>car</a> has arrived <b>false</b>, the ordered <a>bicycle</a> has arrived! <b>true</b>Wait for further information.</ns205:MyType>\n";
connect(self:p, self:p1);
diff --git a/conformance_test/xml_tests/positive_tests/XML_tests.cfg b/conformance_test/xml_tests/positive_tests/XML_tests.cfg
index 05e8137e5c6fbfc635ebb12db4faf93a92884768..12f3809ef5d28d0f9d7058f6cbeddf7b27848f6e 100644
--- a/conformance_test/xml_tests/positive_tests/XML_tests.cfg
+++ b/conformance_test/xml_tests/positive_tests/XML_tests.cfg
@@ -203,6 +203,7 @@ Pos_070607_attribute_definitions_attribute_and_attributegroup_references_001.con
Pos_070607_attribute_definitions_attribute_and_attributegroup_references_002.control
Pos_070607_attribute_definitions_attribute_and_attributegroup_references_003.control
Pos_070608_mixed_content_001.control
+Pos_070608_mixed_content_002.control
Pos_070608_mixed_content_003.control
Pos_070608_mixed_content_005.control
Pos_070701_the_any_element_001.control
diff --git a/conformance_test/xml_tests/positive_tests/XML_tests.tpd b/conformance_test/xml_tests/positive_tests/XML_tests.tpd
index 987055f5fcb6d30c1250e793637b418a1b41362d..a075734ac1a97dc3621452230b9dd7e6c0045b23 100644
--- a/conformance_test/xml_tests/positive_tests/XML_tests.tpd
+++ b/conformance_test/xml_tests/positive_tests/XML_tests.tpd
@@ -411,7 +411,7 @@
<FolderResource projectRelativePath="ATS/07_mapping_xsd_components/0706_complextype_components/070606_sequence_content/07060605_sequence_with_nested_any_content/Pos_07060605_sequence_with_nested_any_content_001" relativeURI="ATS/07_mapping_xsd_components/0706_complextype_components/070606_sequence_content/07060605_sequence_with_nested_any_content/Pos_07060605_sequence_with_nested_any_content_001"/>
<FolderResource projectRelativePath="ATS/07_mapping_xsd_components/0706_complextype_components/070606_sequence_content/07060606_effect_of_minoccurs_and_maxoccurs" relativeURI="ATS/07_mapping_xsd_components/0706_complextype_components/070606_sequence_content/07060606_effect_of_minoccurs_and_maxoccurs"/>
<FolderResource projectRelativePath="ATS/07_mapping_xsd_components/0706_complextype_components/070606_sequence_content/07060606_effect_of_minoccurs_and_maxoccurs/Pos_07060606_effect_of_minoccurs_and_maxoccurs_001" relativeURI="ATS/07_mapping_xsd_components/0706_complextype_components/070606_sequence_content/07060606_effect_of_minoccurs_and_maxoccurs/Pos_07060606_effect_of_minoccurs_and_maxoccurs_001"/>
-<!-- <FolderResource projectRelativePath="ATS/07_mapping_xsd_components/0706_complextype_components/070606_sequence_content/07060606_effect_of_minoccurs_and_maxoccurs/Pos_07060606_effect_of_minoccurs_and_maxoccurs_002" relativeURI="ATS/07_mapping_xsd_components/0706_complextype_components/070606_sequence_content/07060606_effect_of_minoccurs_and_maxoccurs/Pos_07060606_effect_of_minoccurs_and_maxoccurs_002"/>-->
+ <FolderResource projectRelativePath="ATS/07_mapping_xsd_components/0706_complextype_components/070606_sequence_content/07060606_effect_of_minoccurs_and_maxoccurs/Pos_07060606_effect_of_minoccurs_and_maxoccurs_002" relativeURI="ATS/07_mapping_xsd_components/0706_complextype_components/070606_sequence_content/07060606_effect_of_minoccurs_and_maxoccurs/Pos_07060606_effect_of_minoccurs_and_maxoccurs_002"/>
<FolderResource projectRelativePath="ATS/07_mapping_xsd_components/0706_complextype_components/070606_sequence_content/07060606_effect_of_minoccurs_and_maxoccurs/Pos_07060606_effect_of_minoccurs_and_maxoccurs_003" relativeURI="ATS/07_mapping_xsd_components/0706_complextype_components/070606_sequence_content/07060606_effect_of_minoccurs_and_maxoccurs/Pos_07060606_effect_of_minoccurs_and_maxoccurs_003"/>
<FolderResource projectRelativePath="ATS/07_mapping_xsd_components/0706_complextype_components/070606_sequence_content/07060606_effect_of_minoccurs_and_maxoccurs/Pos_07060606_effect_of_minoccurs_and_maxoccurs_004" relativeURI="ATS/07_mapping_xsd_components/0706_complextype_components/070606_sequence_content/07060606_effect_of_minoccurs_and_maxoccurs/Pos_07060606_effect_of_minoccurs_and_maxoccurs_004"/>
<FolderResource projectRelativePath="ATS/07_mapping_xsd_components/0706_complextype_components/070606_sequence_content/07060606_minmaxoccurs" relativeURI="ATS/07_mapping_xsd_components/0706_complextype_components/070606_sequence_content/07060606_minmaxoccurs"/>
@@ -1058,8 +1058,8 @@
<FileResource projectRelativePath="ATS/xsd_converted/schema_Pos_070607_attribute_definitions_attribute_and_attributegroup_references_003.ttcn" relativeURI="ATS/xsd_converted/schema_Pos_070607_attribute_definitions_attribute_and_attributegroup_references_003.ttcn"/>
<FileResource projectRelativePath="ATS/07_mapping_xsd_components/0706_complextype_components/070608_mixed_content/Pos_070608_mixed_content_001/Pos_070608_mixed_content_001.ttcn" relativeURI="ATS/07_mapping_xsd_components/0706_complextype_components/070608_mixed_content/Pos_070608_mixed_content_001/Pos_070608_mixed_content_001.ttcn"/>
<FileResource projectRelativePath="ATS/xsd_converted/schema_Pos_070608_mixed_content_001.ttcn" relativeURI="ATS/xsd_converted/schema_Pos_070608_mixed_content_001.ttcn"/>
-<!-- <FileResource projectRelativePath="ATS/07_mapping_xsd_components/0706_complextype_components/070608_mixed_content/Pos_070608_mixed_content_002/Pos_070608_mixed_content_002.ttcn" relativeURI="ATS/07_mapping_xsd_components/0706_complextype_components/070608_mixed_content/Pos_070608_mixed_content_002/Pos_070608_mixed_content_002.ttcn"/>
- <FileResource projectRelativePath="ATS/xsd_converted/schema_Pos_070608_mixed_content_002.ttcn" relativeURI="ATS/xsd_converted/schema_Pos_070608_mixed_content_002.ttcn"/>-->
+ <FileResource projectRelativePath="ATS/07_mapping_xsd_components/0706_complextype_components/070608_mixed_content/Pos_070608_mixed_content_002/Pos_070608_mixed_content_002.ttcn" relativeURI="ATS/07_mapping_xsd_components/0706_complextype_components/070608_mixed_content/Pos_070608_mixed_content_002/Pos_070608_mixed_content_002.ttcn"/>
+ <FileResource projectRelativePath="ATS/xsd_converted/schema_Pos_070608_mixed_content_002.ttcn" relativeURI="ATS/xsd_converted/schema_Pos_070608_mixed_content_002.ttcn"/>
<FileResource projectRelativePath="ATS/07_mapping_xsd_components/0706_complextype_components/070608_mixed_content/Pos_070608_mixed_content_003/Pos_070608_mixed_content_003.ttcn" relativeURI="ATS/07_mapping_xsd_components/0706_complextype_components/070608_mixed_content/Pos_070608_mixed_content_003/Pos_070608_mixed_content_003.ttcn"/>
<FileResource projectRelativePath="ATS/xsd_converted/schema_Pos_070608_mixed_content_003.ttcn" relativeURI="ATS/xsd_converted/schema_Pos_070608_mixed_content_003.ttcn"/>
<FileResource projectRelativePath="ATS/07_mapping_xsd_components/0706_complextype_components/070608_mixed_content/Pos_070608_mixed_content_004/Pos_070608_mixed_content_004.ttcn" relativeURI="ATS/07_mapping_xsd_components/0706_complextype_components/070608_mixed_content/Pos_070608_mixed_content_004/Pos_070608_mixed_content_004.ttcn"/>
diff --git a/usrguide/SoC_XML_TITAN.docx b/usrguide/SoC_XML_TITAN.docx
index ee60a6ed23e36060ee4aa05645b1d690404c1bf4..8bf44bc1fd183f5d2246ca9d94f5583c1430baa6 100644
Binary files a/usrguide/SoC_XML_TITAN.docx and b/usrguide/SoC_XML_TITAN.docx differ