diff --git a/TCCUsefulFunctions_CNL113472_Common.tpd b/TCCUsefulFunctions_CNL113472_Common.tpd
index 4862ac01455d29d27375b036525c0215b598f0a7..56be2830dfc8c03dc8bf3a49323716f0e911f5e6 100644
--- a/TCCUsefulFunctions_CNL113472_Common.tpd
+++ b/TCCUsefulFunctions_CNL113472_Common.tpd
@@ -10,7 +10,7 @@
 
    File:               TCCUsefulFunctions_CNL113472_Common.tpd
    Description:        tpd project file
-   Rev:                R35B
+   Rev:                R36B
    Prodnr:             CNL 113 472
 
  -->
diff --git a/TCCUsefulFunctions_CNL113472_IPsec.tpd b/TCCUsefulFunctions_CNL113472_IPsec.tpd
index 483ad67e3b9bb9246dd4db4af2efebca65e73984..30ebe0c69165f989b60cb3d595686ec991c2f51d 100644
--- a/TCCUsefulFunctions_CNL113472_IPsec.tpd
+++ b/TCCUsefulFunctions_CNL113472_IPsec.tpd
@@ -10,7 +10,7 @@
 
    File:               TCCUsefulFunctions_CNL113472_IPsec.tpd
    Description:        tpd project file
-   Rev:                R35B
+   Rev:                R36B
    Prodnr:             CNL 113 472
 
  -->
diff --git a/TCCUsefulFunctions_CNL113472_Interface.tpd b/TCCUsefulFunctions_CNL113472_Interface.tpd
index 5584d4e89cee4f804bb7733f4db6746b798b3ad8..13ace51b45089bb6023ab293e14398ff52a347eb 100644
--- a/TCCUsefulFunctions_CNL113472_Interface.tpd
+++ b/TCCUsefulFunctions_CNL113472_Interface.tpd
@@ -10,7 +10,7 @@
 
    File:               TCCUsefulFunctions_CNL113472_Interface.tpd
    Description:        tpd project file
-   Rev:                R35B
+   Rev:                R36B
    Prodnr:             CNL 113 472
 
  -->
diff --git a/TCCUsefulFunctions_CNL113472_Maths.tpd b/TCCUsefulFunctions_CNL113472_Maths.tpd
index 2a83bf5ebcda854b0f4e32cef3fe201df005af36..7710172c093f30b30eb43ce28ace895a6382b666 100644
--- a/TCCUsefulFunctions_CNL113472_Maths.tpd
+++ b/TCCUsefulFunctions_CNL113472_Maths.tpd
@@ -10,7 +10,7 @@
 
    File:               TCCUsefulFunctions_CNL113472_Maths.tpd
    Description:        tpd project file
-   Rev:                R35B
+   Rev:                R36B
    Prodnr:             CNL 113 472
 
  -->
diff --git a/TCCUsefulFunctions_CNL113472_OpenSecurity.tpd b/TCCUsefulFunctions_CNL113472_OpenSecurity.tpd
index 5620ded1ab71475ad2c676e96dab76ee9a9fb8b1..831ea5cda26e758dce3ce353b47dd63dcacb9425 100644
--- a/TCCUsefulFunctions_CNL113472_OpenSecurity.tpd
+++ b/TCCUsefulFunctions_CNL113472_OpenSecurity.tpd
@@ -10,7 +10,7 @@
 
    File:               TCCUsefulFunctions_CNL113472_OpenSecurity.tpd
    Description:        tpd project file
-   Rev:                R35B
+   Rev:                R36B
    Prodnr:             CNL 113 472
 
  -->
diff --git a/TCCUsefulFunctions_CNL113472_PermutatedParameters.tpd b/TCCUsefulFunctions_CNL113472_PermutatedParameters.tpd
index 26527f05ac85b55157219b93361e3f9f1e4c20b7..ceb65911067fbd30a00d4dbb5cf16c102cc97d87 100644
--- a/TCCUsefulFunctions_CNL113472_PermutatedParameters.tpd
+++ b/TCCUsefulFunctions_CNL113472_PermutatedParameters.tpd
@@ -10,7 +10,7 @@
 
    File:               TCCUsefulFunctions_CNL113472_PermutatedParameters.tpd
    Description:        tpd project file
-   Rev:                R35B
+   Rev:                R36B
    Prodnr:             CNL 113 472
 
  -->
diff --git a/TCCUsefulFunctions_CNL113472_Regexp.tpd b/TCCUsefulFunctions_CNL113472_Regexp.tpd
index b0538dc8550e2866da86c6a53e3d25b8f34bf824..96d5c2f4fd666bf6c0ecb3dfbcdfc625e409acd0 100644
--- a/TCCUsefulFunctions_CNL113472_Regexp.tpd
+++ b/TCCUsefulFunctions_CNL113472_Regexp.tpd
@@ -10,7 +10,7 @@
 
    File:               TCCUsefulFunctions_CNL113472_Regexp.tpd
    Description:        tpd project file
-   Rev:                R35B
+   Rev:                R36B
    Prodnr:             CNL 113 472
 
  -->
diff --git a/TCCUsefulFunctions_CNL113472_TitanSim.tpd b/TCCUsefulFunctions_CNL113472_TitanSim.tpd
index 3f3f871d59bbd21b9d71ac30d518e5b59f4d82f2..2c9fde3a978bb394d9d7a3fdc487b21cf6318807 100644
--- a/TCCUsefulFunctions_CNL113472_TitanSim.tpd
+++ b/TCCUsefulFunctions_CNL113472_TitanSim.tpd
@@ -10,7 +10,7 @@
 
    File:               TCCUsefulFunctions_CNL113472_TitanSim.tpd
    Description:        tpd project file
-   Rev:                R35B
+   Rev:                R36B
    Prodnr:             CNL 113 472
 
  -->
diff --git a/TCCUsefulFunctions_CNL113472_XPath.tpd b/TCCUsefulFunctions_CNL113472_XPath.tpd
index 1105eb8000dc8a9c21411aa260dfe07c811eced1..df450bb8de0796124115d513ee4f3c3e9f5d148f 100644
--- a/TCCUsefulFunctions_CNL113472_XPath.tpd
+++ b/TCCUsefulFunctions_CNL113472_XPath.tpd
@@ -10,7 +10,7 @@
 
    File:               TCCUsefulFunctions_CNL113472_XPath.tpd
    Description:        tpd project file
-   Rev:                R35B
+   Rev:                R36B
    Prodnr:             CNL 113 472
 
  -->
diff --git a/demo/TCCAssertion_Example.ttcn b/demo/TCCAssertion_Example.ttcn
index ac1c6132246dabbf399223058351ca1c74b7da38..675f42301fc19c670c1d98506afda1ce5b3424a9 100644
--- a/demo/TCCAssertion_Example.ttcn
+++ b/demo/TCCAssertion_Example.ttcn
@@ -11,7 +11,7 @@
 //
 //  File:               TCCAssertion_Example.ttcn
 //  Description:        TCC Useful Functions: Assertion Functions.
-//  Rev:                R32A
+//  Rev:                R36B
 //  Prodnr:             CNL 113 472
 //  Updated:            2007-11-14
 //  Contact:            http://ttcn.ericsson.se
diff --git a/demo/TCCConversion_Example.ttcn b/demo/TCCConversion_Example.ttcn
index ba5a25d450ff95ad1ec5cabbb34f3ddc9f4ac34b..49cfb85708502b9ce481a210ea6427e00409bda1 100644
--- a/demo/TCCConversion_Example.ttcn
+++ b/demo/TCCConversion_Example.ttcn
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////
 //                                                                           //
-// Copyright Test Competence Center (TCC) ETH 2013                           //
+// Copyright Test Competence Center (TCC) ETH 2018                           //
 //                                                                           //
 // The copyright to the computer  program(s) herein  is the property of TCC. //
 // The program(s) may be used and/or copied only with the written permission //
@@ -11,9 +11,8 @@
 //
 //  File:               TCCConversion_Example.ttcn
 //  Description:        TCC Useful Functions: Conversion Functions.
-//  Rev:                R32A
+//  Rev:                R36B
 //  Prodnr:             CNL 113 472
-//  Updated:            2013-09-24
 //  Contact:            http://ttcn.ericsson.se
 ///////////////////////////////////////////////
 
@@ -120,7 +119,7 @@ testcase f_test_HM83229() runs on Conversion_CT
   log(" ----------- f_test_HM83229 ----------- ");
   log("Original string: ", ch);
   tmpStr := 
-    f_replaceEveryOccurenceOfSubstring(replacestr, "%2F", "/");
+    f_replaceEveryOccurenceOfSubstring(ch, "%2F", "/");
   log("Replace every occurence of %2F to /: ", tmpStr); 
 
   if (tmpStr == "sip:annc@192.168.73.1:5068;play=http://extMrfc.ericsson.com/play/1")  { setverdict(pass); }
@@ -224,6 +223,56 @@ testcase f_test_isWhitespace() runs on Conversion_CT
   
 }
 
+// test f_substr_token_oct testcase
+testcase f_test_substrTokenOct() runs on Conversion_CT
+{
+  log(" ----------- f_substr_token_oct ----------- ");
+  var octetstring v_octetstr := '000102030405060708090a0b0c0d0e0f'O;
+  var octetstring v_begin := '0102'O;
+  var octetstring v_end := '0b0c'O;
+  var octetstring v_substr := f_substr_token_oct(v_octetstr,v_begin,v_end);
+  if ( v_substr == '0102030405060708090a0b0c'O)  { setverdict(pass); }
+  else { setverdict(fail); }
+  v_begin := ''O;
+  v_substr := f_substr_token_oct(v_octetstr,v_begin,v_end);
+  if ( v_substr == '000102030405060708090a0b0c'O)  { setverdict(pass); }
+  else { setverdict(fail); }
+  v_begin := '0102'O;
+  v_end := ''O;
+  v_substr := f_substr_token_oct(v_octetstr,v_begin,v_end);
+  if ( v_substr == '0102030405060708090a0b0c0d0e0f'O)  { setverdict(pass); }
+  else { setverdict(fail); }
+  v_begin := ''O;
+  v_substr := f_substr_token_oct(v_octetstr,v_begin,v_end);
+  if ( v_substr == '000102030405060708090a0b0c0d0e0f'O)  { setverdict(pass); }
+  else { setverdict(fail); }
+  v_octetstr := ''O;
+  v_substr := f_substr_token_oct(v_octetstr,v_begin,v_end);
+  if ( v_substr == ''O)  { setverdict(pass); }
+  else { setverdict(fail); }
+  
+}
+
+// test f_strstr_oct testcase
+testcase f_test_strstrOct() runs on Conversion_CT
+{
+  log(" ----------- f_substr_token_oct ----------- ");
+  var octetstring v_octetstr := '0001020304050607080903040a0b0c0d0e0f'O;
+  var octetstring v_otc2search := '0304'O;
+  var integer v_index := f_strstr_oct(v_octetstr,v_otc2search);
+  if ( v_index == 3)  { setverdict(pass); }
+  else { setverdict(fail); }
+  v_index := f_strstr_oct(v_octetstr,v_otc2search,4);
+  if (v_index == 10)  { setverdict(pass); }
+  else { setverdict(fail); }
+  v_index := f_strstr_oct(v_octetstr,v_otc2search,11);
+  if (v_index == -1 )  { setverdict(pass); }
+  else { setverdict(fail); }
+  v_index := f_strstr_oct(v_octetstr,''O,11);
+  if (v_index == 0 )  { setverdict(pass); }
+  else { setverdict(fail); }
+}
+
 
 
 // execute all conversion tests
@@ -245,10 +294,12 @@ control
   execute(f_test_compOctetstring());
   execute(f_test_IPv6CreateLiteral());
   execute(f_test_isWhitespace());
+  execute(f_test_substrTokenOct());
+  execute(f_test_strstrOct());
 }
 
 }//end of module
 with {
-extension "version R32A"
+extension "version R36B"
 }
 
diff --git a/demo/TCCDateTime_Example.ttcn b/demo/TCCDateTime_Example.ttcn
index 40347a4ca577f3096da59d26959701515ee68c7d..92cf2ebe892734d396363879428c4fbab6fb5913 100644
--- a/demo/TCCDateTime_Example.ttcn
+++ b/demo/TCCDateTime_Example.ttcn
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////
 //                                                                           //
-// Copyright Test Competence Center (TCC) ETH 2011                           //
+// Copyright Test Competence Center (TCC) ETH 2018                           //
 //                                                                           //
 // The copyright to the computer  program(s) herein  is the property of TCC. //
 // The program(s) may be used and/or copied only with the written permission //
@@ -11,7 +11,7 @@
 //
 //  File:               TCCDateTime_Example.ttcn
 //  Description:        TCC Useful testcases: DateTime testcases.
-//  Rev:                R32A
+//  Rev:                R36B
 //  Prodnr:             CNL 113 472
 //  Updated:            2011-05-30
 //  Contact:            http://ttcn.ericsson.se
@@ -123,8 +123,25 @@ testcase f_test_ctime_ms_UTC() runs on DateTime_CT
     setverdict(fail);
   }
 }
+// test f_getTpscts testcase
+testcase f_test_getTpscts() runs on DateTime_CT
+{
+  log(" ----------- f_getTpscts ----------- ");
+  log("Tpscts time (f_getTpscts): ");
+  var integer vl_time_int := f_time() - 7200; //GMT+00 time
+  var charstring vl_func := f_getTpscts();
+  var charstring vl_test := f_getTimeFormatted(vl_time_int,"%y%m%d%H%M%S00")
+
+  log("Tpscts (f_getTpscts) - test string: ",vl_test);
+  log("Tpscts (f_getTpscts) - func result: ",vl_func);
+  if (match(vl_test,vl_func)) {
+    setverdict(pass);
+  } else {
+    setverdict(fail);
+  }
+}
 
-// test f_time2str testcase
+// test f_getTimeFormatted testcase
 testcase f_test_getTimeFormatted() runs on DateTime_CT
 {
   log(" ----------- f_getTimeFormatted ----------- ");
@@ -356,6 +373,7 @@ control
   execute(f_test_ctime_ms());
   execute(f_test_ctime_UTC());
   execute(f_test_ctime_ms_UTC());
+  execute(f_test_getTpscts());
   execute(f_test_getTimeFormatted());
   execute(f_test_time2sec());
   execute(f_test_getCurrentDateWithOffset());
@@ -364,6 +382,6 @@ control
   execute(f_test_tic());
   execute(f_test_toc());
   execute(f_test_timeDiff());
-  execute(f_test_HO42714())
+  execute(f_test_HO42714());
 }
 }
diff --git a/demo/TCCEncoding_Example.ttcn b/demo/TCCEncoding_Example.ttcn
index fb62fc4a1227633ef8abf0fe679a2db7c63b24a6..a5e9397709cbd3644a28cff5191c1f49fc772351 100644
--- a/demo/TCCEncoding_Example.ttcn
+++ b/demo/TCCEncoding_Example.ttcn
@@ -11,7 +11,7 @@
 //
 //  File:               TCCEncoding_Example.ttcn
 //  Description:        TCC Useful Functions: Message Encoding Functions.
-//  Rev:                R32A
+//  Rev:                R36B
 //  Prodnr:             CNL 113 472
 //  Updated:            2013-02-05
 //  Contact:            http://ttcn.ericsson.se
@@ -152,5 +152,5 @@ control {
   execute(tc_005_artf265694());   
 }
 
-} with {extension "version R32A"}
+} with {extension "version R36B"}
 
diff --git a/demo/TCCEnv_Example.ttcn b/demo/TCCEnv_Example.ttcn
index 452f7cd1ab552f4fec9cb88b1414f7d563cfcde9..4e3136c6510df06bebb3796293227215e941be0b 100644
--- a/demo/TCCEnv_Example.ttcn
+++ b/demo/TCCEnv_Example.ttcn
@@ -11,7 +11,7 @@
 //
 //  File:               TCCEnv_Example.ttcn
 //  Description:        TCC Useful Functions: Environment Handling Functions.
-//  Rev:                R32A
+//  Rev:                R36B
 //  Prodnr:             CNL 113 472
 //  Updated:            2008-12-10
 //  Contact:            http://ttcn.ericsson.se
diff --git a/demo/TCCFileIO_Example.ttcn b/demo/TCCFileIO_Example.ttcn
index 19311954836be4f4053acf93412fd48ce5646a2c..18925a6d48fbaabb453c75e67c760750f4a05952 100644
--- a/demo/TCCFileIO_Example.ttcn
+++ b/demo/TCCFileIO_Example.ttcn
@@ -11,7 +11,7 @@
 //
 //  File:               TCCFileIO_Example.ttcn
 //  Description:        TCC Useful Functions: File IO Functions.
-//  Rev:                R32A
+//  Rev:                R36B
 //  Prodnr:             CNL 113 472
 //  Updated:            2008-12-10
 //  Contact:            http://ttcn.ericsson.se
diff --git a/demo/TCCFileSystem_Example.ttcn b/demo/TCCFileSystem_Example.ttcn
index 6b84283d88d34071b56693aec52393ba9e8176ae..ac8ffa9e485725a0a9ca3ed7710fec917c1400ed 100644
--- a/demo/TCCFileSystem_Example.ttcn
+++ b/demo/TCCFileSystem_Example.ttcn
@@ -11,7 +11,7 @@
 //
 //  File:               TCCFileSystem_Example.ttcn
 //  Description:        TCC Useful testcases: FileSystem testcases.
-//  Rev:                R32A
+//  Rev:                R36B
 //  Prodnr:             CNL 113 472
 //  Updated:            2011-07-14
 //  Contact:            http://ttcn.ericsson.se
diff --git a/demo/TCCIPsec_Example.ttcn b/demo/TCCIPsec_Example.ttcn
index 1e698706a5c2aad77aee28aafd2cbaa2ab2c036c..e898d630ff7ca95853b1cae1568c10a6aaad6cb4 100644
--- a/demo/TCCIPsec_Example.ttcn
+++ b/demo/TCCIPsec_Example.ttcn
@@ -11,7 +11,7 @@
 //
 //  File:               TCCAssertion_Example.ttcn
 //  Description:        TCC Useful Functions: Assertion Functions.
-//  Rev:                R32A
+//  Rev:                R36B
 //  Prodnr:             CNL 113 472
 //  Updated:            2013-01-09
 //  Contact:            http://ttcn.ericsson.se
diff --git a/demo/TCCInterface_Example.ttcn b/demo/TCCInterface_Example.ttcn
index 88eb01a9900169e1a166d5bb1b88093af3b65aef..27689f75dda584b7a4e7738e0ea7be918805232c 100644
--- a/demo/TCCInterface_Example.ttcn
+++ b/demo/TCCInterface_Example.ttcn
@@ -11,7 +11,7 @@
 //
 //  File:               TCCInterface_Example.ttcn
 //  Description:        TCC Useful Functions: Interface Functions.
-//  Rev:                R32A
+//  Rev:                R36B
 //  Prodnr:             CNL 113 472
 //  Updated:            2008-12-10
 //  Contact:            http://ttcn.ericsson.se
diff --git a/demo/TCCMaths_Example.ttcn b/demo/TCCMaths_Example.ttcn
index 27b3b389a66538d6e1d5afab379c12d2c2c759a4..e9a44c4dc6ab16d6fd2e8505606c4a38d167ef97 100644
--- a/demo/TCCMaths_Example.ttcn
+++ b/demo/TCCMaths_Example.ttcn
@@ -11,7 +11,7 @@
 //
 //  File:               TCCMaths_Example.ttcn
 //  Description:        TCC Useful testcases: Maths testcases.
-//  Rev:                R32A
+//  Rev:                R36B
 //  Prodnr:             CNL 113 472
 //  Updated:            2007-12-09
 //  Contact:            http://ttcn.ericsson.se
diff --git a/demo/TCCMessageHandling_Example.ttcn b/demo/TCCMessageHandling_Example.ttcn
index b935bd79c631534cffd0d59247d0807484266078..14a13bbafcce16f8d55aa5d63e3ef6bee393535f 100644
--- a/demo/TCCMessageHandling_Example.ttcn
+++ b/demo/TCCMessageHandling_Example.ttcn
@@ -11,7 +11,7 @@
 //
 //  File:               TCCMessageHandling_Example.ttcn
 //  Description:        TCC Useful Functions: Message Handling Functions.
-//  Rev:                R32A
+//  Rev:                R36B
 //  Prodnr:             CNL 113 472
 //  Updated:            2013-03-28
 //  Contact:            http://ttcn.ericsson.se
diff --git a/demo/TCCRegexp_Example.ttcn b/demo/TCCRegexp_Example.ttcn
index 8c7b547da1a2d68efb29b84f3bb3302be44187e6..553b15427fc4cb66347b658762494b486287c4f6 100644
--- a/demo/TCCRegexp_Example.ttcn
+++ b/demo/TCCRegexp_Example.ttcn
@@ -11,7 +11,7 @@
 //
 //  File:               TCCRegexp_Example.ttcn
 //  Description:        TCC Useful Functions: Regular Expression Functions.
-//  Rev:                R32A
+//  Rev:                R36B
 //  Prodnr:             CNL 113 472
 //  Contact:            http://ttcn.ericsson.se
 ///////////////////////////////////////////////
diff --git a/demo/TCCTemplate_Example.ttcn b/demo/TCCTemplate_Example.ttcn
index fd0456023176143d2bf8da0bb2110c8b7f2edfc2..246919ad48f16d4341b54b542b5aa1215de60fe4 100644
--- a/demo/TCCTemplate_Example.ttcn
+++ b/demo/TCCTemplate_Example.ttcn
@@ -11,7 +11,7 @@
 //
 //  File:               TCCTemplate_Example.ttcn
 //  Description:        TCC Useful Functions: Template Functions.
-//  Rev:                R32A
+//  Rev:                R36B
 //  Prodnr:             CNL 113 472
 //  Updated:            2007-12-20
 //  Contact:            http://ttcn.ericsson.se
diff --git a/demo/TCCTitanMetadata_Example.ttcn b/demo/TCCTitanMetadata_Example.ttcn
index 2db083f755a0d5c9807a0024259ccc9475986485..60215479c75feef31dea64cd759ade17521f354b 100644
--- a/demo/TCCTitanMetadata_Example.ttcn
+++ b/demo/TCCTitanMetadata_Example.ttcn
@@ -11,7 +11,7 @@
 //
 //  File:               TCCTitanMetadata_Example.ttcn
 //  Description:        TCC Useful Functions: Titan Metadata Functions.
-//  Rev:                R32A
+//  Rev:                R36B
 //  Prodnr:             CNL 113 472
 //  Updated:            2007-11-14
 //  Contact:            http://ttcn.ericsson.se
diff --git a/demo/TCCXPathSupport_Example.ttcn b/demo/TCCXPathSupport_Example.ttcn
old mode 100644
new mode 100755
index f495c7cdd3046448072261a1e1988caaabadc3cf..3db0feffae03ed957d4ba483a1ac7f71d5032022
--- a/demo/TCCXPathSupport_Example.ttcn
+++ b/demo/TCCXPathSupport_Example.ttcn
@@ -11,7 +11,7 @@
 //
 //  File:               TCCXPathSupport_Example.ttcn
 //  Description:        TCC Useful Functions: XPath Support Functions
-//  Rev:                R32A
+//  Rev:                R36B
 //  Prodnr:             CNL 113 472
 //  Updated:            2008-09-04
 //  Contact:            http://ttcn.ericsson.se
diff --git a/doc/TCCUsefulFunctions_CNL113472_1551.doc b/doc/TCCUsefulFunctions_CNL113472_1551.doc
index 609b2ff757a4e3a675f4f43958d1fce3380d1498..7ba4e1e0bff1d8809a6c87f6741e3a5965e738ad 100644
Binary files a/doc/TCCUsefulFunctions_CNL113472_1551.doc and b/doc/TCCUsefulFunctions_CNL113472_1551.doc differ
diff --git a/doc/TCCUsefulFunctions_CNL113472_PRI.doc b/doc/TCCUsefulFunctions_CNL113472_PRI.doc
index ac0448adf3a7e532e2913ee0782bd7df5b378850..6765e7603c44ff7c5bcf64dc1eb3763e2cf75bda 100644
Binary files a/doc/TCCUsefulFunctions_CNL113472_PRI.doc and b/doc/TCCUsefulFunctions_CNL113472_PRI.doc differ
diff --git a/src/TCCAssertion.cc b/src/TCCAssertion.cc
index 5813a0d9a3dca2c3526ae41fd37eda83767528c3..ff5fd06dc3f8b214ee05e1774ec59386911427eb 100644
--- a/src/TCCAssertion.cc
+++ b/src/TCCAssertion.cc
@@ -10,7 +10,7 @@
 //
 //  File:               TCCAssertion.cc
 //  Description:        TCC Useful Functions: Assert Functions
-//  Rev:                R35B
+//  Rev:                R36B
 //  Prodnr:             CNL 113 472
 //
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/src/TCCAssertion_Functions.ttcn b/src/TCCAssertion_Functions.ttcn
index eebea19c72e0dbadab7db651f827b814747da408..618ab239907f0c25245319721ef5c0e81a22ad84 100644
--- a/src/TCCAssertion_Functions.ttcn
+++ b/src/TCCAssertion_Functions.ttcn
@@ -10,7 +10,7 @@
 //
 //  File:               TCCAssertion_Functions.ttcn
 //  Description:        TCC Useful Functions: Assert Functions
-//  Rev:                R35B
+//  Rev:                R36B
 //  Prodnr:             CNL 113 472
 //
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/src/TCCConversion.cc b/src/TCCConversion.cc
index 27fae126a26a6a01a776e9ca2b6db0c1339a890b..f34b3eaf4022b6e75645d05f2db087dc5a5c01fc 100644
--- a/src/TCCConversion.cc
+++ b/src/TCCConversion.cc
@@ -10,7 +10,7 @@
 //
 //  File:               TCCConversion.cc
 //  Description:        TCC Useful Functions: Conversion Functions
-//  Rev:                R35B
+//  Rev:                R36B
 //  Prodnr:             CNL 113 472
 //
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/src/TCCConversion_Functions.ttcn b/src/TCCConversion_Functions.ttcn
index f52ea2baa5bb6db30d4d555bfe32a9b5d31172ba..36a8036ef9543088d104d1f554cd507f92fdb94c 100644
--- a/src/TCCConversion_Functions.ttcn
+++ b/src/TCCConversion_Functions.ttcn
@@ -10,7 +10,7 @@
 //
 //  File:               TCCConversion_Functions.ttcn
 //  Description:        TCC Useful Functions: Conversion Functions
-//  Rev:                R35B
+//  Rev:                R36B
 //  Prodnr:             CNL 113 472
 //
 ///////////////////////////////////////////////////////////////////////////////
@@ -969,5 +969,5 @@ return boolean
 
 }//end of module
 with {
-extension "version R35B"}
+extension "version R36B"}
 
diff --git a/src/TCCDateTime.cc b/src/TCCDateTime.cc
index 0256c8812d48b84511e726a3fb225dadd9fd8adc..37b444ddc10773b9f6f1e2e08ed5e075bcb21b47 100644
--- a/src/TCCDateTime.cc
+++ b/src/TCCDateTime.cc
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////
 //
-// Copyright (c) 2000-2017 Ericsson Telecom AB
+// Copyright (c) 2000-2018 Ericsson Telecom AB
 //
 // All rights reserved. This program and the accompanying materials
 // are made available under the terms of the Eclipse Public License v1.0
@@ -10,7 +10,7 @@
 //
 //  File:               TCCDateTime.cc
 //  Description:        TCC Useful Functions: DateTime Functions
-//  Rev:                R35B
+//  Rev:                R36B
 //  Prodnr:             CNL 113 472
 //
 ///////////////////////////////////////////////////////////////////////////////
@@ -198,6 +198,124 @@ namespace TCCDateTime__Functions
     return formatTimeString(ti,msec);
   }
 
+
+
+//////////////////////////////////////////////////////////////////////////////
+// Function: f__getTpscts
+//
+// Purpose:
+// get special timestamp called Tpscts
+// where 18020714540200 = 2018 February 07 14:54:02 GMT+00
+//
+// Parameters:
+//   pl_sec  - *in* *integer* - time value in seconds since epoc or -1
+//             if -1 is supplied the current time is used
+//   pl_tz   - *in* *integer* - time zone offset in seconds, currently not used
+//
+// Return Value:
+// charstring - tpscts
+//
+// Errors:
+// -
+//
+// Detailed description:
+// -
+//
+///////////////////////////////////////////////////////////////////////////////
+  CHARSTRING f__getTpscts(const INTEGER& pl__sec, const INTEGER& pl__tz)
+  {
+  time_t rawtime;
+  struct tm *ptm;
+  if(pl__sec == -1){
+    time(&rawtime);
+  } else {
+    rawtime = pl__sec.get_long_long_val();
+  }
+  ptm = gmtime(&rawtime);
+  char result[15];
+  sprintf(result, "%02d%02d%02d%02d%02d%02d00",
+      ptm->tm_year%100,
+      ptm->tm_mon+1,
+      ptm->tm_mday,
+      ptm->tm_hour,
+      ptm->tm_min,
+      ptm->tm_sec);
+  return result;
+  }
+
+
+/*
+Semi octet
+
+Each half octet within the field represents one decimal digit. 
+The octets with the lowest octet numbers shall contain the most significant decimal digits.
+Within one octet, the half octet containing the bits with bit numbers 0 to 3, shall 
+represent the most significant digit.
+
++---------+---------+
+| Digit 2 | Digit 1 |
++---------+---------+
+
+if ch == 17 -> return 0x71
+
+*/
+
+unsigned char encode_2_semioctet(unsigned char ch){
+  return ((ch % 10) << 4 ) | ( ch / 10 );
+}
+
+//////////////////////////////////////////////////////////////////////////////
+// Function: f_getOctTpscts
+//
+// Purpose:
+// get special timestamp called TP Service Centre Time Stamp (TP SCTS), 3GPP TS 23.040
+// where '81207041452000'O = 2018 February 07 14:54:02 GMT+00
+//
+// Parameters:
+//   pl_sec  - *in* *integer* - time value in seconds since epoc or -1
+//             if -1 is supplied the current time is used
+//   pl_tz   - *in* *integer* - time zone offset in minutes
+//
+// Return Value:
+// charstring - tpscts
+//
+// Errors:
+// -
+//
+// Detailed description:
+// -
+//
+///////////////////////////////////////////////////////////////////////////////
+OCTETSTRING f__getOctTpscts(const INTEGER& pl__sec, const INTEGER& pl__tz)
+{
+  time_t rawtime;
+  struct tm *ptm;
+  if(pl__sec == -1){
+    time(&rawtime);
+  } else {
+    rawtime = pl__sec.get_long_long_val() + (pl__tz.get_long_long_val() * 60 );
+  }
+  
+  ptm = gmtime(&rawtime);
+  
+  unsigned char tpscts[7];
+  
+  tpscts[0] = encode_2_semioctet(ptm->tm_year%100);
+  tpscts[1] = encode_2_semioctet(ptm->tm_mon+1);
+  tpscts[2] = encode_2_semioctet(ptm->tm_mday);
+  tpscts[3] = encode_2_semioctet(ptm->tm_hour);
+  tpscts[4] = encode_2_semioctet(ptm->tm_min);
+  tpscts[5] = encode_2_semioctet(ptm->tm_sec);
+  tpscts[6] = encode_2_semioctet(abs(pl__tz/15));
+  if(pl__tz<0){
+    tpscts[6] |= 0x08; // set the bit 3 to 1 -> time zoen is negative
+  }
+
+
+  return OCTETSTRING(7, tpscts);
+}
+  
+
 ///////////////////////////////////////////////////////////////////////////////
 //  Function: f__getTimeFormatted
 //
diff --git a/src/TCCDateTime_Functions.ttcn b/src/TCCDateTime_Functions.ttcn
index 9343310253ac391699f01027d6877b4533461299..9ebb0d7c233dfc04e4eb0e1cb7f0b7623439c31f 100644
--- a/src/TCCDateTime_Functions.ttcn
+++ b/src/TCCDateTime_Functions.ttcn
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////
 //
-// Copyright (c) 2000-2017 Ericsson Telecom AB
+// Copyright (c) 2000-2018 Ericsson Telecom AB
 //
 // All rights reserved. This program and the accompanying materials
 // are made available under the terms of the Eclipse Public License v1.0
@@ -10,7 +10,7 @@
 //
 //  File:               TCCDateTime_Functions.ttcn
 //  Description:        TCC Useful Functions: DateTime Functions
-//  Rev:                R35B
+//  Rev:                R36B
 //  Prodnr:             CNL 113 472
 //
 ///////////////////////////////////////////////////////////////////////////////
@@ -30,6 +30,7 @@
 ///////////////////////////////////////////////////////////////////////////////
 module TCCDateTime_Functions {
 
+
 ///////////////////////////////////////////////////////////////////////////////
 //  Function: f_time
 //
@@ -160,6 +161,54 @@ external function f_ctime_UTC(integer pl_sec) return charstring;
 ///////////////////////////////////////////////////////////////////////////////
 external function f_ctime_ms_UTC(integer pl_msec) return charstring;
 
+//////////////////////////////////////////////////////////////////////////////
+// Function: f_getTpscts
+//
+// Purpose:
+// get special timestamp called Tpscts
+// where 18020714540200 = 2018 February 07 14:54:02 GMT+00
+//
+// Parameters:
+//   pl_sec  - *in* *integer* - time value in seconds since epoc or -1
+//             if -1 is supplied the current time is used
+//   pl_tz   - *in* *integer* - time zone offset in minutes, currently not used
+//
+// Return Value:
+// charstring - tpscts
+//
+// Errors:
+// -
+//
+// Detailed description:
+// -
+//
+///////////////////////////////////////////////////////////////////////////////
+external function f_getTpscts(in integer pl_sec:=-1, in integer pl_tz:=0) return charstring;
+
+//////////////////////////////////////////////////////////////////////////////
+// Function: f_getOctTpscts
+//
+// Purpose:
+// get special timestamp called TP Service Centre Time Stamp (TP SCTS), 3GPP TS 23.040
+// where '81207041452000'O = 2018 February 07 14:54:02 GMT+00
+//
+// Parameters:
+//   pl_sec  - *in* *integer* - time value in seconds since epoc or -1
+//             if -1 is supplied the current time is used
+//   pl_tz   - *in* *integer* - time zone offset in minutes
+//
+// Return Value:
+// charstring - tpscts
+//
+// Errors:
+// -
+//
+// Detailed description:
+// -
+//
+///////////////////////////////////////////////////////////////////////////////
+external function f_getOctTpscts(in integer pl_sec:=-1, in integer pl_tz:=0) return octetstring;
+
 ///////////////////////////////////////////////////////////////////////////////
 //  Function: f_getTimeFormatted
 //
diff --git a/src/TCCEncoding.cc b/src/TCCEncoding.cc
index 182c95f23378213fd7d1c760f671c65585386e4e..02d2cf4573d174ae7b7772886358ceeab087dcf4 100644
--- a/src/TCCEncoding.cc
+++ b/src/TCCEncoding.cc
@@ -10,7 +10,7 @@
 //
 //  File:               TCCEncoding.cc
 //  Description:        TCC Useful Functions: Message Encoding Functions.
-//  Rev:                R35B
+//  Rev:                R36B
 //  Prodnr:             CNL 113 472
 //
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/src/TCCEncoding_Functions.ttcn b/src/TCCEncoding_Functions.ttcn
index 6c00fbb296faa6450080c51ab9d03caa73f0e70e..ba0b643eb5a842381cfe72453e7111f952253954 100644
--- a/src/TCCEncoding_Functions.ttcn
+++ b/src/TCCEncoding_Functions.ttcn
@@ -10,7 +10,7 @@
 //
 //  File:               TCCEncoding_Functions.ttcn
 //  Description:        TCC Useful Functions: Message Encoding Functions.
-//  Rev:                R35B
+//  Rev:                R36B
 //  Prodnr:             CNL 113 472
 //
 ///////////////////////////////////////////////////////////////////////////////
@@ -730,4 +730,4 @@ public function f_enc_TBCD_hex(in hexstring pl_hex) return octetstring
   return vl_oct;
 }
 
-} with {extension "version R35B"}
+} with {extension "version R36B"}
diff --git a/src/TCCEnv.cc b/src/TCCEnv.cc
index 40757fd7281589aa1e42ad8f8bce8125e4dca03e..98281cc82b4a2bfa9a34be5ab45b856a3e45af14 100644
--- a/src/TCCEnv.cc
+++ b/src/TCCEnv.cc
@@ -10,7 +10,7 @@
 //
 //  File:               TCCEnv.cc
 //  Description:        TCC Useful Functions: Environment Handling Functions.
-//  Rev:                R35B
+//  Rev:                R36B
 //  Prodnr:             CNL 113 472
 //
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/src/TCCEnv_Functions.ttcn b/src/TCCEnv_Functions.ttcn
index 5723950cc9a09992ec9c2b32333cf953dead48a9..03db751f15c8fb5fcd75705dd04c1d264896f879 100644
--- a/src/TCCEnv_Functions.ttcn
+++ b/src/TCCEnv_Functions.ttcn
@@ -10,7 +10,7 @@
 //
 //  File:               TCCEnv_Functions.ttcn
 //  Description:        TCC Useful Functions: Environment Handling Functions.
-//  Rev:                R35B
+//  Rev:                R36B
 //  Prodnr:             CNL 113 472
 //
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/src/TCCFileIO.cc b/src/TCCFileIO.cc
index c40e650f20b6f859b8ca059113f3e96f94afa2e2..582787bb2188b80b811195c3e92ffdb48045542d 100644
--- a/src/TCCFileIO.cc
+++ b/src/TCCFileIO.cc
@@ -10,7 +10,7 @@
 //
 //  File:               TCCFileIO.cc
 //  Description:        TCC Useful Functions: FileIO Functions
-//  Rev:                R35B
+//  Rev:                R36B
 //  Prodnr:             CNL 113 472
 //
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/src/TCCFileIO_Functions.ttcn b/src/TCCFileIO_Functions.ttcn
index ffe4ef6d4c9dcb6027499b3f155f0da8cc2680bc..2dcb9d612f20a1e3a9656f8a7021f22010c5c64f 100644
--- a/src/TCCFileIO_Functions.ttcn
+++ b/src/TCCFileIO_Functions.ttcn
@@ -10,7 +10,7 @@
 //
 //  File:               TCCFileIO_Functions.ttcn
 //  Description:        TCC Useful Functions: FileIO Functions
-//  Rev:                R35B
+//  Rev:                R36B
 //  Prodnr:             CNL 113 472
 //
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/src/TCCFileSystem.cc b/src/TCCFileSystem.cc
index 9c56ca978dd9bde27a611259163abdb1a368ab07..1af99b9ee825c9aae6b7f0efe24aa1929e833811 100644
--- a/src/TCCFileSystem.cc
+++ b/src/TCCFileSystem.cc
@@ -10,7 +10,7 @@
 //
 //  File:               TCCFileSystem.cc
 //  Description:        TCC Useful Functions: FileSystem Functions
-//  Rev:                R35B
+//  Rev:                R36B
 //  Prodnr:             CNL 113 472
 //
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/src/TCCFileSystem_Functions.ttcn b/src/TCCFileSystem_Functions.ttcn
index 32d4d828a610db7dbe754357d8bdd81bf50bab28..5409f2de80e2b55cbdeaa7f6cc02fe4cc39d62ba 100644
--- a/src/TCCFileSystem_Functions.ttcn
+++ b/src/TCCFileSystem_Functions.ttcn
@@ -10,7 +10,7 @@
 //
 //  File:               TCC_FileSystem_Functions.ttcn
 //  Description:        TCC Useful Functions: FileSystem Functions
-//  Rev:                R35B
+//  Rev:                R36B
 //  Prodnr:             CNL 113 472
 //
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/src/TCCIPsec.cc b/src/TCCIPsec.cc
index 5dddc62727f5e16909bc3b16217c65d218fbeac3..1d2fcef4f630ce2efb5fd64a4dc3241c4fc9e75b 100644
--- a/src/TCCIPsec.cc
+++ b/src/TCCIPsec.cc
@@ -10,7 +10,7 @@
 //
 //  File:               TCCIPsec.cc
 //  Description:        TCC Useful Functions: IPsec Functions
-//  Rev:                R35B
+//  Rev:                R36B
 //  Prodnr:             CNL 113 472
 //
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/src/TCCIPsec_Definitions.ttcn b/src/TCCIPsec_Definitions.ttcn
index 5751e08cf32ef7a431519a19fe383456c992a4ee..5a694031ccb5229a7b64ed92a9c73399dda890b3 100644
--- a/src/TCCIPsec_Definitions.ttcn
+++ b/src/TCCIPsec_Definitions.ttcn
@@ -10,7 +10,7 @@
 //
 //  File:               TCCIPsec_Definitions.ttcn
 //  Description:        TCC Useful Functions: Definitions for IPsec functions
-//  Rev:                R35B
+//  Rev:                R36B
 //  Prodnr:             CNL 113 472
 //
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/src/TCCIPsec_Functions.ttcn b/src/TCCIPsec_Functions.ttcn
index 34a44ad0dac84ee84413de1caefcc5c02c42d07b..030515b641df4903502a9bb20ab5ee7eab8ee311 100644
--- a/src/TCCIPsec_Functions.ttcn
+++ b/src/TCCIPsec_Functions.ttcn
@@ -10,7 +10,7 @@
 //
 //  File:               TCCIPsec_Functions.ttcn
 //  Description:        TCC Useful Functions: IPsec Functions
-//  Rev:                R35B
+//  Rev:                R36B
 //  Prodnr:             CNL 113 472
 //
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/src/TCCIPsec_XFRM.cc b/src/TCCIPsec_XFRM.cc
index 633709e79f6e1ea7ff0c9689bcded78a2a9c896d..62551b77a1e0ccd7029e05784c7b01c334991058 100644
--- a/src/TCCIPsec_XFRM.cc
+++ b/src/TCCIPsec_XFRM.cc
@@ -10,7 +10,7 @@
 //
 //  File:               TCCIPsec_XFRM.cc
 //  Description:        TCC Useful Functions: IPsec XFRM Functions
-//  Rev:                R35B
+//  Rev:                R36B
 //  Prodnr:             CNL 113 472
 //
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/src/TCCIPsec_XFRM.hh b/src/TCCIPsec_XFRM.hh
index d27e02a144f6efca767930e37572708977120e3f..30f484bfacd8abf33de8d1a0155ba3e2aa1fc60e 100644
--- a/src/TCCIPsec_XFRM.hh
+++ b/src/TCCIPsec_XFRM.hh
@@ -10,7 +10,7 @@
 //
 //  File:               TCCIPsec_XFRM.hh
 //  Description:        TCC Useful Functions: IPsec XFRM Functions
-//  Rev:                R35B
+//  Rev:                R36B
 //  Prodnr:             CNL 113 472
 //
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/src/TCCIPsec_XFRM_Definitions.ttcn b/src/TCCIPsec_XFRM_Definitions.ttcn
index 5791371e7027f0295d8cf5d70953de58c858d29b..a2b5c3562d12b210a6ecb49e25066ddcb8c0a7aa 100644
--- a/src/TCCIPsec_XFRM_Definitions.ttcn
+++ b/src/TCCIPsec_XFRM_Definitions.ttcn
@@ -10,7 +10,7 @@
 //
 //  File:               TCCIPsec_XFRM_Definitions.ttcn
 //  Description:        TCC Useful Functions: IPsec XFRM Functions
-//  Rev:                R35B
+//  Rev:                R36B
 //  Prodnr:             CNL 113 472
 //
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/src/TCCIPsec_XFRM_SA.cc b/src/TCCIPsec_XFRM_SA.cc
index d993b57a90ed8ab16d6520ceba00b9175854eaf5..a7f28a4b4a9638daf61231866997e73159aa39b7 100644
--- a/src/TCCIPsec_XFRM_SA.cc
+++ b/src/TCCIPsec_XFRM_SA.cc
@@ -10,7 +10,7 @@
 //
 //  File:               TCCIPsec_XFRM_SA.cc
 //  Description:        TCC Useful Functions: IPsec XFRM Functions
-//  Rev:                R35B
+//  Rev:                R36B
 //  Prodnr:             CNL 113 472
 //
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/src/TCCIPsec_XFRM_SP.cc b/src/TCCIPsec_XFRM_SP.cc
index 23f25816d3018f932a599435a8e8bad6beb87c45..e73731b71b58aea829b5ed8f3cfb8dd6374940b6 100644
--- a/src/TCCIPsec_XFRM_SP.cc
+++ b/src/TCCIPsec_XFRM_SP.cc
@@ -10,7 +10,7 @@
 //
 //  File:               TCCIPsec_XFRM_SP.cc
 //  Description:        TCC Useful Functions: IPsec XFRM Functions
-//  Rev:                R35B
+//  Rev:                R36B
 //  Prodnr:             CNL 113 472
 //
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/src/TCCInterface.cc b/src/TCCInterface.cc
index ebcf52e47f3ce08d71968327a33033847393029a..db6418475cd9a4c7eb3b5be7d8c133a2123caf24 100644
--- a/src/TCCInterface.cc
+++ b/src/TCCInterface.cc
@@ -10,7 +10,7 @@
 //
 //  File:               TCCInterface.cc
 //  Description:        TCC Useful Functions: Interface Functions
-//  Rev:                R35B
+//  Rev:                R36B
 //  Prodnr:             CNL 113 472
 //
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/src/TCCInterface_Functions.ttcn b/src/TCCInterface_Functions.ttcn
index 6c75e6c3f544053d63c5ecd7edc965a2cd3b85f7..67fa29cd85905f7d90c797b9cd7710d0c52255dc 100644
--- a/src/TCCInterface_Functions.ttcn
+++ b/src/TCCInterface_Functions.ttcn
@@ -10,7 +10,7 @@
 //
 //  File:               TCCInterface_Functions.ttcn
 //  Description:        TCC Useful Functions: Interface Functions
-//  Rev:                R35B
+//  Rev:                R36B
 //  Prodnr:             CNL 113 472
 //
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/src/TCCInterface_ip.h b/src/TCCInterface_ip.h
index 0f071abeec18375d91cddbb30e7156c3371e71fb..8eeebd51cf0c0f3b6e4057c7284e5eb298e9e8bc 100644
--- a/src/TCCInterface_ip.h
+++ b/src/TCCInterface_ip.h
@@ -10,7 +10,7 @@
 //
 //  File:               TCCInterface_ip.h
 //  Description:        TCC Useful Functions: Interface Functions
-//  Rev:                R35B
+//  Rev:                R36B
 //  Prodnr:             CNL 113 472
 //
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/src/TCCMaths.cc b/src/TCCMaths.cc
index 2cd81429aac4af07108197a229f1404aa3d0cc24..35f934f8c1e6a3ea9f95e115d2e4356f3b4c3fad 100644
--- a/src/TCCMaths.cc
+++ b/src/TCCMaths.cc
@@ -10,7 +10,7 @@
 //
 //  File:               TCCMaths.cc
 //  Description:        TCC Useful Functions: Maths Functions.
-//  Rev:                R35B
+//  Rev:                R36B
 //  Prodnr:             CNL 113 472
 //
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/src/TCCMaths_Functions.ttcn b/src/TCCMaths_Functions.ttcn
index 55ace3b1c1feee04bffd46754773515f35a8ccd6..3762c568d20be079e3bb0f6e97bb635f0888fbbb 100644
--- a/src/TCCMaths_Functions.ttcn
+++ b/src/TCCMaths_Functions.ttcn
@@ -10,7 +10,7 @@
 //
 //  File:               TCCMaths_Functions.ttcn
 //  Description:        TCC Useful Functions: Math Functions
-//  Rev:                R35B
+//  Rev:                R36B
 //  Prodnr:             CNL 113 472
 //
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/src/TCCMaths_GenericTypes.ttcn b/src/TCCMaths_GenericTypes.ttcn
index 106aa0efae185d190301b080d984cfd3c95d67e6..8f7dd58e6d6906b3f5d7fab94f83754bfaa6803b 100644
--- a/src/TCCMaths_GenericTypes.ttcn
+++ b/src/TCCMaths_GenericTypes.ttcn
@@ -10,7 +10,7 @@
 //
 //  File:               TCCMaths_GenericTypes.ttcn
 //  Description:        TCC Useful Functions: Generic Types For Maths
-//  Rev:                R35B
+//  Rev:                R36B
 //  Prodnr:             CNL 113 472
 //
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/src/TCCMessageHandling.cc b/src/TCCMessageHandling.cc
index 43a802b3fbcb811a483f8cdbcbe231915793e3f9..5d7cbb6a0a97a1ddbe580d8bcd69dbce1c2db5c4 100644
--- a/src/TCCMessageHandling.cc
+++ b/src/TCCMessageHandling.cc
@@ -9,7 +9,7 @@
 ///////////////////////////////////////////////////////////////////////////////
 //
 //  File:     TCCMessageHandling.cc
-//  Rev:      R35B
+//  Rev:      R36B
 //  Prodnr:   CNL 113 472
 //
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/src/TCCMessageHandling_Functions.ttcn b/src/TCCMessageHandling_Functions.ttcn
index aadfb44c73cd0924e8f874c94ca8473fa4a9172f..32a392757dd2a683136913c9ecc5adf589bae1d1 100644
--- a/src/TCCMessageHandling_Functions.ttcn
+++ b/src/TCCMessageHandling_Functions.ttcn
@@ -10,7 +10,7 @@
 //
 //  File:               TCCMessageHandling_Functions.ttcn
 //  Description:        TCC Useful Functions: MessageHandling Functions
-//  Rev:                R35B
+//  Rev:                R36B
 //  Prodnr:             CNL 113 472
 //
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/src/TCCOpenSecurity.cc b/src/TCCOpenSecurity.cc
index 6044607063ad3e752a74b248b95d1454cbcb0413..54b8f77689c2e466c8be9cd38af0088b9f9c29c8 100644
--- a/src/TCCOpenSecurity.cc
+++ b/src/TCCOpenSecurity.cc
@@ -10,7 +10,7 @@
 //
 //  File:               TCCOpenSecurity.cc
 //  Description:        TCC Useful Functions: Security Functions
-//  Rev:                R35B
+//  Rev:                R36B
 //  Prodnr:             CNL 113 472
 //
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/src/TCCOpenSecurity_Functions.ttcn b/src/TCCOpenSecurity_Functions.ttcn
index ec4f212d80378a9d9388d49552943a25ed098238..e6695ff7624aa9e0a5589fddcfb8f17611a0fcaa 100644
--- a/src/TCCOpenSecurity_Functions.ttcn
+++ b/src/TCCOpenSecurity_Functions.ttcn
@@ -10,7 +10,7 @@
 //
 //  File:               TCCOpenSecurity.ttcn
 //  Description:        TCC Useful Functions: Security Functions
-//  Rev:                R35B
+//  Rev:                R36B
 //  Prodnr:             CNL 113 472
 //
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/src/TCCPermutatedParameters_Definitions.ttcn b/src/TCCPermutatedParameters_Definitions.ttcn
index 14338d6842db584948ea7563a21eea3a599938d1..99b9f2c017241a3e3d80d6334cea1f2c53e14d61 100644
--- a/src/TCCPermutatedParameters_Definitions.ttcn
+++ b/src/TCCPermutatedParameters_Definitions.ttcn
@@ -10,7 +10,7 @@
 //
 //  File:               TCCPermutatedParameters_Definitions.ttcn
 //  Description:        definitions for permutated params
-//  Rev:                R35B
+//  Rev:                R36B
 //  Prodnr:             CNL 113 472
 //////////////////////////////////////////////////////////////////////////////
 
@@ -156,4 +156,4 @@ type record of PP_ParamSet PP_ParamSetList; // is each CGPN has its own current
 ///////////////////////////////////////////////////////////
 type set of PP_SingleParam PP_ParamSet;  // ie params belonging to one particular call
 
-} with { extension "version R35B"}
+} with { extension "version R36B"}
diff --git a/src/TCCPermutatedParameters_Functions.ttcn b/src/TCCPermutatedParameters_Functions.ttcn
index 145d62b729efd167b63f3df3a7114d0c923f6d7b..7a8b10467ca7b82b65780f3c14c504d417617fae 100644
--- a/src/TCCPermutatedParameters_Functions.ttcn
+++ b/src/TCCPermutatedParameters_Functions.ttcn
@@ -10,7 +10,7 @@
 //
 //  File:               TCCPermutatedParameters_Functions.ttcn
 //  Description:        functions for permutated params
-//  Rev:                R35B
+//  Rev:                R36B
 //  Prodnr:             CNL 113 472
 //////////////////////////////////////////////////////////////////////////////
 
@@ -905,4 +905,4 @@ public function f_PP_getParamValueFromSet(
   return vl_ret;
 }
 
-} with { extension "version R35B"}
+} with { extension "version R36B"}
diff --git a/src/TCCRegexp.cc b/src/TCCRegexp.cc
index cfac587e0c10f12b79cb50fdb0f154cbeb35ecb6..f03b1d210e7c98b71d6ca116441b1b63a74eb00e 100644
--- a/src/TCCRegexp.cc
+++ b/src/TCCRegexp.cc
@@ -10,7 +10,7 @@
 //
 //  File:               TCCRegexp_Functions.ttcn
 //  Description:        TCC Useful Functions: Regexp Functions
-//  Rev:                R35B
+//  Rev:                R36B
 //  Prodnr:             CNL 113 472
 //
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/src/TCCRegexp_Functions.ttcn b/src/TCCRegexp_Functions.ttcn
index a496e0af341798064e2534fa3990061bfeba0139..a3331c903e3839b4767b0e7991aa7b42d69beaf0 100644
--- a/src/TCCRegexp_Functions.ttcn
+++ b/src/TCCRegexp_Functions.ttcn
@@ -10,7 +10,7 @@
 //
 //  File:               TCCRegexp_Functions.ttcn
 //  Description:        TCC Useful Functions: Regexp Functions
-//  Rev:                R35B
+//  Rev:                R36B
 //  Prodnr:             CNL 113 472
 //
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/src/TCCSystem.cc b/src/TCCSystem.cc
index 5f8e6641e965b62876b2d122f9f6794f442b277b..e62c8475ee16c4e26be14609d0a7fa4b6247c4ae 100644
--- a/src/TCCSystem.cc
+++ b/src/TCCSystem.cc
@@ -10,7 +10,7 @@
 //
 //  File:               TCCSystem.cc
 //  Description:        TCC Useful Functions: System Functions
-//  Rev:                R35B
+//  Rev:                R36B
 //  Prodnr:             CNL 113 472
 //
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/src/TCCSystem_Functions.ttcn b/src/TCCSystem_Functions.ttcn
index 2c669dbe6ec563f3fd4d5adc88b6092b005a0cc4..59bd54617cb692b536b9a7e31625aa960ab2c5a5 100644
--- a/src/TCCSystem_Functions.ttcn
+++ b/src/TCCSystem_Functions.ttcn
@@ -10,7 +10,7 @@
 //
 //  File:               TCCSystem_Functions.ttcn
 //  Description:        TCC Useful Functions: System Functions
-//  Rev:                R35B
+//  Rev:                R36B
 //  Prodnr:             CNL 113 472
 //
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/src/TCCTemplate_Functions.ttcn b/src/TCCTemplate_Functions.ttcn
index 3e8812f4f2907b8512e0f28606d4107d37ecf826..5e6725da88b9415d9ac406f1820cf04eb037c11d 100644
--- a/src/TCCTemplate_Functions.ttcn
+++ b/src/TCCTemplate_Functions.ttcn
@@ -10,7 +10,7 @@
 //
 //  File:               TCCTemplate_Functions.ttcn
 //  Description:        TCC Useful Functions: Template Functions
-//  Rev:                R35B
+//  Rev:                R36B
 //  Prodnr:             CNL 113 472
 //
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/src/TCCTitanMetadata.cc b/src/TCCTitanMetadata.cc
index 581f12a2f10ff362963a284e9c3e71c041f8c643..acaa877d83ce85fd2923f989c23e02037715a5a1 100644
--- a/src/TCCTitanMetadata.cc
+++ b/src/TCCTitanMetadata.cc
@@ -10,7 +10,7 @@
 //
 //  File:               TCCTitanMetadata.cc
 //  Description:        TCC Useful Functions: TitanMetadata Functions
-//  Rev:                R35B
+//  Rev:                R36B
 //  Prodnr:             CNL 113 472
 //
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/src/TCCTitanMetadata_Functions.ttcn b/src/TCCTitanMetadata_Functions.ttcn
index 7bb2c39436418cce0b578004d7de0f736bc01645..e4438310e23f1c74736bc79e659f68508a2518ae 100644
--- a/src/TCCTitanMetadata_Functions.ttcn
+++ b/src/TCCTitanMetadata_Functions.ttcn
@@ -10,7 +10,7 @@
 //
 //  File:               TCCTitanMetadata_Functions.ttcn
 //  Description:        TCC Useful Functions: TitanMetadata Functions
-//  Rev:                R35B
+//  Rev:                R36B
 //  Prodnr:             CNL 113 472
 //
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/src/TCCUsefulFunctions_Library.grp b/src/TCCUsefulFunctions_Library.grp
index d5704779575f6049bbc4d6adc621d7ba952ceef8..d9175f414a7313f45a04d8f07cd37e6f864b8e94 100644
--- a/src/TCCUsefulFunctions_Library.grp
+++ b/src/TCCUsefulFunctions_Library.grp
@@ -11,7 +11,7 @@
 //
 //  File:        TCCUsefulFunctions_Library.grp
 //  Description: FileGroup file for TCCUsefulFunctions ApplicationLibrary
-//  Rev:         R35B
+//  Rev:         R36B
 //  Prodnr:      CNL 113 472
 //
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/src/TCCUsefulFunctions_PermutatedParameters.grp b/src/TCCUsefulFunctions_PermutatedParameters.grp
index ad37c1d3724edcdc0a594fd8e0b9d46661dcbee4..648dc1271295df6f5fb11425a3f58d98263c5cae 100644
--- a/src/TCCUsefulFunctions_PermutatedParameters.grp
+++ b/src/TCCUsefulFunctions_PermutatedParameters.grp
@@ -11,7 +11,7 @@
 //
 //  File:        TCCUsefulFunctions_PermutatedParameters.grp
 //  Description: FileGroup file for TCCUsefulFunctions Permutated Parameters
-//  Rev:         R35B
+//  Rev:         R36B
 //  Prodnr:      CNL 113 472
 //
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/src/TCCXPathSupport.cc b/src/TCCXPathSupport.cc
old mode 100644
new mode 100755
index cf1077a7e954f9e18ce6c590876093f74178d689..1539b0953f19f914b621cd84acc942e7dfb85949
--- a/src/TCCXPathSupport.cc
+++ b/src/TCCXPathSupport.cc
@@ -10,7 +10,7 @@
 //
 //  File:               TCCXPathSupport_Functions.ttcn
 //  Description:        TCC Useful Functions: XPath Support Functions
-//  Rev:                R35B
+//  Rev:                R36B
 //  Prodnr:             CNL 113 472
 //
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/src/TCCXPathSupport_Functions.ttcn b/src/TCCXPathSupport_Functions.ttcn
old mode 100644
new mode 100755
index 4d6b0c93a1e8ce876b6620acad1a3d79dae7aecb..f8222d1e83c1bd2bc430413da7189353d3f4e308
--- a/src/TCCXPathSupport_Functions.ttcn
+++ b/src/TCCXPathSupport_Functions.ttcn
@@ -10,7 +10,7 @@
 //
 //  File:               TCCXPathSupport_Functions.ttcn
 //  Description:        TCC Useful Functions: XPath Support Functions
-//  Rev:                R35B
+//  Rev:                R36B
 //  Prodnr:             CNL 113 472
 //
 ///////////////////////////////////////////////////////////////////////////////