diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/editor.js b/packages/node_modules/@node-red/editor-client/src/js/ui/editor.js
index 1de42a69a..70963e389 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/editor.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/editor.js
@@ -1017,6 +1017,7 @@ RED.editor = (function() {
 
     function showEditDialog(node, defaultTab) {
         if (buildingEditDialog) { return }
+        if (editStack.includes(node)) { return }
         buildingEditDialog = true;
         if (node.z && RED.workspaces.isLocked(node.z)) { return }
         var editing_node = node;
@@ -1334,6 +1335,7 @@ RED.editor = (function() {
         var editing_config_node = RED.nodes.node(id);
         var activeEditPanes = [];
 
+        if (editStack.includes(editing_config_node)) { return }
         if (editing_config_node && editing_config_node.z && RED.workspaces.isLocked(editing_config_node.z)) { return }
 
         var configNodeScope = ""; // default to global
@@ -1777,6 +1779,7 @@ RED.editor = (function() {
 
     function showEditSubflowDialog(subflow, defaultTab) {
         if (buildingEditDialog) { return }
+        if (editStack.includes(subflow)) { return }
         buildingEditDialog = true;
 
         editStack.push(subflow);
@@ -1993,6 +1996,7 @@ RED.editor = (function() {
 
     function showEditGroupDialog(group, defaultTab) {
         if (buildingEditDialog) { return }
+        if (editStack.includes(group)) { return }
         buildingEditDialog = true;
         if (group.z && RED.workspaces.isLocked(group.z)) { return }
         var editing_node = group;
@@ -2107,6 +2111,7 @@ RED.editor = (function() {
 
     function showEditFlowDialog(workspace, defaultTab) {
         if (buildingEditDialog) { return }
+        if (editStack.includes(workspace)) { return }
         buildingEditDialog = true;
         var activeEditPanes = [];
         RED.view.state(RED.state.EDITING);
diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/editors/mermaid.js b/packages/node_modules/@node-red/editor-client/src/js/ui/editors/mermaid.js
index b4ae5d52d..6de2a1d1e 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/editors/mermaid.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/editors/mermaid.js
@@ -44,7 +44,7 @@ RED.editor.mermaid = (function () {
 
             nodes.forEach(async node => {
                 if (!node.getAttribute('mermaid-processed')) {
-                    const mermaidContent = node.innerText
+                    const mermaidContent = atob($(node).data('c64'))
                     node.setAttribute('mermaid-processed', true)
                     try {
                         const { svg } = await mermaid.render('mermaid-render-'+Date.now()+'-'+(diagramIds++), mermaidContent);
diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/utils.js b/packages/node_modules/@node-red/editor-client/src/js/ui/utils.js
index 997b8f581..667fdbfbc 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/utils.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/utils.js
@@ -101,7 +101,7 @@ RED.utils = (function() {
 
     renderer.code = function (code, lang) {
         if(lang === "mermaid") {
-            return `<pre class='mermaid'>${code}</pre>`;
+            return `<pre style='word-break: unset;' data-c64='${btoa(code)}' class='mermaid'>${code}</pre>`;
         } else {
             return "<pre><code>" +code +"</code></pre>";
         }
diff --git a/packages/node_modules/@node-red/nodes/locales/ja/network/10-mqtt.html b/packages/node_modules/@node-red/nodes/locales/ja/network/10-mqtt.html
index 435829e1e..bd6fd7839 100644
--- a/packages/node_modules/@node-red/nodes/locales/ja/network/10-mqtt.html
+++ b/packages/node_modules/@node-red/nodes/locales/ja/network/10-mqtt.html
@@ -47,7 +47,7 @@
     <p>これらは、動的購読が設定されている場合のみ適用されます。</p>
     <dl class="message-properties">
        <dt>action <span class="property-type">文字列</span></dt>
-       <dd>本ノードが行う動作の名前。利用可能な動作は<code>"connect"</code>、<code>"disconnect"</code>、<code>"subscribe"</code>、<code>"unsubscribe"</code>です。</dd>
+       <dd>本ノードが行う動作の名前。利用可能な動作は<code>"connect"</code>、<code>"disconnect"</code>、<code>"getSubscriptions"</code>、<code>"subscribe"</code>、<code>"unsubscribe"</code>です。</dd>
        <dt class="optional">topic <span class="property-type">文字列|オブジェクト|配列</span></dt>
        <dd><code>"subscribe"</code>と<code>"unsubscribe"</code>の動作に対して、本プロパティはトピックを提供します。次のいずれかを設定できます:<ul>
            <li>トピックフィルターを含む文字列</li>
@@ -105,7 +105,7 @@
     <h3>入力</h3>
     <dl class="message-properties">
        <dt>action <span class="property-type">文字列</span></dt>
-       <dd>本ノードが行う動作の名前。利用可能な動作は<code>"connect"</code>、<code>"disconnect"</code>、<code>"subscribe"</code>、<code>"unsubscribe"</code>です。</dd>
+       <dd>本ノードが行う動作の名前。利用可能な動作は<code>"connect"</code>と<code>"disconnect"</code>です。</dd>
        <dt class="optional">broker <span class="property-type">broker</span> </dt>
        <dd><code>"connect"</code>の動作に対して、本プロパティは次の様な個々のブローカ設定を上書きします: <ul>
            <li><code>broker</code></li>