diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index a9adb353d9..74e21edcc5 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -90,6 +90,11 @@ This can be reduced by using a file instead of including the script in the test
 Variables and functions do not work in Listeners in client-server (remote) mode so they cannot be used
 to name log files in client-server mode.
 </p>
+<p>
+CSV Dataset variables are defined after configuration processing is completed,
+so they cannot be used for other configuration items such as JDBC Config.
+(see <a href="http://issues.apache.org/bugzilla/show_bug.cgi?id=40934">Bug 40394 </a>)
+</p>
 
 <h4>Summary of changes (for more details, see below)</h4>
 <p>
diff --git a/xdocs/usermanual/component_reference.xml b/xdocs/usermanual/component_reference.xml
index 3b8883582d..b40ac652bd 100644
--- a/xdocs/usermanual/component_reference.xml
+++ b/xdocs/usermanual/component_reference.xml
@@ -1958,6 +1958,8 @@ the Report.
 	The file is only opened once, and each thread will use a different line from the file. 
 	Lines are read as the threads need them.
 	</p>
+	<note>CSV Dataset variables are defined after configuration processing is completed,
+	so they cannot be used for other configuration items such as JDBC Config (see <a href="http://issues.apache.org/bugzilla/show_bug.cgi?id=40934">Bug 40394 </a>)</note>
 	<p>
 	As a special case, the string "\t" (without quotes) is treated as a Tab.
 	</p>