diff --git a/usrguide/java_referenceguide/12-mapping_ttcn3_data_types_to_java_constructs.adoc b/usrguide/java_referenceguide/12-mapping_ttcn3_data_types_to_java_constructs.adoc
index 0c76a70d05db7c698bf7b9f042d283b5960284dc..96b2bcd56ee5a085e773ca8366cdb1bacd65d114 100644
--- a/usrguide/java_referenceguide/12-mapping_ttcn3_data_types_to_java_constructs.adoc
+++ b/usrguide/java_referenceguide/12-mapping_ttcn3_data_types_to_java_constructs.adoc
@@ -838,7 +838,7 @@ The four components of the quadruple (that is, group, plane, row and cell) are s
 
 In case of single-octet characters, which can be also given in TTCN–3 charstring notation (between quotation marks), the fields `uc_group`, `uc_plane`, `uc_row` are set to zero. If tuple notation was used for an ASN.1 string value fields `uc_row` and `uc_cell` carry the tuple and the others are set to zero.
 
-Except when performing encoding or decoding, the run-time environment does not check whether the quadruples used in the following API represent valid character positions according to <<7-references.adoc#_8,[8]>>. Moreover, if ASN.1 multi-octet character string values are used, it is not verified whether the elements of such strings are permitted characters of the corresponding string type.
+Except when performing encoding or decoding, the run-time environment does not check whether the quadruples used in the following API represent valid character positions according to <<14-references.adoc#_8,[8]>>. Moreover, if ASN.1 multi-octet character string values are used, it is not verified whether the elements of such strings are permitted characters of the corresponding string type.
 
 The Java equivalent of TTCN–3 type `universal charstring` is implemented in class `TitanUniversalCharString`. The characters of the string are stored in an array of structure `TitanUniversalChar`. The array returned by the casting operator is not terminated with a special character, thus, the length of the string must be always considered when doing operations with the array. The length of the string, which can be obtained by using member function `lengthof()`, is measured in characters (quadruples) and not bytes.
 
diff --git a/usrguide/java_referenceguide/2-ttcn-3_limitations_in_this_version.adoc b/usrguide/java_referenceguide/2-ttcn-3_limitations_in_this_version.adoc
index 58113d0692f9e2567619b5c1c6a34af7126cf998..a12206f2b37ce5306a52a53b84ec9621b28fed02 100644
--- a/usrguide/java_referenceguide/2-ttcn-3_limitations_in_this_version.adoc
+++ b/usrguide/java_referenceguide/2-ttcn-3_limitations_in_this_version.adoc
@@ -1,15 +1,17 @@
 = TTCN-3 Limitations in this Version
 :toc:
 
-The present Test Executor is an implementation of TTCN–3 Core Language standard (<<13-references.adoc#_1, [1]>>) with support of ASN.1 (<<13-references.adoc#_3, [3]>>). However, the TTCN–3 language constructs detailed in <<13-references.adoc#_27, [27]>> are not supported in the current version of the Test Executor on both the C and the Java side.
+The present Test Executor is an implementation of TTCN–3 Core Language standard (<<14-references.adoc#_1, [1]>>) with support of ASN.1 (<<14-references.adoc#_3, [3]>>). However, the TTCN–3 language constructs detailed in <<14-references.adoc#_27, [27]>> are not supported in the current version of the Test Executor on both the C and the Java side.
 The following list extend that list, with the TTCN–3 language constructs that are not supported, in addition, in the current version of the Java side of the Test Executor.
 
-When applicable, the relevant clause of the standard text (<<13-references.adoc#_1, [1]>>) is given within parentheses after each limitation. The list of ASN.1 related limitations can be found in chapter *4.25*.
+When applicable, the relevant clause of the standard text (<<14-references.adoc#_1, [1]>>) is given within parentheses after each limitation. The list of ASN.1 related limitations can be found in chapter *4.25*.
 
-* The `update`, `interleave`, `label`, `goto` statements are not yet supported. (19.7, 19.8, 20.4 and 22.3.1 in <<13-references.adoc#_1, [1]>>)
+* The `update`, `interleave`, `label`, `goto` statements are not yet supported. (19.7, 19.8, 20.4 and 22.3.1 in <<14-references.adoc#_1, [1]>>)
 * The `hostId` predefined function is not yet supported.
 
 * Additionally the `start_profiler`, `stop_profiler`, `string2ttcn` TITAN extensions are also not yet supported on the Java side.
 * The `profilerrunning` TITAN extension is also not supported.
 * Concatenating template strings is not yet supported on the Java side.
 * Type compatibility is not yet supported on the Java side.footnote:[except record of/set of types for certain element types, see section 4.32.2]
+
+WARNING: The current version of the Java side of the Test Executor is just a prototype version. Please note that there might still be some changes in some of its APIs.
diff --git a/usrguide/java_referenceguide/3-ttcn3_language_extensions.adoc b/usrguide/java_referenceguide/3-ttcn3_language_extensions.adoc
index b20640c24d6aebf3a9e6efba5363cb4f8e6f51f3..0fb0fd2b0c214fd67dfb37c7e2210afb38430bb4 100644
--- a/usrguide/java_referenceguide/3-ttcn3_language_extensions.adoc
+++ b/usrguide/java_referenceguide/3-ttcn3_language_extensions.adoc
@@ -3,7 +3,7 @@
 :toc:
 :table-number: 3
 
-The Test Executor supports several non-standard additions to TTCN–3 Core Language, as detailed in <<13-references.adoc#_27, [27]>>, in order to improve its usability or provide backward compatibility with older versions.
+The Test Executor supports several non-standard additions to TTCN–3 Core Language, as detailed in <<14-references.adoc#_27, [27]>>, in order to improve its usability or provide backward compatibility with older versions.
 
 The following list contains the TTCN–3 language extensions that are not yet supported by the Java side of the Test Executor.
 The sections/feature not listed here are supported.
@@ -21,7 +21,7 @@ Parameterized macros are not supported on the Java side.
 
 == Implicit Message Encoding
 
-Compared to the description in section 3.22 of <<13-references.adoc#_27, [27]>> the Java side has 2 major differences:
+Compared to the description in section 3.22 of <<14-references.adoc#_27, [27]>> the Java side has 2 major differences:
 Only RAW encoding is supported for now.
 the syntax to be used in Java differs slightly from the of used in {cpp}
 
diff --git a/usrguide/java_referenceguide/4-supported_asn1_constructs_and_limitations.adoc b/usrguide/java_referenceguide/4-supported_asn1_constructs_and_limitations.adoc
index 5c8507cf8edd73e264de053032a34b845f921844..605132675decc367716fd735ffc04a799bfcb96f 100644
--- a/usrguide/java_referenceguide/4-supported_asn1_constructs_and_limitations.adoc
+++ b/usrguide/java_referenceguide/4-supported_asn1_constructs_and_limitations.adoc
@@ -3,7 +3,7 @@
 :toc:
 :table-number: 10
 
-The following list contains the ASN.1 features that are not supported on the Java side, above the limitations listed in <<13-references.adoc#_27, [27]>> for the C side:
+The following list contains the ASN.1 features that are not supported on the Java side, above the limitations listed in <<14-references.adoc#_27, [27]>> for the C side:
 
 * BER Encoding and Decoding are not supported.
 * subtypes are not checked.
diff --git a/usrguide/java_referenceguide/5-compiling_ttcn3_and_asn1_modules.adoc b/usrguide/java_referenceguide/5-compiling_ttcn3_and_asn1_modules.adoc
index e2ca5b2e02baeb55fc054109ee630347f79a3e1c..4d78500e0f0f8703972f5c3e84da35bc3414a9a6 100644
--- a/usrguide/java_referenceguide/5-compiling_ttcn3_and_asn1_modules.adoc
+++ b/usrguide/java_referenceguide/5-compiling_ttcn3_and_asn1_modules.adoc
@@ -35,7 +35,7 @@ WARNING: This option should only be used temporarily and only by people transfer
 
 * `Add source line info for logging  (-L)`
 +
-Instructs the compiler to add source file and line number information into the generated code to be included in the log during execution. This option is only a prerequisite for logging the source code information. The run-time configuration file parameters `OptionsSourceInfoFormat` and `LogEntityName` in <<7-the_run-time_configuration_file.adoc#logging, `[LOGGING]`>> have also to be set appropriately. This feature can be useful for finding the cause of dynamic test case errors in fresh TTCN3 code. Using this option enlarges the size of the generated code a bit and reduces execution speed slightly; therefore it is not recommended when the TTCN3 test suite is used for load generation.
+Instructs the compiler to add source file and line number information into the generated code to be included in the log during execution. This option is only a prerequisite for logging the source code information. The run-time configuration file parameters `OptionsSourceInfoFormat` and `LogEntityName` in <<6-the_run-time_configuration_file.adoc#logging, `[LOGGING]`>> have also to be set appropriately. This feature can be useful for finding the cause of dynamic test case errors in fresh TTCN3 code. Using this option enlarges the size of the generated code a bit and reduces execution speed slightly; therefore it is not recommended when the TTCN3 test suite is used for load generation.
 
 * `Allow 'omit' in template value lists (legacy behavior)  (-M)`
 +
@@ -81,7 +81,7 @@ The activities leading to the compilation of the project can be grouped to 3 set
 
 === The initial analysis
 
-First, the Designer reads the TTCN–3 and ASN.1 input files and performs syntax check according to the BNF of TTCN–3 <<13-references.adoc#_1, [1]>> (including the additions of <<13-references.adoc#_3, [3]>>) or ASN.1 <<13-references.adoc#_4, [4]>>, <<13-references.adoc#_7, [7]>>, <<13-references.adoc#_8, [8]>>, <<13-references.adoc#_9, [9]>>. The syntax errors are reported in the Problems view with the appropriate location information. Whenever it is possible, the Designer tries to recover from syntax errors and continue the analysis in order to detect further errors.
+First, the Designer reads the TTCN–3 and ASN.1 input files and performs syntax check according to the BNF of TTCN–3 <<14-references.adoc#_1, [1]>> (including the additions of <<14-references.adoc#_3, [3]>>) or ASN.1 <<14-references.adoc#_4, [4]>>, <<14-references.adoc#_7, [7]>>, <<14-references.adoc#_8, [8]>>, <<14-references.adoc#_9, [9]>>. The syntax errors are reported in the Problems view with the appropriate location information. Whenever it is possible, the Designer tries to recover from syntax errors and continue the analysis in order to detect further errors.
 
 NOTE: Error recovery is not always successful and it might result in additional undesired error messages when the parser gets out of synchronization. Therefore it is recommended to study the first lines on the compiler’s error listings because the error messages at the end are not always relevant.
 
diff --git a/usrguide/java_referenceguide/6-the_run-time_configuration_file.adoc b/usrguide/java_referenceguide/6-the_run-time_configuration_file.adoc
index abf41b6dde2d16242e5c3266e4fab33669c279f8..afcace24061a4c27e143ddd9292e2363aa9d1bff 100644
--- a/usrguide/java_referenceguide/6-the_run-time_configuration_file.adoc
+++ b/usrguide/java_referenceguide/6-the_run-time_configuration_file.adoc
@@ -2,7 +2,7 @@
 :toc:
 :table-number: 12
 
-In general the Java side supports the exact same configuration file format and options in the same way as the C side does, described in chapter 7 of <<13-references.adoc#_27, [27]>>.
+In general the Java side supports the exact same configuration file format and options in the same way as the C side does, described in chapter 7 of <<14-references.adoc#_27, [27]>>.
 There are some features, that are not yet supported on the Java side:
 
 * LoggerPlugins within the LOGGING section are not yet supported. The section is read correctly, but such plugins are not loaded during runtime.