Merge remote-tracking branch 'origin/patch/8.6.1' into develop, manually

resolving conflicts.

src/Infrastructure/Config/doc/Config_usage.tex

@@ -3,11 +3,11 @@
  \subsubsection{Resource files}
 
    A {\em Resource File (RF)} is a text file consisting of list of 
-   {\em label}-{\em value} pairs. There is a limit of 1024 characters 
-   per line and the Resource File can contain a maximum of 200 records. 
-   Each {\em label} should be followed by some data, the {\em value}. 
-   An example Resource File follows.  It is the file used in the example 
-   below. 
+   {\em label}-{\em value} pairs. There is a buffer limit of 256,000 
+   characters for the entire Resource File. Each {\em label} is limited 
+   to 1,000 characters. Each label should be followed by some data, the 
+   {\em value}. An example Resource File follows. It is the file used 
+   in the example below. 
 
  \begin{verbatim}
  # This is an example Resource File.