diff --git a/scripts/addons_core/bl_pkg/bl_extension_ui.py b/scripts/addons_core/bl_pkg/bl_extension_ui.py
index 1f8e8b1c387..47571c1a532 100644
--- a/scripts/addons_core/bl_pkg/bl_extension_ui.py
+++ b/scripts/addons_core/bl_pkg/bl_extension_ui.py
@@ -1169,7 +1169,7 @@ def extension_draw_item(
 
     # Add a top-level row so `row_right` can have a grayed out button/label
     # without graying out the menu item since# that is functional.
-    row_right_toplevel = row.row()
+    row_right_toplevel = row.row(align=True)
     if operation_in_progress:
         row_right_toplevel.enabled = False
     row_right_toplevel.alignment = 'RIGHT'
@@ -1197,11 +1197,12 @@ def extension_draw_item(
 
         row_right.active = False
 
-    row_right = row_right_toplevel.row()
+    row_right = row_right_toplevel.row(align=True)
     row_right.alignment = 'RIGHT'
+    row_right.separator()
 
-    # NOTE: keep space between any buttons and this menu to prevent stray clicks accidentally running install.
-    # Currently there is enough space by default without an explicit separator.
+    # NOTE: Keep space between any buttons and this menu to prevent stray clicks accidentally running install.
+    # The separator is around together with the align to give some space while keeping the button and the menu still close-by.
     # Used `extension_path` so the menu can access "this" extension.
     row_right.context_string_set("extension_path", "{:s}.{:s}".format(repo_item.module, pkg_id))
     row_right.menu("USERPREF_MT_extensions_item", text="", icon='DOWNARROW_HLT')
diff --git a/scripts/modules/bpy_extras/extensions/junction_module.py b/scripts/modules/_bpy_internal/extensions/junction_module.py
similarity index 100%
rename from scripts/modules/bpy_extras/extensions/junction_module.py
rename to scripts/modules/_bpy_internal/extensions/junction_module.py
diff --git a/scripts/modules/addon_utils.py b/scripts/modules/addon_utils.py
index 69db5362995..860538e50d4 100644
--- a/scripts/modules/addon_utils.py
+++ b/scripts/modules/addon_utils.py
@@ -1174,7 +1174,7 @@ def _initialize_extensions_site_packages(*, create=False):
 
 
 def _initialize_extensions_repos_once():
-    from bpy_extras.extensions.junction_module import JunctionModuleHandle
+    from _bpy_internal.extensions.junction_module import JunctionModuleHandle
     module_handle = JunctionModuleHandle(_ext_base_pkg_idname)
     module_handle.register_module()
     _ext_global.module_handle = module_handle
diff --git a/scripts/modules/bl_i18n_utils/settings.py b/scripts/modules/bl_i18n_utils/settings.py
index 23e278a9aec..eb668688ceb 100644
--- a/scripts/modules/bl_i18n_utils/settings.py
+++ b/scripts/modules/bl_i18n_utils/settings.py
@@ -312,7 +312,7 @@ PYGETTEXT_KEYWORDS = (() +
     ((r"/\*name_display\*/\s*" + _msg_re + r"\s*,"),) +
 
     tuple((r"{}\(\s*" + _msg_re + r"\s*,\s*(?:" +
-           r"\s*,\s*)?(?:".join(_ctxt_re_gen(i) for i in range(PYGETTEXT_MAX_MULTI_CTXT)) + r")?\s*\)").format(it)
+           r"\s*,\s*)?(?:".join(_ctxt_re_gen(i) for i in range(PYGETTEXT_MAX_MULTI_CTXT)) + r")?\s*,?\s*\)").format(it)
           for it in ("BLT_I18N_MSGID_MULTI_CTXT",))
 )
 
diff --git a/source/blender/editors/interface/templates/interface_templates.cc b/source/blender/editors/interface/templates/interface_templates.cc
index 4b9e5250f6d..13857097022 100644
--- a/source/blender/editors/interface/templates/interface_templates.cc
+++ b/source/blender/editors/interface/templates/interface_templates.cc
@@ -1214,13 +1214,15 @@ static uiBut *template_id_def_new_but(uiBlock *block,
                             BLT_I18NCONTEXT_ID_LATTICE,
                             BLT_I18NCONTEXT_ID_LIGHT,
                             BLT_I18NCONTEXT_ID_LIGHTPROBE,
+                            BLT_I18NCONTEXT_ID_MASK,
                             BLT_I18NCONTEXT_ID_MATERIAL,
-                            BLT_I18NCONTEXT_ID_MASK, );
+                            BLT_I18NCONTEXT_ID_MESH, );
   BLT_I18N_MSGID_MULTI_CTXT("New",
-                            BLT_I18NCONTEXT_ID_MESH,
                             BLT_I18NCONTEXT_ID_METABALL,
                             BLT_I18NCONTEXT_ID_NODETREE,
                             BLT_I18NCONTEXT_ID_OBJECT,
+                            BLT_I18NCONTEXT_ID_PAINTCURVE,
+                            BLT_I18NCONTEXT_ID_PALETTE,
                             BLT_I18NCONTEXT_ID_PARTICLESETTINGS,
                             BLT_I18NCONTEXT_ID_POINTCLOUD,
                             BLT_I18NCONTEXT_ID_SCENE,
@@ -1232,7 +1234,6 @@ static uiBut *template_id_def_new_but(uiBlock *block,
                             BLT_I18NCONTEXT_ID_VOLUME,
                             BLT_I18NCONTEXT_ID_WORKSPACE,
                             BLT_I18NCONTEXT_ID_WORLD, );
-  BLT_I18N_MSGID_MULTI_CTXT("New", BLT_I18NCONTEXT_ID_PAINTCURVE, BLT_I18NCONTEXT_ID_PALETTE, );
   /* NOTE: BLT_I18N_MSGID_MULTI_CTXT takes a maximum number of parameters,
    * check the definition to see if a new call must be added when the limit
    * is exceeded. */