diff --git a/changelogs/fragments/44811-xml-insertbefore-and-insertafter-parameters.yaml b/changelogs/fragments/44811-xml-insertbefore-and-insertafter-parameters.yaml
new file mode 100644
index 00000000000..67ef76725b8
--- /dev/null
+++ b/changelogs/fragments/44811-xml-insertbefore-and-insertafter-parameters.yaml
@@ -0,0 +1,2 @@
+minor_changes:
+  - xml - Introduce ``insertbefore`` and ``insertafter`` to specify the position (https://github.com/ansible/ansible/pull/44811)
diff --git a/docs/docsite/_themes/sphinx_rtd_theme/theme.conf b/docs/docsite/_themes/sphinx_rtd_theme/theme.conf
index 16ad38fe8df..567468a0128 100644
--- a/docs/docsite/_themes/sphinx_rtd_theme/theme.conf
+++ b/docs/docsite/_themes/sphinx_rtd_theme/theme.conf
@@ -10,7 +10,7 @@ collapse_navigation = False
 sticky_navigation = True
 navigation_depth = 4
 includehidden = True
-titles_only = 
+titles_only =
 logo_only =
 display_version = True
 prev_next_buttons_location = bottom
diff --git a/docs/docsite/rst/conf.py b/docs/docsite/rst/conf.py
index 8dfe316f679..edad4acd120 100644
--- a/docs/docsite/rst/conf.py
+++ b/docs/docsite/rst/conf.py
@@ -135,6 +135,7 @@ html_short_title = 'Ansible Documentation'
 
 html_theme_options = {
     'canonical_url': "https://docs.ansible.com/ansible/latest/",
+    'collapse_navigation': "True"
 }
 
 # The style sheet to use for HTML and HTML Help pages. A file of that name
diff --git a/docs/docsite/rst/dev_guide/developing_modules_general.rst b/docs/docsite/rst/dev_guide/developing_modules_general.rst
index 42725b6609f..ce461d58c99 100644
--- a/docs/docsite/rst/dev_guide/developing_modules_general.rst
+++ b/docs/docsite/rst/dev_guide/developing_modules_general.rst
@@ -307,5 +307,5 @@ use the ``#ansible`` channel.
 Credit
 ======
 
-Thank you to Thomas Stringer (`@tstringer <https://github.com/tstringer>`_) for contributing source
+Thank you to Thomas Stringer (`@trstringer <https://github.com/trstringer>`_) for contributing source
 material for this topic.
diff --git a/docs/templates/plugin.rst.j2 b/docs/templates/plugin.rst.j2
index 7cff52726f0..9166e622267 100644
--- a/docs/templates/plugin.rst.j2
+++ b/docs/templates/plugin.rst.j2
@@ -155,7 +155,7 @@ Parameters
                     {% endif %}
                     {# Show default value, when multiple choice or no choices #}
                     {% if value.default is defined and value.default not in value.choices %}
-                        <b>Default:</b><br/><div style="color: blue">@{ value.default | escape }@</div>
+                        <b>Default:</b><br/><div style="color: blue">@{ value.default | tojson | escape }@</div>
                     {% endif %}
                 </td>
                 {# configuration #}
diff --git a/lib/ansible/modules/cloud/azure/azure_rm_functionapp.py b/lib/ansible/modules/cloud/azure/azure_rm_functionapp.py
index 3e0f39bc15a..fe4fb6a2bac 100644
--- a/lib/ansible/modules/cloud/azure/azure_rm_functionapp.py
+++ b/lib/ansible/modules/cloud/azure/azure_rm_functionapp.py
@@ -81,7 +81,7 @@ extends_documentation_fragment:
     - azure_tags
 
 author:
-    - "Thomas Stringer (@tstringer)"
+    - "Thomas Stringer (@trstringer)"
 '''
 
 EXAMPLES = '''
diff --git a/lib/ansible/modules/cloud/azure/azure_rm_functionapp_facts.py b/lib/ansible/modules/cloud/azure/azure_rm_functionapp_facts.py
index fee2f80c19f..91df7de7a6d 100644
--- a/lib/ansible/modules/cloud/azure/azure_rm_functionapp_facts.py
+++ b/lib/ansible/modules/cloud/azure/azure_rm_functionapp_facts.py
@@ -37,7 +37,7 @@ extends_documentation_fragment:
     - azure
 
 author:
-    - "Thomas Stringer (@tstringer)"
+    - "Thomas Stringer (@trstringer)"
 '''
 
 EXAMPLES = '''
diff --git a/lib/ansible/modules/cloud/azure/azure_rm_loadbalancer.py b/lib/ansible/modules/cloud/azure/azure_rm_loadbalancer.py
index 2289258b794..3e15607d825 100644
--- a/lib/ansible/modules/cloud/azure/azure_rm_loadbalancer.py
+++ b/lib/ansible/modules/cloud/azure/azure_rm_loadbalancer.py
@@ -332,7 +332,7 @@ extends_documentation_fragment:
     - azure_tags
 
 author:
-    - "Thomas Stringer (@tstringer)"
+    - "Thomas Stringer (@trstringer)"
     - "Yuwei Zhou (@yuwzho)"
 '''
 
diff --git a/lib/ansible/modules/cloud/azure/azure_rm_loadbalancer_facts.py b/lib/ansible/modules/cloud/azure/azure_rm_loadbalancer_facts.py
index 5a9b5640a1d..4202a186c46 100644
--- a/lib/ansible/modules/cloud/azure/azure_rm_loadbalancer_facts.py
+++ b/lib/ansible/modules/cloud/azure/azure_rm_loadbalancer_facts.py
@@ -39,7 +39,7 @@ extends_documentation_fragment:
     - azure
 
 author:
-    - "Thomas Stringer (@tstringer)"
+    - "Thomas Stringer (@trstringer)"
 '''
 
 EXAMPLES = '''