diff --git a/doc/classes/Array.xml b/doc/classes/Array.xml
index e8cf7f674f6..02e98af4cc5 100644
--- a/doc/classes/Array.xml
+++ b/doc/classes/Array.xml
@@ -97,8 +97,6 @@
 			</description>
 		</method>
 		<method name="append_array">
-			<return type="void">
-			</return>
 			<argument index="0" name="array" type="Array">
 			</argument>
 			<description>
diff --git a/doc/classes/ProjectSettings.xml b/doc/classes/ProjectSettings.xml
index 5e5a25a2fe2..af935b1d61b 100644
--- a/doc/classes/ProjectSettings.xml
+++ b/doc/classes/ProjectSettings.xml
@@ -835,6 +835,8 @@
 		<member name="logging/file_logging/max_log_files" type="int" setter="" getter="" default="5">
 			Specifies the maximum amount of log files allowed (used for rotation).
 		</member>
+		<member name="memory/limits/command_queue/multithreading_queue_size_kb" type="int" setter="" getter="" default="256">
+		</member>
 		<member name="memory/limits/message_queue/max_size_kb" type="int" setter="" getter="" default="4096">
 			Godot uses a message queue to defer some function calls. If you run out of space on it (you will see an error), you can increase the size here.
 		</member>
@@ -1074,6 +1076,14 @@
 		<member name="rendering/limits/time/time_rollover_secs" type="float" setter="" getter="" default="3600">
 			Shaders have a time variable that constantly increases. At some point, it needs to be rolled back to zero to avoid precision errors on shader animations. This setting specifies when (in seconds).
 		</member>
+		<member name="rendering/options/api_usage_batching/flag_stream" type="bool" setter="" getter="" default="false">
+		</member>
+		<member name="rendering/options/api_usage_batching/send_null" type="bool" setter="" getter="" default="true">
+		</member>
+		<member name="rendering/options/api_usage_legacy/flag_stream" type="bool" setter="" getter="" default="false">
+		</member>
+		<member name="rendering/options/api_usage_legacy/orphan_buffers" type="bool" setter="" getter="" default="true">
+		</member>
 		<member name="rendering/quality/2d/ninepatch_mode" type="int" setter="" getter="" default="0">
 			Choose between default mode where corner scalings are preserved matching the artwork, and scaling mode.
 			Not available in GLES3 when [member rendering/batching/options/use_batching] is off.
diff --git a/modules/fbx/config.py b/modules/fbx/config.py
index 53b8f2f2e36..78929800b35 100644
--- a/modules/fbx/config.py
+++ b/modules/fbx/config.py
@@ -4,3 +4,13 @@ def can_build(env, platform):
 
 def configure(env):
     pass
+
+
+def get_doc_classes():
+    return [
+        "EditorSceneImporterFBX",
+    ]
+
+
+def get_doc_path():
+    return "doc_classes"
diff --git a/doc/classes/EditorSceneImporterAssimp.xml b/modules/fbx/doc_classes/EditorSceneImporterFBX.xml
similarity index 71%
rename from doc/classes/EditorSceneImporterAssimp.xml
rename to modules/fbx/doc_classes/EditorSceneImporterFBX.xml
index 27915ba910f..72b6e0f5fd0 100644
--- a/doc/classes/EditorSceneImporterAssimp.xml
+++ b/modules/fbx/doc_classes/EditorSceneImporterFBX.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="EditorSceneImporterAssimp" inherits="EditorSceneImporter" version="3.2">
+<class name="EditorSceneImporterFBX" inherits="EditorSceneImporter" version="3.2">
 	<brief_description>
-		FBX 3D asset importer based on [url=http://assimp.org/]Assimp[/url].
+		FBX 3D asset importer.
 	</brief_description>
 	<description>
-		This is an FBX 3D asset importer based on [url=http://assimp.org/]Assimp[/url]. It currently has many known limitations and works best with static meshes. Most animated meshes won't import correctly.
+		This is an FBX 3D asset importer with full support for most FBX features.
 		If exporting a FBX scene from Autodesk Maya, use these FBX export settings:
 		[codeblock]
 		- Smoothing Groups