diff --git a/.api-version b/.api-version
index 94204632b7..9fdf3baef9 100644
--- a/.api-version
+++ b/.api-version
@@ -1 +1 @@
-7.7.2
\ No newline at end of file
+7.8.0
\ No newline at end of file
diff --git a/antora.yml b/antora.yml
index fbfa6a6e49..74ed1f2175 100644
--- a/antora.yml
+++ b/antora.yml
@@ -26,7 +26,7 @@ asciidoc:
     # product variables
     productname: TinyMCE
     productmajorversion: 7
-    productminorversion: '7.7'
+    productminorversion: '7.8'
     ##### product name in codeblock
     prodnamecode: tinymce
     #### more names
diff --git a/modules/ROOT/examples/live-demos/comments-callback-with-mentions/index.html b/modules/ROOT/examples/live-demos/comments-callback-with-mentions/index.html
index fb90bbd07a..5e0878b4c0 100644
--- a/modules/ROOT/examples/live-demos/comments-callback-with-mentions/index.html
+++ b/modules/ROOT/examples/live-demos/comments-callback-with-mentions/index.html
@@ -1,4 +1,4 @@
-<textarea id="comments-callback">
+<textarea id="comments-callback-with-mentions">
 <h2>Welcome to Tiny Comments!</h2>
 <p>Please try out this demo of our Tiny Comments premium plugin with @mentions support.</p>
 <ol>
diff --git a/modules/ROOT/examples/live-demos/comments-callback-with-mentions/index.js b/modules/ROOT/examples/live-demos/comments-callback-with-mentions/index.js
index d59ba9e27c..bb74433204 100644
--- a/modules/ROOT/examples/live-demos/comments-callback-with-mentions/index.js
+++ b/modules/ROOT/examples/live-demos/comments-callback-with-mentions/index.js
@@ -1,18 +1,46 @@
 import ('https://cdn.jsdelivr.net/npm/@faker-js/faker@9/dist/index.min.js').then(({ faker }) => {
-  const adminUser = {
-    id: 'johnsmith',
-    name: 'John Smith',
-    fullName: 'John Smith',
-    description: 'Company Founder',
-    image: "https://i.pravatar.cc/150?img=11"
+  const userDb = {
+    'michaelcook': {
+      id: 'michaelcook',
+      name: 'Michael Cook',
+      fullName: 'Michael Cook',
+      description: 'Product Owner',
+      image: "{{imagesdir}}/avatars/michaelcook.png"
+    },
+    'kalebwilson': {
+      id: 'kalebwilson',
+      name: 'Kaleb Wilson',
+      fullName: 'Kaleb Wilson',
+      description: 'Marketing Director',
+      image: "{{imagesdir}}/avatars/kalebwilson.png"
+    }
   };
-
-  const currentUser = {
-    id: 'jennynichols',
-    name: 'Jenny Nichols',
-    fullName: 'Jenny Nichols',
-    description: 'Marketing Director',
-    image: "https://i.pravatar.cc/150?img=10"
+  
+  const currentUid = 'kalebwilson';
+  const adminUid = 'michaelcook';
+  
+  const currentUser = userDb[currentUid];
+  const adminUser = userDb[adminUid];
+  
+  const now = new Date();
+  const yesterday = new Date(now.getTime() - 24 * 60 * 60 * 1000).toISOString();
+  const anhourago = new Date(now.getTime() - 60 * 60 * 1000).toISOString();
+  
+  const fillAuthorInfo = (id, fullName, image) => ({
+    author: id,
+    authorName: fullName,
+    authorAvatar: image,
+  });
+  
+  const getAuthorInfo = (uid) => {
+    const user = userDb[uid];
+    if (user) {
+      return fillAuthorInfo(user.id, user.fullName, user.image);
+    }
+    return {
+      author: uid,
+      authorName: uid,
+    };
   };
   
   const conversationDb = {
@@ -20,33 +48,26 @@ import ('https://cdn.jsdelivr.net/npm/@faker-js/faker@9/dist/index.min.js').then
       uid: 'mce-conversation_19679600221621399703915',
       comments: [{
         uid: 'mce-conversation_19679600221621399703915',
-        author: currentUser.id,
-        authorName: currentUser.fullName,
-        authorAvatar: currentUser.image,
-        content: `What do you think about this @${adminUser.id}?`,
-        createdAt: '2021-05-19T04:48:23.914Z',
-        modifiedAt: '2021-05-19T04:48:23.914Z'
-      },
-      {
+        ...getAuthorInfo(currentUid),
+        content: `What do you think about this? @${adminUser.id}?`,
+        createdAt: yesterday,
+        modifiedAt: yesterday
+      }, {
         uid: 'mce-conversation_19679600221621399703917',
-        author: adminUser.id,
-        authorName: adminUser.fullName,
-        authorAvatar: adminUser.image,
+        ...getAuthorInfo(adminUid),
         content: `I think this is a great idea @${currentUser.id}!`,
-        createdAt: "2024-05-28T12:54:24.126Z",
-        modifiedAt: "2024-05-28T12:54:24.126Z",
+        createdAt: anhourago,
+        modifiedAt: anhourago,
       }]
     },
     'mce-conversation_420304606321716900864126': {
       uid: 'mce-conversation_420304606321716900864126',
       comments: [{
         uid: 'mce-conversation_420304606321716900864126',
-        author: adminUser.id,
-        authorName: adminUser.fullName,
-        authorAvatar: adminUser.image,
+        ...getAuthorInfo(adminUid),
         content: `@${currentUser.id} Please revise this sentence, exclamation points are unprofessional!`,
-        createdAt: '2024-05-28T12:54:24.126Z',
-        modifiedAt: '2024-05-28T12:54:24.126Z'
+        createdAt: yesterday,
+        modifiedAt: anhourago
       }]
     }
   };
@@ -122,6 +143,10 @@ import ('https://cdn.jsdelivr.net/npm/@faker-js/faker@9/dist/index.min.js').then
 
   const fakeServer = setupFakeServer();
   
+  /********************************
+   *   Mentions functions    *
+   ********************************/
+  
   const mentions_fetch = (query, success) => {
     if (!fetchedUsers) {
       fetchedUsers = true;
@@ -162,6 +187,11 @@ import ('https://cdn.jsdelivr.net/npm/@faker-js/faker@9/dist/index.min.js').then
     }
   };
   
+  /********************************
+   *   Tiny Comments functions    *
+   * (must call "done" or "fail") *
+   ********************************/
+
   const tinycomments_create = (req, done, fail) => {
     if (req.content === 'fail') {
       fail(new Error('Something has gone wrong...'));
@@ -170,131 +200,132 @@ import ('https://cdn.jsdelivr.net/npm/@faker-js/faker@9/dist/index.min.js').then
       conversationDb[uid] = {
         uid,
         comments: [{
-        uid,
-        authorName: currentUser.fullName,
-        authorAvatar: currentUser.image,
-        author: currentUser.name,
-        content: req.content,
-        createdAt: req.createdAt,
-        modifiedAt: req.createdAt
+          uid,
+          ...getAuthorInfo(currentUid),
+          content: req.content,
+          createdAt: req.createdAt,
+          modifiedAt: req.createdAt
         }]
       };
-    
-      setTimeout(() => {
-        done({
-        conversationUid: uid
-        });
-      }, fakeDelay);
+      setTimeout(() => done({ conversationUid: uid }), fakeDelay);
     }
   };
-  
+
   const tinycomments_reply = (req, done) => {
     const replyUid = 'annotation-' + randomString();
-    const current = conversationDb[req.conversationUid];
-    current.comments.push(
-      {
-        uid: replyUid,
-        authorName: currentUser.fullName,
-        authorAvatar: currentUser.image,
-        author: currentUser.name,
-        content: req.content,
-        createdAt: req.createdAt,
-        modifiedAt: req.createdAt
-      }
-    );
-  
-    setTimeout(() => {
-      done({
-        commentUid: replyUid
-      });
-    }, fakeDelay);
+    conversationDb[req.conversationUid].comments.push({
+      uid: replyUid,
+      ...getAuthorInfo(currentUid),
+      content: req.content,
+      createdAt: req.createdAt,
+      modifiedAt: req.createdAt
+    });
+    setTimeout(() => done({ commentUid: replyUid }), fakeDelay);
   };
-  
+
   const tinycomments_delete = (req, done) => {
-    delete conversationDb[req.conversationUid];
-  
-    setTimeout(() => {
-      done({
-        canDelete: true
-      });
-    }, fakeDelay);
+    if (currentUid === adminUid) { // Replace wth your own logic, e.g. check if user created the conversation
+      delete conversationDb[req.conversationUid];
+      setTimeout(() => done({ canDelete: true }), fakeDelay);
+    } else {
+      setTimeout(() => done({ canDelete: false, reason: 'Must be admin user' }), fakeDelay);
+    }
   };
-  
+
   const tinycomments_resolve = (req, done) => {
-    resolvedConversationDb[req.conversationUid] = conversationDb[req.conversationUid];
-    delete conversationDb[req.conversationUid];
-  
-    setTimeout(() => {
-      done({
-        canResolve: true
-      });
-    }, fakeDelay);
+    const conversation = conversationDb[req.conversationUid];
+    if (currentUid === conversation.comments[0].author) { // Replace wth your own logic, e.g. check if user has admin priveleges
+      delete conversationDb[req.conversationUid];
+      setTimeout(() => done({ canResolve: true }), fakeDelay);
+    } else {
+      setTimeout(() => done({ canResolve: false, reason: 'Must be conversation author' }), fakeDelay);
+    }
   };
-  
+
   const tinycomments_delete_comment = (req, done) => {
-    const current = conversationDb[req.conversationUid];
-    // Should be supported on browsers ...
-    current.comments = current.comments.filter((f) => {
-      return f.uid !== req.commentUid;
+    const oldcomments = conversationDb[req.conversationUid].comments;
+    let reason = 'Comment not found';
+
+    const newcomments = oldcomments.filter((comment) => {
+      if (comment.uid === req.commentUid) { // Found the comment to delete
+        if (currentUid === comment.author) { // Replace with your own logic, e.g. check if user has admin privileges
+          return false; // Remove the comment
+        } else {
+          reason = 'Not authorised to delete this comment'; // Update reason
+        }
+      }
+      return true; // Keep the comment
     });
-  
-    setTimeout(() => {
-      done({
-        canDelete: true
-      });
-    }, fakeDelay);
+    if (newcomments.length === oldcomments.length) {
+      setTimeout(() => done({ canDelete: false, reason }), fakeDelay);
+    } else {
+      conversationDb[req.conversationUid].comments = newcomments;
+      setTimeout(() => done({ canDelete: true }), fakeDelay);
+    }
   };
-  
+
   const tinycomments_edit_comment = (req, done) => {
-    const current = conversationDb[req.conversationUid];
-    // Should be supported on browsers ...
-    current.comments = current.comments.map((f) => {
-    return f.uid === req.commentUid ? {
-        ...f,
-        content: req.content,
-        modifiedAt: new Date().toISOString()
-      } : f;
+    const oldcomments = conversationDb[req.conversationUid].comments;
+    let reason = 'Comment not found';
+    let canEdit = false;
+
+    const newcomments = oldcomments.map((comment) => {
+      if (comment.uid === req.commentUid) { // Found the comment to delete
+        if (currentUid === comment.author) { // Replace with your own logic, e.g. check if user has admin privileges
+          canEdit = true; // User can edit the comment
+          return { ...comment, content: req.content, modifiedAt: new Date().toISOString() }; // Update the comment
+        } else {
+          reason = 'Not authorised to edit this comment'; // Update reason
+        }
+      }
+      return comment; // Keep the comment
     });
-  
-    setTimeout(() => {
-      done({
-        canEdit: true
-      });
-    }, fakeDelay);
+
+    if (canEdit) {
+      conversationDb[req.conversationUid].comments = newcomments;
+      setTimeout(() => done({ canEdit }), fakeDelay);
+    } else {
+      setTimeout(() => done({ canEdit, reason }), fakeDelay);
+    }
   };
-  
+
   const tinycomments_delete_all = (req, done) => {
-    Object.keys(conversationDb).forEach((k) => {
-      delete conversationDb[k];
-    });
-  
-    setTimeout(() => {
-      done({
-        canDelete: true
-      });
-    }, fakeDelay);
+    const conversation = conversationDb[req.conversationUid];
+    if (currentUid === conversation.comments[0].author) { // Replace wth your own logic, e.g. check if user has admin priveleges
+      delete conversationDb[req.conversationUid];
+      setTimeout(() => done({ canDelete: true }), fakeDelay);
+    } else {
+      setTimeout(() => done({ canDelete: false, reason: 'Must be conversation author' }), fakeDelay);
+    }
   };
-  
+
   const tinycomments_lookup = (req, done) => {
     setTimeout(() => {
       done({
         conversation: {
-        uid: conversationDb[req.conversationUid].uid,
-        comments: conversationDb[req.conversationUid].comments.slice(0)
+          uid: conversationDb[req.conversationUid].uid,
+          comments: [...conversationDb[req.conversationUid].comments]
         }
       });
     }, fakeDelay);
   };
-  
-  const tinycomments_fetch = (_, done) => {
-    setTimeout(() => done({
-      conversations: conversationDb
-    }), fakeDelay);
+
+  const tinycomments_fetch = (conversationUids, done) => {
+    const fetchedConversations = {};
+    conversationUids.forEach((uid) => {
+      const conversation = conversationDb[uid];
+      if (conversation) {
+        fetchedConversations[uid] = {...conversation};
+      }
+    });
+    setTimeout(() => done({ conversations: fetchedConversations }), fakeDelay);
   };
-  
+
+  // Read the above `getAuthorInfo` function to see how this could be implemented
+  const tinycomments_fetch_author_info = (done) => done(getAuthorInfo(currentUid));
   
   tinymce.init({
-    selector: 'textarea#comments-callback',
+    selector: 'textarea#comments-callback-with-mentions',
     license_key: 'gpl',
     toolbar: 'addcomment showcomments code | bold italic underline',
     menubar: 'file edit view insert format tools tc help',
@@ -331,5 +362,6 @@ import ('https://cdn.jsdelivr.net/npm/@faker-js/faker@9/dist/index.min.js').then
     tinycomments_delete_comment,
     tinycomments_edit_comment,
     tinycomments_fetch,
+    tinycomments_fetch_author_info
   });
 });
diff --git a/modules/ROOT/examples/live-demos/comments-callback/example.js b/modules/ROOT/examples/live-demos/comments-callback/example.js
deleted file mode 100644
index 1d944e99ee..0000000000
--- a/modules/ROOT/examples/live-demos/comments-callback/example.js
+++ /dev/null
@@ -1,235 +0,0 @@
-/********************************
- *   Tiny Comments functions    *
- * (must call "done" or "fail") *
- ********************************/
-
-const tinycomments_create = (req, done, fail) => {
-  const { content, createdAt } = req;
-
-  fetch('https://api.example/conversations/', {
-    method: 'POST',
-    body: JSON.stringify({ content: content, createdAt: createdAt }),
-    headers: {
-      'Accept': 'application/json',
-      'Content-Type': 'application/json',
-    },
-  })
-    .then((response) => {
-      if (!response.ok) {
-        throw new Error('Failed to create comment');
-      }
-      return response.json();
-    })
-    .then((req2) => {
-      const conversationUid = req2.conversationUid;
-      done({ conversationUid });
-    })
-    .catch((e) => {
-      fail(e);
-    });
-};
-
-const tinycomments_reply = (req, done, fail) => {
-  const { conversationUid, content, createdAt } = req;
-
-  fetch('https://api.example/conversations/' + conversationUid, {
-    method: 'POST',
-    body: JSON.stringify({ content: content, createdAt: createdAt }),
-    headers: {
-      'Accept': 'application/json',
-      'Content-Type': 'application/json',
-    },
-  })
-    .then((response) => {
-      if (!response.ok) {
-        throw new Error('Failed to reply to comment');
-      }
-      return response.json();
-    })
-    .then((req2) => {
-      const commentUid = req2.commentUid;
-      done({
-        commentUid: replyUid,
-        author: currentUser.id,
-        authorName: currentUser.fullName
-      });
-    })
-    .catch((e) => {
-      fail(e);
-    });
-};
-
-const tinycomments_edit_comment = (req, done, fail) => {
-  const { conversationUid, commentUid, content, modifiedAt } = req;
-
-  fetch(
-    'https://api.example/conversations/' + conversationUid + '/' + commentUid,
-    {
-      method: 'PUT',
-      body: JSON.stringify({ content: content, modifiedAt: modifiedAt }),
-      headers: {
-        'Accept': 'application/json',
-        'Content-Type': 'application/json',
-      },
-    }
-  )
-    .then((response) => {
-      if (!response.ok) {
-        throw new Error('Failed to edit comment');
-      }
-      return response.json();
-    })
-    .then((req2) => {
-      const canEdit = req2.canEdit;
-      done({ canEdit });
-    })
-    .catch((e) => {
-      fail(e);
-    });
-};
-
-const tinycomments_delete = (req, done, fail) => {
-  const conversationUid = req.conversationUid;
-  fetch('https://api.example/conversations/' + conversationUid, {
-    method: 'DELETE',
-  }).then((response) => {
-    if (response.ok) {
-      done({ canDelete: true });
-    } else if (response.status === 403) {
-      done({ canDelete: false });
-    } else {
-      fail(new Error('Something has gone wrong...'));
-    }
-  });
-};
-
-const tinycomments_delete_all = (_req, done, fail) => {
-  fetch('https://api.example/conversations', {
-    method: 'DELETE',
-  }).then((response) => {
-    if (response.ok) {
-      done({ canDelete: true });
-    } else if (response.status === 403) {
-      done({ canDelete: false });
-    } else {
-      fail(new Error('Something has gone wrong...'));
-    }
-  });
-};
-
-const tinycomments_delete_comment = (req, done, fail) => {
-  const { conversationUid, commentUid } = req;
-
-  fetch(
-    'https://api.example/conversations/' + conversationUid + '/' + commentUid,
-    {
-      method: 'DELETE',
-    }
-  ).then((response) => {
-    if (response.ok) {
-      done({ canDelete: true });
-    } else if (response.status === 403) {
-      done({ canDelete: false });
-    } else {
-      fail(new Error('Something has gone wrong...'));
-    }
-  });
-};
-
-const tinycomments_lookup = ({ conversationUid }, done, fail) => {
-  const lookup = async () => {
-    const convResp = await fetch(
-      'https://api.example/conversations/' + conversationUid
-    );
-    if (!convResp.ok) {
-      throw new Error('Failed to get conversation');
-    }
-    const comments = await convResp.json();
-    const usersResp = await fetch('https://api.example/users/');
-    if (!usersResp.ok) {
-      throw new Error('Failed to get users');
-    }
-    const { users } = await usersResp.json();
-    const getUser = (userId) => users.find((u) => u.id === userId);
-    return {
-      conversation: {
-        uid: conversationUid,
-        comments: comments.map((comment) => ({
-          ...comment,
-          content: comment.content,
-          authorName: getUser(comment.author)?.displayName,
-        })),
-      },
-    };
-  };
-  lookup()
-    .then((data) => {
-      console.log('Lookup success ' + conversationUid, data);
-      done(data);
-    })
-    .catch((err) => {
-      console.error('Lookup failure ' + conversationUid, err);
-      fail(err);
-    });
-};
-
-const tinycomments_fetch = (conversationUids, done, fail) => {
-  const requests = conversationUids.map((uid) => fetch(`https://api.example/conversations/${uid}`, {
-      method: 'GET',
-      headers: {
-        'Content-Type': 'application/json',
-      }})
-      .then((response) => response.json())
-      .then((data) => ({
-        [uid]: {
-          uid: uid,
-          comments: data
-        }
-      }))
-    );
-
-  Promise.all(requests)
-    .then((data) => {
-      console.log('data', data);
-      const conversations = data.reduce((conv, d) => ({
-          ...conv,
-          ...d
-        })
-      , {});
-      console.log(`Fetch success ${conversationUids}`, conversations);
-      done({ conversations });
-    })
-    .catch((err) => {
-      console.error(`Fetch failure ${conversationUids}`, err);
-      fail('Fetching conversations failed');
-    });
-};
-
-tinymce.init({
-  selector: 'textarea#comments-callback',
-  height: 800,
-  plugins: 'code tinycomments help lists quickbars link image',
-  toolbar:
-    'addcomment showcomments | undo redo | blocks | ' +
-    'bold italic backcolor | alignleft aligncenter ' +
-    'alignright alignjustify | bullist numlist outdent indent | ' +
-    'removeformat | help',
-  menubar: 'file edit view insert format tc',
-  sidebar_show: 'showcomments',
-  menu: {
-    tc: {
-      title: 'Comments',
-      items: 'addcomment showcomments deleteallconversations',
-    },
-  },
-  quickbars_selection_toolbar: 'alignleft aligncenter alignright | addcomment showcomments',
-  quickbars_image_toolbar: 'alignleft aligncenter alignright | rotateleft rotateright | imageoptions',
-  tinycomments_create,
-  tinycomments_reply,
-  tinycomments_edit_comment,
-  tinycomments_delete,
-  tinycomments_delete_all,
-  tinycomments_delete_comment,
-  tinycomments_lookup,
-  tinycomments_fetch,
-});
diff --git a/modules/ROOT/examples/live-demos/comments-callback/index.js b/modules/ROOT/examples/live-demos/comments-callback/index.js
index 84190beee6..58dcd8ecbe 100644
--- a/modules/ROOT/examples/live-demos/comments-callback/index.js
+++ b/modules/ROOT/examples/live-demos/comments-callback/index.js
@@ -1,725 +1,244 @@
-tinymce.ScriptLoader.loadScripts(
-  // Update to use UMD for broader compatibility browser support.
-  [
-    '//unpkg.com/@pollyjs/core@5.1.1/dist/umd/pollyjs-core.js',
-    '//unpkg.com/@pollyjs/adapter-fetch@5.1.1/dist/umd/pollyjs-adapter-fetch.js',
-    '//unpkg.com/@pollyjs/persister-local-storage@5.1.1/dist/umd/pollyjs-persister-local-storage.js',
-  ]
-).then(() => {
-  /******************************
-   * Mock server implementation *
-   ******************************/
-
-  const { Polly } = window['@pollyjs/core'];
-  const FetchAdapter = window['@pollyjs/adapter-fetch'];
-  const LocalStoragePersister = window['@pollyjs/persister-local-storage'];
+/********************************
+ *   Demo-specific configuration  *
+ ********************************/
+
+const userDb = {
+  'michaelcook': {
+    id: 'michaelcook',
+    name: 'Michael Cook',
+    fullName: 'Michael Cook',
+    description: 'Product Owner',
+    image: "{{imagesdir}}/avatars/michaelcook.png"
+  },
+  'kalebwilson': {
+    id: 'kalebwilson',
+    name: 'Kaleb Wilson',
+    fullName: 'Kaleb Wilson',
+    description: 'Marketing Director',
+    image: "{{imagesdir}}/avatars/kalebwilson.png"
+  }
+};
+
+const currentUid = 'kalebwilson';
+const adminUid = 'michaelcook';
+
+const now = new Date();
+const yesterday = new Date(now.getTime() - 24 * 60 * 60 * 1000).toISOString();
+const anhourago = new Date(now.getTime() - 60 * 60 * 1000).toISOString();
+
+const fillAuthorInfo = (id, fullName, image) => ({
+  author: id,
+  authorName: fullName,
+  authorAvatar: image,
+});
 
-  Polly.register(FetchAdapter);
-  Polly.register(LocalStoragePersister);
-  const polly = new Polly('test', {
-    adapters: ['fetch'],
-    persister: 'local-storage',
-    logging: true,
+const getAuthorInfo = (uid) => {
+  const user = userDb[uid];
+  if (user) {
+    return fillAuthorInfo(user.id, user.fullName, user.image);
+  }
+  return {
+    author: uid,
+    authorName: uid,
+  };
+};
+
+const conversationDb = {
+  'mce-conversation_19679600221621399703915': {
+    uid: 'mce-conversation_19679600221621399703915',
+    comments: [{
+      uid: 'mce-conversation_19679600221621399703915',
+      ...getAuthorInfo(currentUid),
+      content: `What do you think about this?`,
+      createdAt: yesterday,
+      modifiedAt: yesterday
+    }, {
+      uid: 'mce-conversation_19679600221621399703917',
+      ...getAuthorInfo(adminUid),
+      content: `I think this is a great idea!`,
+      createdAt: anhourago,
+      modifiedAt: anhourago,
+    }]
+  },
+  'mce-conversation_420304606321716900864126': {
+    uid: 'mce-conversation_420304606321716900864126',
+    comments: [{
+      uid: 'mce-conversation_420304606321716900864126',
+      ...getAuthorInfo(adminUid),
+      content: `Please revise this sentence, exclamation points are unprofessional!`,
+      createdAt: yesterday,
+      modifiedAt: anhourago
+    }]
+  }
+};
+
+const fakeDelay = 200;
+const randomString = () => crypto.getRandomValues(new Uint32Array(1))[0].toString(36).substring(2, 14);
+
+const resolvedConversationDb = {};
+
+/********************************
+ *   Tiny Comments functions    *
+ * (must call "done" or "fail") *
+ ********************************/
+
+const tinycomments_create = (req, done, fail) => {
+  if (req.content === 'fail') {
+    fail(new Error('Something has gone wrong...'));
+  } else {
+    const uid = 'annotation-' + randomString();
+    conversationDb[uid] = {
+      uid,
+      comments: [{
+        uid,
+        ...getAuthorInfo(currentUid),
+        content: req.content,
+        createdAt: req.createdAt,
+        modifiedAt: req.createdAt
+      }]
+    };
+    setTimeout(() => done({ conversationUid: uid }), fakeDelay);
+  }
+};
+
+const tinycomments_reply = (req, done) => {
+  const replyUid = 'annotation-' + randomString();
+  conversationDb[req.conversationUid].comments.push({
+    uid: replyUid,
+    ...getAuthorInfo(currentUid),
+    content: req.content,
+    createdAt: req.createdAt,
+    modifiedAt: req.createdAt
   });
-  const server = polly.server;
-
-  /* this would be an admin for the file, they're allowed to do all operations */
-  const getOwner = () =>
-    localStorage.getItem('owner') ?? users[0].id;
-
-  /* Server knows the author, probably by cookie or JWT token */
-  const getAuthor = () =>
-    localStorage.getItem('author') ?? users[0].id;
-
-  /* this would be an admin for the file, they're allowed to do all operations */
-  const setOwner = (user) => {
-    localStorage.setItem('owner', user) ?? users[0].id;
-  };
-
-  /* Server knows the author, probably by cookie or JWT token */
-  const setAuthor = (user) => {
-    localStorage.setItem('author', user) ?? users[0].id;
-  };
-
-  const randomString = () => {
-    const randomArray = new Uint32Array(20);
-    return window.crypto.getRandomValues(randomArray)[0].toString();
-  };
-
-  /* Our server "database" */
-  const initialDB = {
-    "mce-conversation_19679600221621399703915": [
-      {
-        uid: "mce-conversation_19679600221621399703915",
-        author: "Another Tiny User",
-        authorName: "Another Tiny User",
-        content: "Please revise this sentence, exclamation points are unprofessional!",
-        createdAt: "2021-05-19T04:48:23.914Z",
-        modifiedAt: "2021-05-19T04:48:23.914Z",
-      },
-      {
-        uid: "mce-conversation_19679600221621399703917",
-        author: "Another Tiny User",
-        authorName: "Another Tiny User",
-        content: "Replied",
-        createdAt: "2021-05-19T04:48:23.914Z",
-        modifiedAt: "2021-05-19T04:48:23.914Z",
-      },
-      {
-        uid: "mce-conversation_19679600221621399703918",
-        author: "Another Tiny User",
-        authorName: "Another Tiny User",
-        content: "Replied again",
-        createdAt: "2021-05-19T04:48:23.914Z",
-        modifiedAt: "2021-05-19T04:48:23.914Z",
-      },
-    ],
-    "mce-conversation_420304606321716900864126": [
-      {
-        uid: "mce-conversation_420304606321716900864126",
-        author: "john_smith",
-        authorName: "John Smith",
-        authorAvatar: "https://i.pravatar.cc/150?img=11",
-        content: "I think this is a great idea!",
-        createdAt: "2024-05-28T12:54:24.126Z",
-        modifiedAt: "2024-05-28T12:54:24.126Z",
-      },
-    ],
-  };
-
-  const getDB = () => JSON.parse(localStorage.getItem('fakedb') ?? JSON.stringify(initialDB));
-  const setDB = (data) => {
-    localStorage.setItem('fakedb', JSON.stringify(data));
-  };
-
-  const getConversation = (uid) => {
-    const store = getDB();
-    console.log('DB get:', uid, store[uid]);
-    return store[uid];
-  };
-
-  const setConversation = (uid, conversation) => {
-    const store = getDB();
-    console.log('DB set:', uid, store[uid], conversation);
-    store[uid] = conversation;
-    setDB(store);
-  };
-
-  const deleteConversation = (uid) => {
-    const store = getDB();
-    console.log('DB delete:', uid);
-    delete store[uid];
-    setDB(store);
-  };
-
-  const deleteAllConversations = () => {
-    console.log('DB delete all');
-    const store = {};
-    setDB(store);
-  };
-
-  server.host('https://api.example', () => {
-    /* create new conversation */
-    server.post('/conversations/').intercept((req, res) => {
-      const author = getAuthor();
-      const { content, createdAt } = JSON.parse(req.body);
-      console.log(req.body);
-      try {
-        const conversationUid = randomString();
-        setConversation(conversationUid, [
-          {
-            author,
-            createdAt,
-            modifiedAt: createdAt,
-            content,
-            uid: conversationUid /* first comment has same uid as conversation */,
-          },
-        ]);
-        res.status(201).json({ conversationUid });
-      } catch (e) {
-        console.log('Server error:', e);
-        res.status(500);
-      }
-    });
-
-    /* add new comment to conversation */
-    server.post('/conversations/:conversationUid').intercept((req, res) => {
-      const author = getAuthor();
-      const { content, createdAt } = JSON.parse(req.body);
-      const conversationUid = req.params.conversationUid;
-      try {
-        const conversation = getConversation(conversationUid);
-        const commentUid = randomString();
-        setConversation(
-          conversationUid,
-          conversation.concat([
-            {
-              author,
-              createdAt,
-              modifiedAt: createdAt,
-              content,
-              uid: commentUid,
-            },
-          ])
-        );
-        res.status(201).json({ commentUid });
-      } catch (e) {
-        console.log('Server error:', e);
-        res.status(500);
-      }
-    });
-
-    /* edit a comment */
-    server
-      .put('/conversations/:conversationUid/:commentUid')
-      .intercept((req, res) => {
-        const author = getAuthor();
-        const { content, modifiedAt } = JSON.parse(req.body);
-        const { conversationUid, commentUid } = req.params;
-
-        try {
-          const conversation = getConversation(conversationUid);
-          const commentIndex = conversation.findIndex((comment) => comment.uid === commentUid);
-          const comment = conversation[commentIndex];
-          const canEdit = comment.author === author;
-          if (canEdit) {
-            setConversation(conversationUid, [
-              ...conversation.slice(0, commentIndex),
-              {
-                ...comment,
-                content,
-                modifiedAt,
-              },
-              ...conversation.slice(commentIndex + 1),
-            ]);
-          }
-          res.status(201).json({ canEdit });
-        } catch (e) {
-          console.log('Server error:', e);
-          res.status(500);
-        }
-      });
-
-    /* delete a comment */
-    server
-      .delete('/conversations/:conversationUid/:commentUid')
-      .intercept((req, res) => {
-        const author = getAuthor();
-        const owner = getOwner();
-        const conversationUid = req.params.conversationUid;
-        const commentUid = req.params.commentUid;
-        const conversation = getConversation(conversationUid);
-        if (!conversation) {
-          res.status(404);
-        }
-        const commentIndex = conversation.findIndex((comment) => comment.uid === commentUid);
-        if (commentIndex === -1) {
-          res.status(404);
-        } else if (
-          conversation[commentIndex].author === author ||
-          author === owner
-        ) {
-          setConversation(conversationUid, [
-            ...conversation.slice(0, commentIndex),
-            ...conversation.slice(commentIndex + 1),
-          ]);
-          res.status(204);
-        } else {
-          res.status(403);
-        }
-      });
-
-    /* delete a conversation */
-    server.delete('/conversations/:conversationUid').intercept((req, res) => {
-      const author = getAuthor();
-      const owner = getOwner();
-      const conversationUid = req.params.conversationUid;
-      const conversation = getConversation(conversationUid);
-      if (conversation) {
-        if (conversation[0].author === author || author === owner) {
-          deleteConversation(conversationUid);
-          res.status(204);
-        } else {
-          res.status(403);
-        }
-      } else {
-        res.status(404);
-      }
-    });
-
-    /* delete all conversations */
-    server.delete('/conversations').intercept((req, res) => {
-      const author = getAuthor();
-      const owner = getOwner();
-      if (author === owner) {
-        deleteAllConversations();
-        res.status(204);
-      } else {
-        res.status(403);
-      }
-    });
-
-    /* lookup a conversation */
-    server.get('/conversations/:conversationUid').intercept((req, res) => {
-      const conversation = getConversation(req.params.conversationUid);
-      if (conversation) {
-        res.status(200).json(conversation);
-      } else {
-        res.status(404);
-      }
-    });
-
-    /* lookup users */
-    server.get('/users/').intercept((req, res) => {
-      res.status(200).json({
-        users,
-      });
-    });
-  }); /* server.host */
-
-  /* Connect using the `connectTo` API */
-  polly.connectTo('fetch');
-
-  /************************************************
-   * Fake Users and associated pickers            *
-   * Should be based on sessions and backend data *
-   ***********************************************/
-
-  const users = [
-    { id: 'alex', displayName: 'Alex' },
-    { id: 'jessie', displayName: 'Jessie' },
-    { id: 'sam', displayName: 'Sam' },
-  ];
-
-  /* Set initial Owner */
-  setOwner(users[2].id);
-
-  /* Set initial Author */
-  setAuthor(users[0].id);
-
-  /********************************
-   *   Tiny Comments functions    *
-   * (must call "done" or "fail") *
-   ********************************/
-
-  /**
-   * Callback for when the operation was successful.
-   * @template T
-   * @callback done
-   * @param {T} data - the data
-   * @returns {void}
-   */
-
-  /**
-   * Callback for when the operation failed.
-   * @callback fail
-   * @param {string|Error} error - the reason for the failure
-   * @returns {void}
-   */
-
-  /**
-   * The data supplied to create a comment.
-   * @typedef {Object} TinyCommentsCreateReq
-   * @property {string} content - comment content
-   * @property {string} createdAt - ISO creation date
-   */
-
-  /**
-   * The response returned when a comment was created on the server.
-   * @typedef {Object} TinyCommentsCreateResp
-   * @property {string} conversationUid - ID of created comment
-   * @property {?fail} onError - error callback to call when the comment can't be put into the document
-   * @property {?done<string>} onSuccess - success callback to call when the comment is put into the document
-   */
-
-  /**
-   * Conversation "create" function. Saves the comment as a new conversation,
-   * and asynchronously returns a conversation unique ID via the "done"
-   * callback.
-   *
-   * @param {TinyCommentsCreateReq} req - the comment to create
-   * @param {done<TinyCommentsCreateResp>} done - callback to call when the comment is created on the server
-   * @param {fail} fail - callback to call when something fails
-   */
-  const tinycomments_create = (req, done, fail) => {
-    const { content, createdAt } = req;
-
-    fetch('https://api.example/conversations/', {
-      method: 'POST',
-      body: JSON.stringify({ content: content, createdAt: createdAt }),
-      headers: {
-        'Accept': 'application/json',
-        'Content-Type': 'application/json',
-      },
-    })
-      .then((response) => {
-        if (!response.ok) {
-          throw new Error('Failed to create comment');
-        }
-        return response.json();
-      })
-      .then((req2) => {
-        const conversationUid = req2.conversationUid;
-        done({ conversationUid });
-      })
-      .catch((e) => {
-        fail(e);
-      });
-  };
-
-  /**
-   *
-   * @typedef {Object} TinyCommentsReplyReq
-   * @property {string} conversationUid
-   * @property {string} content
-   * @property {string} createdAt
-   */
-
-  /**
-   *
-   * @typedef {Object} TinyCommentsReplyResp
-   * @property {string} commentUid
-   */
-
-  /**
-   * Conversation "reply" function. Saves the comment as a reply to the
-   * an existing conversation, and asynchronously returns via the "done"
-   * callback when finished.
-   *
-   * @param {TinyCommentsReplyReq} req - the comment to append
-   * @param {done<TinyCommentsReplyResp>} done - callback to call when the comment is created on the server
-   * @param {fail} fail - callback to call when something fails
-   */
-  const tinycomments_reply = (req, done, fail) => {
-    const { conversationUid, content, createdAt } = req;
-
-    fetch('https://api.example/conversations/' + conversationUid, {
-      method: 'POST',
-      body: JSON.stringify({ content: content, createdAt: createdAt }),
-      headers: {
-        'Accept': 'application/json',
-        'Content-Type': 'application/json',
-      },
-    })
-      .then((response) => {
-        if (!response.ok) {
-          throw new Error('Failed to reply to comment');
-        }
-        return response.json();
-      })
-      .then((req2) => {
-        const commentUid = req2.commentUid;
-        done({ commentUid });
-      })
-      .catch((e) => {
-        fail(e);
-      });
-  };
-
-  /**
-   *
-   * @typedef {Object} TinyCommentsEditReq
-   * @property {string} conversationUid
-   * @property {string} commentUid
-   * @property {string} content
-   * @property {string} modifiedAt
-   */
-
-  /**
-   *
-   * @typedef {Object} TinyCommentsEditResp
-   * @property {boolean} canEdit
-   * @property {?string} reason
-   */
-
-  /**
-   *
-   * @param {TinyCommentsEditReq} req
-   * @param {done<TinyCommentsEditResp>} done
-   * @param {fail} fail
-   */
-  const tinycomments_edit_comment = (req, done, fail) => {
-    const { conversationUid, commentUid, content, modifiedAt } = req;
-
-    fetch(
-      'https://api.example/conversations/' +
-      conversationUid +
-      '/' +
-      commentUid,
-      {
-        method: 'PUT',
-        body: JSON.stringify({ content: content, modifiedAt: modifiedAt }),
-        headers: {
-          'Accept': 'application/json',
-          'Content-Type': 'application/json',
-        },
-      }
-    )
-      .then((response) => {
-        if (!response.ok) {
-          throw new Error('Failed to edit comment');
-        }
-        return response.json();
-      })
-      .then((req2) => {
-        const canEdit = req2.canEdit;
-        done({ canEdit });
-      })
-      .catch((e) => {
-        fail(e);
-      });
-  };
-
-  /**
-   *
-   * @typedef TinyCommentsDeleteReq
-   * @property {string} conversationUid
-   */
-
-  /**
-   *
-   * @typedef TinyCommentsDeleteResp
-   * @property {boolean} canDelete
-   * @property {?string} reason
-   */
-
-  /**
-   * Conversation "delete" function. Deletes an entire conversation.
-   * Returns asynchronously whether the conversation was deleted.
-   * Failure to delete due to permissions or business rules is indicated
-   * by `{canDelete: false}`, while unexpected errors should be indicated using the
-   * "fail" callback.
-   * @param {TinyCommentsDeleteReq} req
-   * @param {done<TinyCommentsDeleteResp>} done
-   * @param {fail} fail
-   */
-  const tinycomments_delete = (req, done, fail) => {
-    const conversationUid = req.conversationUid;
-    fetch('https://api.example/conversations/' + conversationUid, {
-      method: 'DELETE',
-    }).then((response) => {
-      if (response.ok) {
-        done({ canDelete: true });
-      } else if (response.status === 403) {
-        done({ canDelete: false });
+  setTimeout(() => done({ commentUid: replyUid }), fakeDelay);
+};
+
+const tinycomments_delete = (req, done) => {
+  if (currentUid === adminUid) { // Replace wth your own logic, e.g. check if user created the conversation
+    delete conversationDb[req.conversationUid];
+    setTimeout(() => done({ canDelete: true }), fakeDelay);
+  } else {
+    setTimeout(() => done({ canDelete: false, reason: 'Must be admin user' }), fakeDelay);
+  }
+};
+
+const tinycomments_resolve = (req, done) => {
+  const conversation = conversationDb[req.conversationUid];
+  if (currentUid === conversation.comments[0].author) { // Replace wth your own logic, e.g. check if user has admin priveleges
+    delete conversationDb[req.conversationUid];
+    setTimeout(() => done({ canResolve: true }), fakeDelay);
+  } else {
+    setTimeout(() => done({ canResolve: false, reason: 'Must be conversation author' }), fakeDelay);
+  }
+};
+
+const tinycomments_delete_comment = (req, done) => {
+  const oldcomments = conversationDb[req.conversationUid].comments;
+  let reason = 'Comment not found';
+
+  const newcomments = oldcomments.filter((comment) => {
+    if (comment.uid === req.commentUid) { // Found the comment to delete
+      if (currentUid === comment.author) { // Replace with your own logic, e.g. check if user has admin privileges
+        return false; // Remove the comment
       } else {
-        fail(new Error('Something has gone wrong...'));
+        reason = 'Not authorised to delete this comment'; // Update reason
       }
-    });
-  };
-
-  /**
-   *
-   * @typedef TinyCommentsDeleteAllReq
-   * @type {object}
-   */
-
-  /**
-   *
-   * @typedef TinyCommentsDeleteAllResp
-   * @property {boolean} canDelete
-   * @property {?string} reason
-   */
-
-  /**
-   * All conversations "delete_all" function. Deletes all conversations.
-   * Returns asynchronously whether all conversations were deleted.
-   * Failure to delete due to permissions or business rules is indicated
-   * by `{canDelete: false}`, while unexpected errors should be indicated using the
-   * "fail" callback.
-   * @param {TinyCommentsDeleteAllReq} _req - no options
-   * @param {done<TinyCommentsDeleteAllResp>} done
-   * @param {fail} fail
-   */
-  const tinycomments_delete_all = (_req, done, fail) => {
-    fetch('https://api.example/conversations', {
-      method: 'DELETE',
-    }).then((response) => {
-      if (response.ok) {
-        done({ canDelete: true });
-      } else if (response.status === 403) {
-        done({ canDelete: false });
+    }
+    return true; // Keep the comment
+  });
+  if (newcomments.length === oldcomments.length) {
+    setTimeout(() => done({ canDelete: false, reason }), fakeDelay);
+  } else {
+    conversationDb[req.conversationUid].comments = newcomments;
+    setTimeout(() => done({ canDelete: true }), fakeDelay);
+  }
+};
+
+const tinycomments_edit_comment = (req, done) => {
+  const oldcomments = conversationDb[req.conversationUid].comments;
+  let reason = 'Comment not found';
+  let canEdit = false;
+
+  const newcomments = oldcomments.map((comment) => {
+    if (comment.uid === req.commentUid) { // Found the comment to delete
+      if (currentUid === comment.author) { // Replace with your own logic, e.g. check if user has admin privileges
+        canEdit = true; // User can edit the comment
+        return { ...comment, content: req.content, modifiedAt: new Date().toISOString() }; // Update the comment
       } else {
-        fail(new Error('Something has gone wrong...'));
+        reason = 'Not authorised to edit this comment'; // Update reason
       }
-    });
-  };
-
-  /**
-   *
-   * @typedef TinyCommentsDeleteCommentReq
-   * @property {string} conversationUid
-   * @property {string} commentUid
-   */
-
-  /**
-   *
-   * @typedef TinyCommentsDeleteCommentResp
-   * @property {boolean} canDelete
-   * @property {?string} reason
-   */
-
-  /**
-   *
-   * @param {TinyCommentsDeleteCommentReq} req
-   * @param {done<TinyCommentsDeleteCommentResp>} done
-   * @param {fail} fail
-   */
-  const tinycomments_delete_comment = (req, done, fail) => {
-    const { conversationUid, commentUid } = req;
+    }
+    return comment; // Keep the comment
+  });
 
-    fetch(
-      'https://api.example/conversations/' +
-      conversationUid +
-      '/' +
-      commentUid,
-      {
-        method: 'DELETE',
-      }
-    ).then((response) => {
-      if (response.ok) {
-        done({ canDelete: true });
-      } else if (response.status === 403) {
-        done({ canDelete: false });
-      } else {
-        fail(new Error('Something has gone wrong...'));
+  if (canEdit) {
+    conversationDb[req.conversationUid].comments = newcomments;
+    setTimeout(() => done({ canEdit }), fakeDelay);
+  } else {
+    setTimeout(() => done({ canEdit, reason }), fakeDelay);
+  }
+};
+
+const tinycomments_delete_all = (req, done) => {
+  const conversation = conversationDb[req.conversationUid];
+  if (currentUid === conversation.comments[0].author) { // Replace wth your own logic, e.g. check if user has admin priveleges
+    delete conversationDb[req.conversationUid];
+    setTimeout(() => done({ canDelete: true }), fakeDelay);
+  } else {
+    setTimeout(() => done({ canDelete: false, reason: 'Must be conversation author' }), fakeDelay);
+  }
+};
+
+const tinycomments_lookup = (req, done) => {
+  setTimeout(() => {
+    done({
+      conversation: {
+        uid: conversationDb[req.conversationUid].uid,
+        comments: [...conversationDb[req.conversationUid].comments]
       }
     });
-  };
-
-  /**
-   * @typedef TinyCommentsLookupReq
-   * @property {string} conversationUid
-   */
-
-  /**
-   *
-   * @typedef TinyCommentsLookupRespComment
-   * @property {string} author
-   * @property {?string} authorName
-   * @property {string} createdAt
-   * @property {string} modifiedAt
-   * @property {string} content
-   * @property {string} uid
-   */
-
-  /**
-   *
-   * @typedef TinyCommentsLookupRespConversation
-   * @property {string} uid
-   * @property {TinyCommentsLookupRespComment[]} comments
-   */
-
-  /**
-   *
-   * @typedef TinyCommentsLookupResp
-   * @property {TinyCommentsLookupRespConversation} conversation
-   */
-
-  /**
-   * Conversation "lookup" function. Retreives an existing conversation
-   * via a conversation unique ID. Asynchronously returns the conversation
-   * via the "done" callback.
-   *
-   * @param {TinyCommentsLookupReq} req
-   * @param {done<TinyCommentsLookupResp>} done
-   * @param {fail} fail
-   */
-  const tinycomments_lookup = ({ conversationUid }, done, fail) => {
-    const lookup = async () => {
-      const convResp = await fetch(
-        'https://api.example/conversations/' + conversationUid
-      );
-      if (!convResp.ok) {
-        throw new Error('Failed to get conversation');
-      }
-      const comments = await convResp.json();
-      const usersResp = await fetch('https://api.example/users/');
-      if (!usersResp.ok) {
-        throw new Error('Failed to get users');
-      }
-      const { users } = await usersResp.json();
-      const getUser = (userId) => users.find((u) => u.id === userId);
-      return {
-        conversation: {
-          uid: conversationUid,
-          comments: comments.map((comment) => ({
-            ...comment,
-            content: comment.content,
-            authorName: getUser(comment.author)?.displayName,
-          })),
-        },
-      };
-    };
-    lookup()
-      .then((data) => {
-        console.log('Lookup success ' + conversationUid, data);
-        done(data);
-      })
-      .catch((err) => {
-        console.error('Lookup failure ' + conversationUid, err);
-        fail(err);
-      });
-  };
-  
-  const tinycomments_fetch = (conversationUids, done, fail) => {
-    const requests = conversationUids.map((uid) => fetch(`https://api.example/conversations/${uid}`, {
-        method: 'GET',
-        headers: {
-          'Content-Type': 'application/json',
-        }})
-        .then((response) => response.json())
-        .then((data) => ({
-          [uid]: {
-            uid: uid,
-            comments: data
-          }
-        }))
-      );
-
-    Promise.all(requests)
-      .then((data) => {
-        console.log('data', data);
-        const conversations = data.reduce((conv, d) => ({
-            ...conv,
-            ...d
-          })
-        , {});
-        console.log(`Fetch success ${conversationUids}`, conversations);
-        done({ conversations });
-      })
-      .catch((err) => {
-        console.error(`Fetch failure ${conversationUids}`, err);
-        fail('Fetching conversations failed');
-      });
-  };
-
-  tinymce.init({
-    selector: 'textarea#comments-callback',
-    height: 800,
-    plugins: 'code tinycomments help lists quickbars link image',
-    toolbar:
-      'addcomment showcomments | undo redo | blocks | ' +
-      'bold italic backcolor | alignleft aligncenter ' +
-      'alignright alignjustify | bullist numlist outdent indent | ' +
-      'removeformat | help',
-    menubar: 'file edit view insert format tc',
-    quickbars_selection_toolbar: 'alignleft aligncenter alignright | addcomment showcomments',
-    quickbars_image_toolbar: 'alignleft aligncenter alignright | rotateleft rotateright | imageoptions',
-    menu: {
-      tc: {
-        title: 'Comments',
-        items: 'addcomment showcomments deleteallconversations',
-      },
-    },
-    tinycomments_create,
-    tinycomments_reply,
-    tinycomments_edit_comment,
-    tinycomments_delete,
-    tinycomments_delete_all,
-    tinycomments_delete_comment,
-    tinycomments_lookup,
-    tinycomments_fetch,
-    sidebar_show: 'showcomments',
+  }, fakeDelay);
+};
+
+const tinycomments_fetch = (conversationUids, done) => {
+  const fetchedConversations = {};
+  conversationUids.forEach((uid) => {
+    const conversation = conversationDb[uid];
+    if (conversation) {
+      fetchedConversations[uid] = {...conversation};
+    }
   });
+  setTimeout(() => done({ conversations: fetchedConversations }), fakeDelay);
+};
+
+// Read the above `getAuthorInfo` function to see how this could be implemented
+const tinycomments_fetch_author_info = (done) => done(getAuthorInfo(currentUid));
+
+tinymce.init({
+  selector: 'textarea#comments-callback',
+  license_key: 'gpl',
+  height: 800,
+  toolbar: 'addcomment showcomments code | bold italic underline',
+  menubar: 'file edit view insert format tools tc help',
+  menu: {
+    tc: {
+      title: 'TinyComments',
+      items: 'addcomment showcomments deleteallconversations'
+    }
+  },
+  plugins: ['tinycomments', 'help', 'code', 'quickbars', 'link', 'lists', 'image'],
+  quickbars_selection_toolbar: 'alignleft aligncenter alignright | addcomment showcomments',
+  quickbars_image_toolbar: 'alignleft aligncenter alignright | rotateleft rotateright | imageoptions',
+  sidebar_show: 'showcomments',
+  tinycomments_mode: 'callback',
+  tinycomments_create,
+  tinycomments_reply,
+  tinycomments_delete,
+  tinycomments_resolve,
+  tinycomments_delete_all,
+  tinycomments_lookup,
+  tinycomments_delete_comment,
+  tinycomments_edit_comment,
+  tinycomments_fetch,
+  tinycomments_fetch_author_info,
 });
diff --git a/modules/ROOT/examples/live-demos/uploadcare/example.js b/modules/ROOT/examples/live-demos/uploadcare/example.js
index 8673194db0..38bcb9f27a 100644
--- a/modules/ROOT/examples/live-demos/uploadcare/example.js
+++ b/modules/ROOT/examples/live-demos/uploadcare/example.js
@@ -2,7 +2,21 @@ tinymce.init({
     selector: "textarea",
     plugins: [ "uploadcare", "code", "link", "preview", "lists" ],
     uploadcare_public_key: '<your-public-key>',
-    a11y_advanced_options: true,	
+    uploadcare_filters: [
+      { name: 'none' }, // No filter applied
+      { name: 'adaris', amount: -100 }, // Adaris with inverted effect (amount -100), label defaults to 'adaris'
+      { name: 'adaris', amount: -100, label: 'Vintage Fade' }, // Adaris with inverted effect (amount -100), label reads 'Vintage Fade'
+      { name: 'adaris', amount: 0, label: 'Base' }, // Adaris with neutral effect (amount 0), label reads 'Base'
+      { name: 'adaris', amount: 50, label: 'Light' }, // Adaris with light effect (amount 50), label reads 'Light'
+      { name: 'adaris', amount: 100, label: 'Standard' }, // Adaris with standard effect (amount 100), label reads 'Standard'
+      { name: 'adaris', amount: 200, label: 'Intense' }, // Adaris with intense effect (amount 200), label reads 'Intense'
+      { name: 'zevcen', amount: 200, label: 'Glow Boost' }, // Zevcen with intense effect (amount 200), label reads 'Glow Boost'
+      { name: 'galen', amount: 80, label: 'Soft Focus' }, // Galen with softening effect (amount 80), label reads 'Soft Focus'
+      { name: 'carris', amount: 120, label: 'Sharp Contrast' }, // Carris with high contrast (amount 120), label reads 'Sharp Contrast'
+      { name: 'ferand', amount: 60, label: 'Light Touch' }, // Ferand with light enhancement (amount 60), label reads 'Light Touch'
+      { name: 'sorahel', amount: -50, label: 'Night Mood' } // Sorahel with darkened effect (amount -50), label reads 'Night Mood'
+    ],
+    a11y_advanced_options: true,
     toolbar: "undo redo | styles | bold italic underline | forecolor | bullist numlist| link uploadcare | code preview",
     height: 700,	
     content_style: `
diff --git a/modules/ROOT/examples/live-demos/uploadcare/index.js b/modules/ROOT/examples/live-demos/uploadcare/index.js
index 06955b26b6..6a9757556e 100644
--- a/modules/ROOT/examples/live-demos/uploadcare/index.js
+++ b/modules/ROOT/examples/live-demos/uploadcare/index.js
@@ -4,6 +4,20 @@ tinymce.init({
   uploadcare_public_key: '630992ad50fe2291c406',
 	uploadcare_cdn_base_url: 'https://tiny.ucarecdn.com',
 	uploadcare_store_type: 'temporary',
+  uploadcare_filters: [
+    { name: 'none' }, // No filter applied
+    { name: 'adaris', amount: -100 }, // Adaris with inverted effect (amount -100), label defaults to 'adaris'
+    { name: 'adaris', amount: -100, label: 'Vintage Fade' }, // Adaris with inverted effect (amount -100), label reads 'Vintage Fade'
+    { name: 'adaris', amount: 0, label: 'Base' }, // Adaris with neutral effect (amount 0), label reads 'Base'
+    { name: 'adaris', amount: 50, label: 'Light' }, // Adaris with light effect (amount 50), label reads 'Light'
+    { name: 'adaris', amount: 100, label: 'Standard' }, // Adaris with standard effect (amount 100), label reads 'Standard'
+    { name: 'adaris', amount: 200, label: 'Intense' }, // Adaris with intense effect (amount 200), label reads 'Intense'
+    { name: 'zevcen', amount: 200, label: 'Glow Boost' }, // Zevcen with intense effect (amount 200), label reads 'Glow Boost'
+    { name: 'galen', amount: 80, label: 'Soft Focus' }, // Galen with softening effect (amount 80), label reads 'Soft Focus'
+    { name: 'carris', amount: 120, label: 'Sharp Contrast' }, // Carris with high contrast (amount 120), label reads 'Sharp Contrast'
+    { name: 'ferand', amount: 60, label: 'Light Touch' }, // Ferand with light enhancement (amount 60), label reads 'Light Touch'
+    { name: 'sorahel', amount: -50, label: 'Night Mood' } // Sorahel with darkened effect (amount -50), label reads 'Night Mood'
+  ],
   a11y_advanced_options: true,
   toolbar: "undo redo | styles | bold italic underline | forecolor | bullist numlist| link uploadcare | code preview",
   height: 700,	
diff --git a/modules/ROOT/images/avatars/kalebwilson.png b/modules/ROOT/images/avatars/kalebwilson.png
new file mode 100644
index 0000000000..a1bf64ba7d
Binary files /dev/null and b/modules/ROOT/images/avatars/kalebwilson.png differ
diff --git a/modules/ROOT/images/avatars/michaelcook.png b/modules/ROOT/images/avatars/michaelcook.png
new file mode 100644
index 0000000000..d46b99428d
Binary files /dev/null and b/modules/ROOT/images/avatars/michaelcook.png differ
diff --git a/modules/ROOT/images/icons/auto-image-enhancement.svg b/modules/ROOT/images/icons/auto-image-enhancement.svg
new file mode 100644
index 0000000000..df2452a714
--- /dev/null
+++ b/modules/ROOT/images/icons/auto-image-enhancement.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="none" viewBox="0 0 24 24">
+  <path fill="#222F3E" d="M7.714 10.571a5.835 5.835 0 0 0 5.715 5.715A5.835 5.835 0 0 0 7.714 22 5.835 5.835 0 0 0 2 16.286a5.835 5.835 0 0 0 5.714-5.715ZM15.524 2c.283 3.04 3.234 5.922 6.476 6.429-3.242.506-6.193 3.387-6.476 6.428-.311-3.339-3.114-5.918-6.381-6.428 3.267-.51 6.07-3.09 6.38-6.429Z"/>
+</svg>
diff --git a/modules/ROOT/images/icons/image-enhancements.svg b/modules/ROOT/images/icons/image-enhancements.svg
deleted file mode 100644
index f95c841695..0000000000
--- a/modules/ROOT/images/icons/image-enhancements.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none" viewBox="0 0 16 16">
-  <path fill="#222F3E" d="M1.522 14.478c.348.348.767.522 1.256.522h10.444c.49 0 .908-.174 1.256-.522.348-.348.522-.767.522-1.256V7h-1v6a1 1 0 0 1-1 1H2V3a1 1 0 0 1 1-1h6V1H2.778c-.49 0-.908.174-1.256.522A1.712 1.712 0 0 0 1 2.778v10.444c0 .49.174.908.522 1.256Z"/>
-  <path fill="#222F3E" d="M15 4.214C13.379 3.961 11.904 2.52 11.762 1c-.156 1.67-1.557 2.96-3.19 3.214 1.633.255 3.034 1.545 3.19 3.215.142-1.52 1.617-2.962 3.238-3.215Zm-4.286 3.929a2.918 2.918 0 0 1-2.857-2.857A2.918 2.918 0 0 1 5 8.143 2.918 2.918 0 0 1 7.857 11a2.918 2.918 0 0 1 2.857-2.857Z"/>
-</svg>
diff --git a/modules/ROOT/images/uploadcare/filters/adaris.jpg b/modules/ROOT/images/uploadcare/filters/adaris.jpg
new file mode 100644
index 0000000000..2374351297
Binary files /dev/null and b/modules/ROOT/images/uploadcare/filters/adaris.jpg differ
diff --git a/modules/ROOT/images/uploadcare/filters/briaril.jpg b/modules/ROOT/images/uploadcare/filters/briaril.jpg
new file mode 100644
index 0000000000..3727dcbfb9
Binary files /dev/null and b/modules/ROOT/images/uploadcare/filters/briaril.jpg differ
diff --git a/modules/ROOT/images/uploadcare/filters/calarel.jpg b/modules/ROOT/images/uploadcare/filters/calarel.jpg
new file mode 100644
index 0000000000..8ce0fe6c9f
Binary files /dev/null and b/modules/ROOT/images/uploadcare/filters/calarel.jpg differ
diff --git a/modules/ROOT/images/uploadcare/filters/carris.jpg b/modules/ROOT/images/uploadcare/filters/carris.jpg
new file mode 100644
index 0000000000..6a79bf9413
Binary files /dev/null and b/modules/ROOT/images/uploadcare/filters/carris.jpg differ
diff --git a/modules/ROOT/images/uploadcare/filters/cynarel.jpg b/modules/ROOT/images/uploadcare/filters/cynarel.jpg
new file mode 100644
index 0000000000..f11fb446db
Binary files /dev/null and b/modules/ROOT/images/uploadcare/filters/cynarel.jpg differ
diff --git a/modules/ROOT/images/uploadcare/filters/cyren.jpg b/modules/ROOT/images/uploadcare/filters/cyren.jpg
new file mode 100644
index 0000000000..371b673cba
Binary files /dev/null and b/modules/ROOT/images/uploadcare/filters/cyren.jpg differ
diff --git a/modules/ROOT/images/uploadcare/filters/elmet.jpg b/modules/ROOT/images/uploadcare/filters/elmet.jpg
new file mode 100644
index 0000000000..dc5e7b2e8a
Binary files /dev/null and b/modules/ROOT/images/uploadcare/filters/elmet.jpg differ
diff --git a/modules/ROOT/images/uploadcare/filters/elonni.jpg b/modules/ROOT/images/uploadcare/filters/elonni.jpg
new file mode 100644
index 0000000000..9d399b5e5d
Binary files /dev/null and b/modules/ROOT/images/uploadcare/filters/elonni.jpg differ
diff --git a/modules/ROOT/images/uploadcare/filters/enzana.jpg b/modules/ROOT/images/uploadcare/filters/enzana.jpg
new file mode 100644
index 0000000000..53193f3d39
Binary files /dev/null and b/modules/ROOT/images/uploadcare/filters/enzana.jpg differ
diff --git a/modules/ROOT/images/uploadcare/filters/erydark.jpg b/modules/ROOT/images/uploadcare/filters/erydark.jpg
new file mode 100644
index 0000000000..c2cbc3cd1f
Binary files /dev/null and b/modules/ROOT/images/uploadcare/filters/erydark.jpg differ
diff --git a/modules/ROOT/images/uploadcare/filters/fenralan.jpg b/modules/ROOT/images/uploadcare/filters/fenralan.jpg
new file mode 100644
index 0000000000..68ef9b8cdc
Binary files /dev/null and b/modules/ROOT/images/uploadcare/filters/fenralan.jpg differ
diff --git a/modules/ROOT/images/uploadcare/filters/ferand.jpg b/modules/ROOT/images/uploadcare/filters/ferand.jpg
new file mode 100644
index 0000000000..351a354e14
Binary files /dev/null and b/modules/ROOT/images/uploadcare/filters/ferand.jpg differ
diff --git a/modules/ROOT/images/uploadcare/filters/galen.jpg b/modules/ROOT/images/uploadcare/filters/galen.jpg
new file mode 100644
index 0000000000..36eeeb80d1
Binary files /dev/null and b/modules/ROOT/images/uploadcare/filters/galen.jpg differ
diff --git a/modules/ROOT/images/uploadcare/filters/gavin.jpg b/modules/ROOT/images/uploadcare/filters/gavin.jpg
new file mode 100644
index 0000000000..65e6c5d6f2
Binary files /dev/null and b/modules/ROOT/images/uploadcare/filters/gavin.jpg differ
diff --git a/modules/ROOT/images/uploadcare/filters/gethriel.jpg b/modules/ROOT/images/uploadcare/filters/gethriel.jpg
new file mode 100644
index 0000000000..c517f14dd6
Binary files /dev/null and b/modules/ROOT/images/uploadcare/filters/gethriel.jpg differ
diff --git a/modules/ROOT/images/uploadcare/filters/iorill.jpg b/modules/ROOT/images/uploadcare/filters/iorill.jpg
new file mode 100644
index 0000000000..ecd21fa877
Binary files /dev/null and b/modules/ROOT/images/uploadcare/filters/iorill.jpg differ
diff --git a/modules/ROOT/images/uploadcare/filters/iothari.jpg b/modules/ROOT/images/uploadcare/filters/iothari.jpg
new file mode 100644
index 0000000000..f882fde0e6
Binary files /dev/null and b/modules/ROOT/images/uploadcare/filters/iothari.jpg differ
diff --git a/modules/ROOT/images/uploadcare/filters/iselva.jpg b/modules/ROOT/images/uploadcare/filters/iselva.jpg
new file mode 100644
index 0000000000..ebaea56bf7
Binary files /dev/null and b/modules/ROOT/images/uploadcare/filters/iselva.jpg differ
diff --git a/modules/ROOT/images/uploadcare/filters/jadis.jpg b/modules/ROOT/images/uploadcare/filters/jadis.jpg
new file mode 100644
index 0000000000..869ba89dab
Binary files /dev/null and b/modules/ROOT/images/uploadcare/filters/jadis.jpg differ
diff --git a/modules/ROOT/images/uploadcare/filters/lavra.jpg b/modules/ROOT/images/uploadcare/filters/lavra.jpg
new file mode 100644
index 0000000000..ba1e65224f
Binary files /dev/null and b/modules/ROOT/images/uploadcare/filters/lavra.jpg differ
diff --git a/modules/ROOT/images/uploadcare/filters/misiara.jpg b/modules/ROOT/images/uploadcare/filters/misiara.jpg
new file mode 100644
index 0000000000..e5a906c863
Binary files /dev/null and b/modules/ROOT/images/uploadcare/filters/misiara.jpg differ
diff --git a/modules/ROOT/images/uploadcare/filters/namala.jpg b/modules/ROOT/images/uploadcare/filters/namala.jpg
new file mode 100644
index 0000000000..6a811bd9e4
Binary files /dev/null and b/modules/ROOT/images/uploadcare/filters/namala.jpg differ
diff --git a/modules/ROOT/images/uploadcare/filters/nerion.jpg b/modules/ROOT/images/uploadcare/filters/nerion.jpg
new file mode 100644
index 0000000000..6e93412ab2
Binary files /dev/null and b/modules/ROOT/images/uploadcare/filters/nerion.jpg differ
diff --git a/modules/ROOT/images/uploadcare/filters/nethari.jpg b/modules/ROOT/images/uploadcare/filters/nethari.jpg
new file mode 100644
index 0000000000..6322d53ec3
Binary files /dev/null and b/modules/ROOT/images/uploadcare/filters/nethari.jpg differ
diff --git a/modules/ROOT/images/uploadcare/filters/pamaya.jpg b/modules/ROOT/images/uploadcare/filters/pamaya.jpg
new file mode 100644
index 0000000000..0933f04f28
Binary files /dev/null and b/modules/ROOT/images/uploadcare/filters/pamaya.jpg differ
diff --git a/modules/ROOT/images/uploadcare/filters/sarnar.jpg b/modules/ROOT/images/uploadcare/filters/sarnar.jpg
new file mode 100644
index 0000000000..d075c3b181
Binary files /dev/null and b/modules/ROOT/images/uploadcare/filters/sarnar.jpg differ
diff --git a/modules/ROOT/images/uploadcare/filters/sedis.jpg b/modules/ROOT/images/uploadcare/filters/sedis.jpg
new file mode 100644
index 0000000000..f1cb5decd7
Binary files /dev/null and b/modules/ROOT/images/uploadcare/filters/sedis.jpg differ
diff --git a/modules/ROOT/images/uploadcare/filters/sewen.jpg b/modules/ROOT/images/uploadcare/filters/sewen.jpg
new file mode 100644
index 0000000000..3b86f468ae
Binary files /dev/null and b/modules/ROOT/images/uploadcare/filters/sewen.jpg differ
diff --git a/modules/ROOT/images/uploadcare/filters/sorahel.jpg b/modules/ROOT/images/uploadcare/filters/sorahel.jpg
new file mode 100644
index 0000000000..16c8695ee0
Binary files /dev/null and b/modules/ROOT/images/uploadcare/filters/sorahel.jpg differ
diff --git a/modules/ROOT/images/uploadcare/filters/sorlen.jpg b/modules/ROOT/images/uploadcare/filters/sorlen.jpg
new file mode 100644
index 0000000000..4c19b65ba0
Binary files /dev/null and b/modules/ROOT/images/uploadcare/filters/sorlen.jpg differ
diff --git a/modules/ROOT/images/uploadcare/filters/tarian.jpg b/modules/ROOT/images/uploadcare/filters/tarian.jpg
new file mode 100644
index 0000000000..69d77aed69
Binary files /dev/null and b/modules/ROOT/images/uploadcare/filters/tarian.jpg differ
diff --git a/modules/ROOT/images/uploadcare/filters/thellassan.jpg b/modules/ROOT/images/uploadcare/filters/thellassan.jpg
new file mode 100644
index 0000000000..c8518892f8
Binary files /dev/null and b/modules/ROOT/images/uploadcare/filters/thellassan.jpg differ
diff --git a/modules/ROOT/images/uploadcare/filters/varriel.jpg b/modules/ROOT/images/uploadcare/filters/varriel.jpg
new file mode 100644
index 0000000000..562ca4e481
Binary files /dev/null and b/modules/ROOT/images/uploadcare/filters/varriel.jpg differ
diff --git a/modules/ROOT/images/uploadcare/filters/varven.jpg b/modules/ROOT/images/uploadcare/filters/varven.jpg
new file mode 100644
index 0000000000..81a9d5e3f8
Binary files /dev/null and b/modules/ROOT/images/uploadcare/filters/varven.jpg differ
diff --git a/modules/ROOT/images/uploadcare/filters/vevera.jpg b/modules/ROOT/images/uploadcare/filters/vevera.jpg
new file mode 100644
index 0000000000..c767c7a91a
Binary files /dev/null and b/modules/ROOT/images/uploadcare/filters/vevera.jpg differ
diff --git a/modules/ROOT/images/uploadcare/filters/virkas.jpg b/modules/ROOT/images/uploadcare/filters/virkas.jpg
new file mode 100644
index 0000000000..b0d767b212
Binary files /dev/null and b/modules/ROOT/images/uploadcare/filters/virkas.jpg differ
diff --git a/modules/ROOT/images/uploadcare/filters/yedis.jpg b/modules/ROOT/images/uploadcare/filters/yedis.jpg
new file mode 100644
index 0000000000..2e671bc862
Binary files /dev/null and b/modules/ROOT/images/uploadcare/filters/yedis.jpg differ
diff --git a/modules/ROOT/images/uploadcare/filters/yllara.jpg b/modules/ROOT/images/uploadcare/filters/yllara.jpg
new file mode 100644
index 0000000000..bb359a8ec1
Binary files /dev/null and b/modules/ROOT/images/uploadcare/filters/yllara.jpg differ
diff --git a/modules/ROOT/images/uploadcare/filters/zatvel.jpg b/modules/ROOT/images/uploadcare/filters/zatvel.jpg
new file mode 100644
index 0000000000..776091f5ff
Binary files /dev/null and b/modules/ROOT/images/uploadcare/filters/zatvel.jpg differ
diff --git a/modules/ROOT/images/uploadcare/filters/zevcen.jpg b/modules/ROOT/images/uploadcare/filters/zevcen.jpg
new file mode 100644
index 0000000000..43644030f3
Binary files /dev/null and b/modules/ROOT/images/uploadcare/filters/zevcen.jpg differ
diff --git a/modules/ROOT/nav.adoc b/modules/ROOT/nav.adoc
index 7766e181be..06ebe6242f 100644
--- a/modules/ROOT/nav.adoc
+++ b/modules/ROOT/nav.adoc
@@ -239,7 +239,7 @@
 ** xref:editor-important-options.adoc[Integration options]
 ** xref:editor-size-options.adoc[Size]
 ** xref:editor-save-and-submit.adoc[Save and submit]
-** xref:editor-premium-upgrade-promotion.adoc[Premium upgrade promotion]
+** xref:promotions.adoc[Promotions]
 * Interface
 ** Editor modes
 *** xref:use-tinymce-classic.adoc[Classic editing mode]
@@ -416,20 +416,10 @@
 ** xref:release-notes.adoc[Release notes for {productname}]
 *** {productname} 7.8.0
 **** xref:7.8.0-release-notes.adoc#overview[Overview]
-**** xref:7.8.0-release-notes.adoc#new-premium-plugin<s>[New Premium Plugin<s>]
-**** xref:7.8.0-release-notes.adoc#new-open-source-plugin<s>[New Open Source Plugin<s>]
 **** xref:7.8.0-release-notes.adoc#accompanying-premium-plugin-changes[Accompanying Premium Plugin changes]
-**** xref:7.8.0-release-notes.adoc#accompanying-premium-plugin-end-of-life-announcement[Accompanying Premium Plugin end-of-life announcement]
-**** xref:7.8.0-release-notes.adoc#accompanying-open-source-plugin-end-of-life-announcement[Accompanying Open Source Plugin end-of-life announcement]
-**** xref:7.8.0-release-notes.adoc#accompanying-enhanced-skins-and-icon-packs-changes[Accompanying Enhanced Skins & Icon Packs changes]
 **** xref:7.8.0-release-notes.adoc#improvements[Improvements]
 **** xref:7.8.0-release-notes.adoc#additions[Additions]
-**** xref:7.8.0-release-notes.adoc#changes[Changes]
-**** xref:7.8.0-release-notes.adoc#removed[Removed]
 **** xref:7.8.0-release-notes.adoc#bug-fixes[Bug fixes]
-**** xref:7.8.0-release-notes.adoc#security-fixes[Security fixes]
-**** xref:7.8.0-release-notes.adoc#deprecated[Deprecated]
-**** xref:7.8.0-release-notes.adoc#known-issues[Known issues]
 *** {productname} 7.7.2
 **** xref:7.7.2-release-notes.adoc#overview[Overview]
 **** xref:7.7.2-release-notes.adoc#bug-fixes[Bug fixes]
diff --git a/modules/ROOT/pages/7.7.0-release-notes.adoc b/modules/ROOT/pages/7.7.0-release-notes.adoc
index 2b6feb761b..189048e1e9 100644
--- a/modules/ROOT/pages/7.7.0-release-notes.adoc
+++ b/modules/ROOT/pages/7.7.0-release-notes.adoc
@@ -379,4 +379,4 @@ There one known issue in {productname} {release-version}.
 
 The Blockquote toolbar button tooltip does not display a translation for Hebrew. This issue affects users who rely on localized tooltips for accessibility and usability.
 
-**Status**: Currently under investigation.
\ No newline at end of file
+**Status**: This issue has been resolved in xref:7.8.0-release-notes.adoc#the-tooltip-for-the-blockquote-button-was-not-translated-in-hebrew[TinyMCE 7.8.0]
\ No newline at end of file
diff --git a/modules/ROOT/pages/7.8.0-release-notes.adoc b/modules/ROOT/pages/7.8.0-release-notes.adoc
index 699366d77b..34c8956819 100644
--- a/modules/ROOT/pages/7.8.0-release-notes.adoc
+++ b/modules/ROOT/pages/7.8.0-release-notes.adoc
@@ -11,183 +11,273 @@ include::partial$misc/admon-releasenotes-for-stable.adoc[]
 [[overview]]
 == Overview
 
-{productname} {release-version} was released for {enterpriseversion} and {cloudname} on Wednesday, April 04^nd^, 2025. These release notes provide an overview of the changes for {productname} {release-version}, including:
+{productname} {release-version} was released for {enterpriseversion} and {cloudname} on Wednesday, April 09^th^, 2025. These release notes provide an overview of the changes for {productname} {release-version}, including:
 
-* xref:new-premium-plugin<s>[New Premium plugin<s>]
-* xref:new-open-source-plugin<s>[New Open Source plugin<s>]
 * xref:accompanying-premium-plugin-changes[Accompanying Premium plugin changes]
-* xref:accompanying-premium-plugin-end-of-life-announcement[Accompanying Premium plugin end-of-life announcement]
-* xref:accompanying-open-source-plugin-end-of-life-announcement[Accompanying open source plugin end-of-life-announcement]
-* xref:accompanying-enhanced-skins-and-icon-packs-changes[Accompanying Enhanced Skins & Icon Packs changes]
 * xref:improvements[Improvements]
 * xref:additions[Additions]
-* xref:changes[Changes]
 * xref:bug-fixes[Bug fixes]
-* xref:security-fixes[Security fixes]
-* xref:deprecated[Deprecated]
-* xref:known-issues[Known issues]
 
 
-[[new-premium-plugin<s>]]
-New Premium plugin<s>
+[[accompanying-premium-plugin-changes]]
+== Accompanying Premium plugin changes
 
-The following new Premium plugin was released alongside {productname} {release-version}.
+The following premium plugin updates were released alongside {productname} {release-version}.
 
-=== <Premium plugin name>
+=== Enhanced Code Editor
 
-The new Premium plugin, **<Premium plugin name>** // description here.
+The {productname} {release-version} release includes an accompanying release of the **Enhanced Code Editor** premium plugin.
 
-For information on the **<Premium plugin name>** plugin, see xref:<plugincode>.adoc[<Premium plugin name>].
+**Enhanced Code Editor includes the following fix**.
 
+==== Source Code editor was not scrolling to the editor's caret position in Firefox.
+// #TINY-11811
 
-[[new-open-source-plugin]]
-== New Open Source plugin
+Previously, an issue was identified where the Enhanced Code Editor in Firefox did not automatically scroll to the caret's relative position within the editor. As a result, users were required to manually scroll to locate the corresponding element, leading to a suboptimal user experience.
 
-The following new Open Source plugin was released alongside {productname} {release-version}.
+With the release of {productname} {release-version}, this issue has been resolved. The Enhanced Code Editor in Firefox now exhibits consistent behavior with other browsers, automatically scrolling to the caret's position when the editor is opened. This enhancement significantly improves the user experience by eliminating the need for manual navigation.
 
-=== <Open source plugin name>
+For information on the **Enhanced Code Editor** plugin, see: xref:advcode.adoc[Enhanced Code Editor].
 
-The new open source plugin, **<Open source plugin name>** // description here.
+=== Comments
 
-For information on the **<Open source plugin name>** plugin, see xref:<plugincode>.adoc[<Open source plugin name>].
+The {productname} {release-version} release includes an accompanying release of the **Comments** premium plugin.
 
+**Comments** includes the following fix, addition and change.
 
-[[accompanying-premium-plugin-changes]]
-== Accompanying Premium plugin changes
+=== It wasn't possible to add comments to selected footnotes elements.
+// #TINY-11842
 
-The following premium plugin updates were released alongside {productname} {release-version}.
+In previous versions of {productname}, it was not possible to add comments to footnotes (created by the xref:footnotes.adoc[Footnotes] plugin) when selecting the footnote element.
+
+As a result, attempting to add a comment would result in the comment being attached to a word outside the footnote as they were not considered valid block elements.
+
+{productname} {release-version} addresses this issue. Comments can now be added directly to the entire footnote element, similar to how comments are handled for figures and other comparable elements.
+
+=== A confirmation dialog now appears when resolving conversation to match the UX of deleting a conversation.
+// #TINY-11324
+
+Previously, resolving a conversation did not trigger a confirmation dialog, unlike the behavior when deleting a conversation. Selecting *Resolve conversation* from the conversation kebab menu would immediately perform the action without user confirmation.
+
+{productname} {release-version} introduces a confirmation dialog for resolving conversations, ensuring a consistent user experience and helping prevent unintentional resolutions.
+
+=== The `change` event was not dispatched when deleting a comment reply.
+// #TINY-11830
+
+Previously, deleting a comment reply did not dispatch a `change` event, which prevented the {productname} Save plugin from detecting the editor as modified. As a result, the “Save” button remained disabled after deleting a reply, potentially leading to lost changes. This issue has been resolved in {release-version}. Deleting a comment reply now correctly triggers a dirty state, ensuring the Save plugin enables the “Save” button as expected.
+
+=== New `tinycomments_fetch_author_info` option that allows integrators to specify the current author info in callback mode.
+// #TINY-11680
+
+In {productname} {release-version}, a new `+tinycomments_fetch_author_info+` callback option has been introduced, enabling integrators to provide author information in callback mode. This enhancement ensures accurate author data is displayed in new conversation cards.
 
-=== <Premium plugin name 1> <Premium plugin name 1 version>
+For information on the **Comments** plugin, see: xref:introduction-to-tiny-comments.adoc[Introduction to {companyname} Comments].
 
-The {productname} {release-version} release includes an accompanying release of the **<Premium plugin name 1>** premium plugin.
+=== Export to Word
 
-**<Premium plugin name 1>** <Premium plugin name 1 version> includes the following <fixes, changes, improvements>.
+The {productname} {release-version} release includes an accompanying update to the **Export to Word** premium plugin.
 
-==== <Premium plugin name 1 change 1>
+==== Improved handling of relative URLs using `base_url` configuration for Export to Word
+// #TINY-11923
 
-// CCFR here.
+Previously, the `exportword` plugin converted relative URLs (e.g., `+/relative/url+`) into incorrect absolute URLs during export, causing hyperlinks in Word documents to direct users to unintended or non-existent destinations. This issue has been resolved. The plugin now correctly resolves relative URLs using the `base_url` configuration option, ensuring exported Word documents contain valid and functional hyperlinks.
 
-For information on the **<Premium plugin name 1>** plugin, see: xref:<plugincode>.adoc[<Premium plugin name 1>].
+For more information, see: xref:exportword.adoc[Export to Word].
 
+=== Export to PDF
 
-[[accompanying-premium-plugin-end-of-life-announcement]]
-== Accompanying Premium plugin end-of-life announcement
+The {productname} {release-version} release includes an accompanying update to the **Export to PDF** premium plugin.
 
-The following Premium plugin has been announced as reaching its end-of-life:
+==== Improved handling of relative URLs using `base_url` configuration for Export to PDF
+// #TINY-11923
 
-=== <Premium plugin name eol>
+The `exportpdf` plugin previously transformed relative URLs (e.g., `+/relative/url+`) into incorrect absolute URLs, resulting in broken or misdirected links in exported PDF documents. This issue has been addressed. The plugin now uses the `base_url` configuration option to correctly resolve relative URLs, ensuring that links in exported PDFs lead to the correct destinations.
 
-{productname}’s xref:<plugincode>.adoc[<Premium plugin name eol>] plugin will be deactivated on <month> <DD>, <YYYY>, and is no longer available for purchase.
+For more information, see: xref:exportpdf.adoc[Export to PDF].
 
+=== Image Optimizer (Powered by Uploadcare)
 
-[[accompanying-open-source-plugin-end-of-life-announcement]]
-== Accompanying open source plugin end-of-life announcement
+The {productname} {release-version} release includes an accompanying release of the **Image Optimizer (Powered by Uploadcare)** premium plugin.
 
-The following open source plugin has been announced as reaching its end-of-life:
+**Image Optimizers** includes the following fixes and addition.
 
-=== <Open source plugin name eol>
+=== Added support for `+uploadcare_filters+` option in the Image Optimizer (Powered by Uploadcare) plugin
+// #EPIC-146
 
-{productname}’s xref:<plugincode>.adoc[<Open source plugin name eol>] plugin will be deactivated on <month> <DD>, <YYYY>, and is no longer available for purchase.
+The **Image Optimizer (Powered by Uploadcare)** plugin now includes support for a new configuration option, `+uploadcare_filters+`, introduced in {release-version}. This option allows integrators to define a customizable list of image filters available within the **Image Optimizer (Powered by Uploadcare)** dialog. Each filter can be configured with an optional `amount` parameter, controlling the intensity of the effect, and an optional `label` to customize its display name in the UI.
 
+.Example
+[source,js]
+----
+tinymce.init({
+  selector: "textarea",
+  plugins: 'uploadcare',
+  toolbar: 'uploadcare',
+  uploadcare_public_key: '<your-public-key>',
+  uploadcare_filters: [
+    { name: 'none' },
+    { name: 'adaris', amount: -100, label: 'Vintage Fade' },
+    { name: 'adaris', amount: 0, label: 'Base' },
+    { name: 'adaris', amount: 100, label: 'Standard' },
+    { name: 'zevcen', amount: 200, label: 'Glow Boost' }
+  ]
+});
+----
 
-[[accompanying-enhanced-skins-and-icon-packs-changes]]
-== Accompanying Enhanced Skins & Icon Packs changes
+==== Dragging and dropping image files onto the placeholder was not possible if the files had the correct extension but an incorrect MIME type.
+// #TINY-11842
 
-The {productname} {release-version} release includes an accompanying release of the **Enhanced Skins & Icon Packs**.
+In previous versions of the **Image Optimizer (Powered by Uploadcare)** plugin, dragging and dropping supported image files onto the placeholder could fail due to inconsistent file type detection. The issue occurred because only the MIME type or the file extension was checked, resulting in discrepancies when handling certain image files.
 
-=== Enhanced Skins & Icon Packs
+{productname} {release-version} resolves this issue by updating file type detection to consider both the MIME type and the file extension when verifying supported formats. This enhancement ensures more reliable and consistent behavior when dragging and dropping image files.
 
-The **Enhanced Skins & Icon Packs** release includes the following updates:
+=== Non-uploadcare image URLs would be altered by color adjustments even when they failed to upload.
+// #TINY-11761
 
-The **Enhanced Skins & Icon Packs** were rebuilt to pull in the changes also incorporated into the default {productname} {release-version} skin, Oxide.
+Previously, applying color filters to images that had not yet been successfully uploaded to Uploadcare could result in broken image links if the server returned an error. This occurred because the original image was modified before confirming a successful upload. With this update, {productname} now preserves the original image until a successful upload is completed, ensuring that image functionality remains intact even if an upload fails. This change improves the reliability of the image upload and editing workflow in {release-version}.
 
-For information on using Enhanced Skins & Icon Packs, see: xref:enhanced-skins-and-icon-packs.adoc[Enhanced Skins & Icon Packs].
+==== Keyboard navigation between toolbars no longer loses focus.
+// #TINY-11880
+
+In previous versions of **Image Optimizer (Powered by Uploadcare)** plugin, navigating between toolbars and sub toolbars could cause the toolbar focus state to be lost. This issue required users to press `+Ctrl+F9+` to manually restore focus to the context toolbar, disrupting keyboard navigation workflows. {productname} {release-version} addresses this issue, by updating the focus handling using new sub toolbar APIs, ensuring that focus is now properly retained when moving between toolbars and sub toolbars. This improvement enhances accessibility and allows users to navigate the toolbar system more efficiently.
+
+==== Placeholder element is now responsive and adjusts to the container's width.
+// #TINY-11958
+
+Previously, in **Image Optimizer**, the image placeholder had a fixed width, which prevented it from being responsive to different screen or container sizes. This limitation caused visual issues when the placeholder was placed inside small containers (e.g. table cells, small editors), resulting in layout inconsistencies.
+
+With the release of {productname} {release-version}, this issue has been resolved. The image placeholder styles have been updated to ensure full responsiveness, allowing it to adapt seamlessly to small containers without any visual issues.
+
+For information on the **Image Optimizer (Powered by Uploadcare)** plugin, see xref:uploadcare.adoc[Image Optimizer (Powered by Uploadcare)].
 
 
 [[improvements]]
 == Improvements
 
-{productname} {release-version} also includes the following improvement<s>:
-
-=== <TINY-vwxyz 1 changelog entry>
-// #TINY-vwxyz1
+{productname} {release-version} also includes the following improvements:
 
-// CCFR here.
+=== The focus outline was misaligned with the comment card border after saving an edited comment.
+// #TINY-11329
 
+In previous versions of {productname}, the keyboard focus styles were not properly aligned with the comment card during the process of saving an edited comment, resulting in a poor user interface.
 
-[[additions]]
-== Additions
+{productname} {release-version} addresses this by adjusting the focus styles, ensuring a more polished user interface while saving an edited comment.
 
-{productname} {release-version} also includes the following addition<s>:
+=== The `+editor.selection.scrollIntoView()+` method now pads the target scroll area with a small margin, ensuring content doesn't sit at the very edge of the viewport.
+// #TINY-11786
 
-=== <TINY-vwxyz 1 changelog entry>
-// #TINY-vwxyz1
+Previously, when cycling through accessibility issues in the a11y checker dialog, the highlighted content could appear aligned to the very edge of the viewport, making it difficult to identify and visually track. This behavior impacted usability by reducing the effectiveness of the a11y checker tool.
 
-// CCFR here.
+In {productname} {release-version}, the `+editor.selection.scrollIntoView()+` method was updated to include a top and bottom margin, aligning the highlighted content to a fixed `30px` from the edge of the viewport. Additionally, a visual overlay was introduced to draw attention to the selected element. These changes improve visibility, provide smoother and more intuitive scroll positioning, and enhance the overall user experience when navigating accessibility issues in {productname}.
 
 
-[[changes]]
-== Changes
+[[additions]]
+== Additions
 
-{productname} {release-version} also includes the following change<s>:
+{productname} {release-version} also includes the following additions:
 
-=== <TINY-vwxyz 1 changelog entry>
-// #TINY-vwxyz1
+=== New subtoolbar support for context toolbars.
+// #TINY-11748
 
-// CCFR here.
+{productname} {release-version} introduces support for multi-level context toolbars, enabling more advanced and interactive editing experiences directly within the editor interface. Previously, developers had to manually configure separate toolbars and manage transitions between them using predicate logic. This release simplifies that process by adding a new API for defining and navigating subtoolbars, similar to the existing context form functionality.
 
+A new `+navigateback+` button streamlines navigation between toolbar levels, while improved focus management ensures input fields are automatically focused when switching toolbars. These enhancements provide a more flexible, intuitive, and responsive workflow for both developers and end users.
 
-[[removed]]
-== Removed
+.Example of a multi-level context toolbar configuration:
+[source, js]
+----
+tinymce.init({
+  selector: 'textarea',
+  height: 350,
+  setup: (editor) => {
+    editor.ui.registry.addContextToolbar('bar', {
+      predicate: () => true,
+      items: 'bold italic | undo redo | subbar1',
+      position: 'line',
+      scope: 'editor'
+    });
 
-{productname} {release-version} also includes the following removal<s>:
+    editor.ui.registry.addContextToolbar('subbar1', {
+      launch: { text: 'Subbar 1' },
+      items: 'navigateback bold italic | undo redo | subbar2'
+    });
 
-=== <TINY-vwxyz 1 changelog entry>
-// #TINY-vwxyz1
+    editor.ui.registry.addContextToolbar('subbar2', {
+      launch: { text: 'Subbar 2' },
+      items: 'navigateback bold italic | undo redo | subbar3'
+    });
 
-// CCFR here.
+    editor.ui.registry.addContextToolbar('subbar3', {
+      launch: { text: 'Subbar 3' },
+      items: 'navigateback bold italic | undo redo'
+    });
+  }
+});
+----
 
+For more information on context toolbars, see xref:contexttoolbar.adoc[Context toolbars].
 
-[[bug-fixes]]
-== Bug fixes
+=== New `extended_mathml_attributes` and `extended_mathml_elements` options.
+// #TINY-11756
 
-{productname} {release-version} also includes the following bug fix<es>:
+To improve flexibility when working with MathML content, especially in cases where new attributes or elements are not yet supported by DOMPurify, two new configuration options have been introduced: xref:math.adoc#extended-mathml-elements[extended_mathml_elements] and xref:math.adoc#extended-mathml-attributes[extended_mathml_attributes].
 
-=== <TINY-vwxyz 1 changelog entry>
-// #TINY-vwxyz1
+Prior to {release-version}, MathML elements and attributes were treated the same as all other content, with no special handling for MathML-specific structures. As a result, unsupported elements and attributes were either retained without validation or stripped without regard to their MathML context.
 
-// CCFR here.
+In {productname} {release-version}, MathML content is now filtered separately from general HTML using DOMPurify. As part of this change, support has been added to selectively allow specific elements and attributes *within* a `<math>` element using the new configuration options.
 
+The new options allow users to define lists of MathML elements and attributes that should be preserved, even if DOMPurify does not currently recognize them. This enables quicker user-side updates in response to evolving MathML specifications without disabling sanitization or waiting for upstream changes.
 
-[[security-fixes]]
-== Security fixes
+* **`+extended_mathml_elements+`**: allows a list of additional MathML elements to be preserved.
+* **`+extended_mathml_attributes+`**: allows a list of additional MathML attributes to be preserved.
 
-{productname} {release-version} includes <a fix | fixes for the following security issue<s>:
+These options apply only within MathML contexts and do not affect general HTML content. They enable use cases such as preserving `+<mn>+` elements and attributes like `linebreak` in MathML expressions.
 
-=== <TINY-vwxyz 1 changelog entry>
-// #TINY-vwxyz1
+.Example of MathML with preserved elements and attributes
+[source,js]
+----
+tinymce.init({
+  selector: "textarea",
+  extended_mathml_elements: [ "mn" ],
+  extended_mathml_attributes: [ "linebreak" ]
+});
+----
 
-// CCFR here.
+.Example of MathML with preserved elements and attributes
+[source,html]
+----
+<p>
+  <math xmlns="http://www.w3.org/1998/Math/MathML">
+    <mrow><mn>0.196</mn></mrow>
+    <mspace linebreak="newline"></mspace>
+    <mrow><mo>=</mo></mrow>
+    <mspace linebreak="newline"></mspace>
+    <mrow><mn>0.196</mn></mrow>
+  </math>
+</p>
+----
 
+=== New `onboarding` option
+// #TINY-11931
 
-[[deprecated]]
-== Deprecated
+{productname} {release-version} introduces a new `+onboarding+` option to enhance the developer experience during the 14-day trial period. This option controls the display of a cloud promotion banner highlighting paid features available during the trial. The banner is automatically hidden when the trial ends or when the editor is correctly configured, ensuring a smoother and less intrusive setup experience.
 
-{productname} {release-version} includes the following deprecation<s>:
+For more information, see xref:promotions.adoc#onboarding[onboarding].
 
-=== The `<plugin>` configuration property, `<name>`, has been deprecated
 
-// placeholder here.
+[[bug-fixes]]
+== Bug fixes
 
+{productname} {release-version} also includes the following bug fixes:
 
-[[known-issues]]
-== Known issues
+=== Setting editor height to a `pt` or `em` value was ignoring min/max height settings.
+// #TINY-11108
 
-This section describes issues that users of {productname} {release-version} may encounter and possible workarounds for these issues.
+Previously, when the editor height was set using relative units such as `pt` or `em`, the editor was unable to parse and evaluate these values correctly. As a result, it would bypass the `min_height` and `max_height` checks, leading to unpredictable layout behavior. This issue was especially noticeable during initialization, although resizing later used the browser-calculated content box height, which partially masked the problem.
 
-There <is one | are <number> known issue<s> in {productname} {release-version}.
+In {release-version}, {productname} now attempts to compute height values from additional unit types to better enforce minimum and maximum height constraints. Some units, such as percentages (`%`), may still override explicit height values due to browser limitations in determining the final rendered size. This update ensures that `min_height` and `max_height` settings are more reliably applied across a wider range of unit types.
 
-=== <TINY-vwxyz 1 changelog entry>
-// #TINY-vwxyz1
+=== The tooltip for the `blockquote` button was not translated in Hebrew.
+// #TINY-11732
 
-// CCFR here.
\ No newline at end of file
+Previously, the tooltip for the `blockquote` button was not translated in Hebrew. {productname} {release-version} addresses this by adding a new Hebrew translation to the tooltip for the `blockquote` button.
\ No newline at end of file
diff --git a/modules/ROOT/pages/changelog.adoc b/modules/ROOT/pages/changelog.adoc
index 1693572010..79485e0878 100644
--- a/modules/ROOT/pages/changelog.adoc
+++ b/modules/ROOT/pages/changelog.adoc
@@ -4,6 +4,30 @@
 
 NOTE: This is the {productname} Community version changelog. For information about the latest {cloudname} or {enterpriseversion} Release, see: xref:release-notes.adoc[{productname} Release Notes].
 
+== xref:7.8.0-release-notes.adoc[7.8.0 - 2025-04-9]
+
+=== Added
+* New subtoolbar support for context toolbars.
+// #TINY-11748
+* New `extended_mathml_attributes` and `extended_mathml_elements` options.
+// #TINY-11756
+* New `onboarding` option.
+// #TINY-11931
+
+=== Improved
+* Focus outline was misaligned with comment card border on saving an edit.
+// #TINY-11329
+* The `editor.selection.scrollIntoView()` method now pads the target scroll area with a small margin, ensuring content doesn't sit at the very edge of the viewport.
+// #TINY-11786
+
+=== Changed
+* Changed promotional text and link.
+// #TINY-11905
+
+=== Fixed
+* Setting editor height to a `pt` or `em` value was ignoring min/max height settings.
+// #TINY-11108
+
 == xref:7.7.2-release-notes.adoc[7.7.2 - 2025-03-19]
 
 === Fixed
diff --git a/modules/ROOT/pages/comments-callback-mode.adoc b/modules/ROOT/pages/comments-callback-mode.adoc
index f6aca219a1..85275ec9fc 100644
--- a/modules/ROOT/pages/comments-callback-mode.adoc
+++ b/modules/ROOT/pages/comments-callback-mode.adoc
@@ -15,10 +15,10 @@ All options accept functions incorporating `+done+` and `+fail+` callbacks as pa
 * The `+fail+` callback takes either a string or a JavaScript Error type.
 * The `+done+` callback takes an argument specific to each function.
 
-Most functions (create, reply, and edit) require an `+id+` identifying the *current author*.
+Most functions (create, reply, and edit) require an +id+ identifying the current author. This can be provided directly within the callbacks or dynamically via the `+tinycomments_fetch_author_info+` option.
 
 [NOTE]
-**Current author**: The {pluginname} plugin does not know the name of the current user. Determining the current user and storing the comment related to that user is required to be configured by the integrator.
+**Current author**: By default, the **Comments** plugin does not know the name of the current user. To display the correct author information when creating a new conversation, integrators can now use the `+tinycomments_fetch_author_info+` option to supply author details dynamically through a callback.
 
 During the initial editor load, the {pluginname} uses `+tinycomments_fetch+` callback to retrieve the existing conversations in the document. If not configured, the {pluginname} will fallback to `+tinycomments_lookup+`. 
 
@@ -27,8 +27,6 @@ When a user adds a comment or a reply, the {pluginname} plugin uses the `+tinyco
 [[comments-callback-live-demo]]
 == Interactive example
 
-The following example uses a simulated server (provided by link:https://netflix.github.io/pollyjs/[Polly.js]), which has been hidden from the example JavaScript to keep the example code concise. The interactions between {productname} and Polly.js are visible in the browser console.
-
 liveDemo::comments-callback[]
 
 == Options
@@ -63,11 +61,14 @@ include::partial$configuration/tinycomments_lookup.adoc[leveloffset=+1]
 
 * xref:tinycomments_resolve[`+tinycomments_resolve+`]
 * xref:tinycomments_fetch[`+tinycomments_fetch+`]
+* xref:tinycomments_fetch_author_info[`+tinycomments_fetch_author_info+`]
 
 include::partial$configuration/tinycomments_resolve.adoc[leveloffset=+1]
 
 include::partial$configuration/tinycomments_fetch.adoc[leveloffset=+1]
 
+include::partial$configuration/tinycomments_fetch_author_info.adoc[leveloffset=+1]
+
 include::partial$plugins/comments-open-sidebar.adoc[]
 
 include::partial$plugins/comments-highlighting-css.adoc[]
diff --git a/modules/ROOT/pages/contexttoolbar.adoc b/modules/ROOT/pages/contexttoolbar.adoc
index 8fb96d06e2..11a788416d 100644
--- a/modules/ROOT/pages/contexttoolbar.adoc
+++ b/modules/ROOT/pages/contexttoolbar.adoc
@@ -60,6 +60,34 @@ items: [
 ]
 ----
 
+[NOTE]
+For editors using 7.8.0+, context toolbars also support the `+navigateback+` button for multi-level toolbar navigation. This built-in button allows returning to the previous context toolbar when using nested toolbars.
+
+.Example of a multi-level context toolbar configuration:
+[source, js]
+----
+tinymce.init({
+  selector: 'textarea',
+  setup: (editor) => {
+    // Register the main context toolbar named 'bar'
+    editor.ui.registry.addContextToolbar('bar', {
+      predicate: () => true, // Always show the toolbar when triggered
+      items: 'bold italic | undo redo | subbar1', // Toolbar buttons and nested toolbar trigger
+      position: 'line',
+      scope: 'editor'
+    });
+
+    // Register a nested context toolbar named 'subbar1'
+    editor.ui.registry.addContextToolbar('subbar1', {
+      launch: { text: 'Subbar 1' }, // Button label that appears in the parent toolbar
+      items: 'navigateback bold italic | undo redo | subbar2' 
+      // 'navigateback' allows users to return to the previous toolbar
+      // 'subbar2' is another nested toolbar (can be defined similarly)
+    });
+  }
+});
+----
+
 liveDemo::context-toolbar-labels[height="600", tab="js"]
 
 == Launching a context toolbar programmatically
diff --git a/modules/ROOT/pages/editor-premium-upgrade-promotion.adoc b/modules/ROOT/pages/editor-premium-upgrade-promotion.adoc
deleted file mode 100644
index 866df90217..0000000000
--- a/modules/ROOT/pages/editor-premium-upgrade-promotion.adoc
+++ /dev/null
@@ -1,27 +0,0 @@
-= Premium upgrade promotion
-:navtitle: {productname} Premium upgrade promotion
-:description: Editor options related to turning the Premium promotion display off
-:keywords: upgrade, promotion, premium, button, lightning bolt
-
-include::partial$misc/premium-upgrade-promotion-option.adoc[]
-
-[[premium-upgrade-promotion-defaults]]
-=== Premium upgrade promotion defaults
-
-When the Community distribution of {productname} 6.2 is running as a self-hosted instance, an *Upgrade* promotion button appears in the unused corner of the editor menu bar by default. The button does not appear when Community distributions of {productname} are running on the {cloudname}.
-
-This promotion button redirects to a link:{companyurl}/tinymce-self-hosted-premium-features/[promotion page], showcasing the benefits of the variety of xref:plugins.adoc#premium-plugins[Premium Plugins] available for {productname}.
-
-When {productname} 6.2 or later is running as part of a Premium plan, the *Upgrade* promotion button is disabled. And it is disabled when running with a Premium plan whether {productname} is running in the {cloudname} or as a self-hosted instance.
-
-The {productname} Community distribution displays the promotion button when running as a self-hosted instance because the `promotion` option is set to `true` by default. To turn this button off in the Community distribution, set the `promotion` option to `false`.
-
-[source,js]
-----
-tinymce.init({
-  selector: "textarea",  // change this value according to your HTML
-  promotion: false
-});
-----
-
-IMPORTANT: It is not necessary to set `promotion` to `false` when {productname} is running as part of a Premium plan. Running {productname} as part of a Premium plan automatically disables the *Upgrade* promotion button.
diff --git a/modules/ROOT/pages/initial-configuration.adoc b/modules/ROOT/pages/initial-configuration.adoc
index acb77246f8..ee09416a28 100644
--- a/modules/ROOT/pages/initial-configuration.adoc
+++ b/modules/ROOT/pages/initial-configuration.adoc
@@ -29,7 +29,7 @@ Editor options related to saving or submitting editor content.
 
 |
 [.lead]
-xref:editor-premium-upgrade-promotion.adoc[Premium upgrade promotion]
+xref:promotions.adoc[Promotions]
 
 Editor options related to turning the Premium promotion display off.
 
diff --git a/modules/ROOT/pages/math.adoc b/modules/ROOT/pages/math.adoc
index 94046b7d90..4eaff473bb 100644
--- a/modules/ROOT/pages/math.adoc
+++ b/modules/ROOT/pages/math.adoc
@@ -72,6 +72,12 @@ include::partial$misc/plugin-toolbar-button-id-boilerplate.adoc[]
 
 include::partial$misc/plugin-menu-item-id-boilerplate.adoc[]
 
+== Options
+
+include::partial$configuration/extended_mathml_elements.adoc[leveloffset=+1]
+
+include::partial$configuration/extended_mathml_attributes.adoc[leveloffset=+1]
+
 == Commands
 
 The {pluginname} plugin provides the following {productname} commands.
diff --git a/modules/ROOT/pages/promotions.adoc b/modules/ROOT/pages/promotions.adoc
new file mode 100644
index 0000000000..0ff73b2229
--- /dev/null
+++ b/modules/ROOT/pages/promotions.adoc
@@ -0,0 +1,6 @@
+= Premium upgrade promotion
+:navtitle: {productname} Premium upgrade promotion
+:description: Editor options related to turning the Premium promotion display off
+:keywords: upgrade, promotion, premium, button, lightning bolt
+
+include::partial$misc/premium-upgrade-promotion-option.adoc[]
diff --git a/modules/ROOT/pages/uploadcare.adoc b/modules/ROOT/pages/uploadcare.adoc
index 4fb96f4648..0ca199ad62 100644
--- a/modules/ROOT/pages/uploadcare.adoc
+++ b/modules/ROOT/pages/uploadcare.adoc
@@ -108,24 +108,6 @@ Below is an overview of the features provided by the {pluginname} plugin for ima
 | image:icons/resize.svg[resize.svg]
 | Changes the size of the image.
 
-| Alt Text
-|
-| image:icons/alt-text.svg[alt-text.svg]
-| Adds alternative text to describe the image for accessibility purposes.
-
-|
-| Decorative Image
-| image:icons/image-decorative.svg[image-decorative.svg]
-a|
-Marks the image as decorative, indicating it doesn't require alternative text for accessibility.
-
-This icon will only appear when the `a11y_advanced_options` configuration option is enabled.
-
-| Caption
-|
-| image:icons/caption.svg[caption.svg]
-| Adds a caption below the image for additional context.
-
 | Adjust
 |
 | image:icons/adjustments.svg[adjustments.svg]
@@ -186,6 +168,29 @@ This icon will only appear when the `a11y_advanced_options` configuration option
 | image:icons/blur.svg[blur.svg]
 | Blurs the image.
 
+| Filters
+|
+| image:icons/auto-image-enhancement.svg[auto-image-enhancement.svg]
+| Provides tools for applying filters to the image.
+
+| Alt Text
+|
+| image:icons/alt-text.svg[alt-text.svg]
+| Adds alternative text to describe the image for accessibility purposes.
+
+|
+| Decorative Image
+| image:icons/image-decorative.svg[image-decorative.svg]
+a|
+Marks the image as decorative, indicating it doesn't require alternative text for accessibility.
+
+This icon will only appear when the `a11y_advanced_options` configuration option is enabled.
+
+| Caption
+|
+| image:icons/caption.svg[caption.svg]
+| Adds a caption below the image for additional context.
+
 | Revert
 |
 | image:icons/revert.svg[revert.svg]
@@ -206,6 +211,8 @@ include::partial$configuration/uploadcare_srcset_steps.adoc[leveloffset=+1]
 
 include::partial$configuration/uploadcare_store_type.adoc[leveloffset=+1]
 
+include::partial$configuration/uploadcare_filters.adoc[leveloffset=+1]
+
 :includedSection: uploadcarePlugin
 include::partial$configuration/a11y_advanced_options.adoc[leveloffset=+1]
 :!includedSection:
diff --git a/modules/ROOT/partials/configuration/extended_mathml_attributes.adoc b/modules/ROOT/partials/configuration/extended_mathml_attributes.adoc
new file mode 100644
index 0000000000..4fa359d062
--- /dev/null
+++ b/modules/ROOT/partials/configuration/extended_mathml_attributes.adoc
@@ -0,0 +1,57 @@
+[[extended-mathml-attributes]]
+== `+extended_mathml_attributes+`
+
+This option allows a specific list of additional MathML attributes to be preserved in the editor content, even if they are not included in the default DOMPurify allowlist. This setting only affects attributes used within MathML markup and has no effect on general HTML content.
+
+*Type:* `+Array+` of `+Strings+`
+
+*Default value:* `+[]+` (empty array)
+
+=== Example: using `+extended_mathml_attributes+`
+
+[source,js]
+----
+tinymce.init({
+  selector: 'textarea',
+  extended_mathml_attributes: [ 'linebreak', 'encoding' ]
+});
+----
+
+.Example of MathML with preserved attributes
+[source,html]
+----
+<p>
+  <math xmlns="http://www.w3.org/1998/Math/MathML">
+    <mrow linebreak="newline" encoding="utf8">
+      <mi>x</mi>
+      <mo>=</mo>
+      <mfrac>
+        <mrow>
+          <mo>&#x2212;</mo>
+          <mi>b</mi>
+          <mo>&#x00B1;</mo>
+          <msqrt>
+            <mrow>
+              <msup>
+                <mi>b</mi>
+                <mn>2</mn>
+              </msup>
+              <mo>&#x2212;</mo>
+              <mn>4</mn>
+              <mo>&#x2062;</mo>
+              <mi>a</mi>
+              <mo>&#x2062;</mo>
+              <mi>c</mi>
+            </mrow>
+          </msqrt>
+        </mrow>
+        <mrow>
+          <mn>2</mn>
+          <mo>&#x2062;</mo>
+          <mi>a</mi>
+        </mrow>
+      </mfrac>
+    </mrow>
+  </math>
+</p>
+----
\ No newline at end of file
diff --git a/modules/ROOT/partials/configuration/extended_mathml_elements.adoc b/modules/ROOT/partials/configuration/extended_mathml_elements.adoc
new file mode 100644
index 0000000000..f371c6e66a
--- /dev/null
+++ b/modules/ROOT/partials/configuration/extended_mathml_elements.adoc
@@ -0,0 +1,46 @@
+[[extended-mathml-elements]]
+== `+extended_mathml_elements+`
+
+This option allows a specific list of additional MathML elements to be preserved in the editor content, even if they are not included in the default DOMPurify allowlist. This setting only affects elements used within MathML markup and has no effect on general HTML content.
+
+*Type:* `+Array+` of `+Strings+`
+
+*Default value:* `+[]+` (empty array)
+
+=== Example: using `+extended_mathml_elements+`
+
+[source,js]
+----
+tinymce.init({
+  selector: 'textarea',
+  extended_mathml_elements: [ 'mn', 'mspace' ]
+});
+----
+
+.Example of MathML with preserved elements
+[source,html]
+----
+<p>
+  <math xmlns="http://www.w3.org/1998/Math/MathML">
+    <mrow>
+      <mi>a</mi>
+      <mo>=</mo>
+      <mfrac>
+        <mrow>
+          <mn>1</mn>
+          <mo>+</mo>
+          <mn>√2</mn>
+        </mrow>
+        <mn>3</mn>
+      </mfrac>
+      <mspace width="1em"></mspace>
+      <mo>&#x222A;</mo>
+      <mspace width="1em"></mspace>
+      <msup>
+        <mn>5</mn>
+        <mn>2</mn>
+      </msup>
+    </mrow>
+  </math>
+</p>
+----
\ No newline at end of file
diff --git a/modules/ROOT/partials/configuration/height.adoc b/modules/ROOT/partials/configuration/height.adoc
index d97f0b7198..aa0719e96b 100644
--- a/modules/ROOT/partials/configuration/height.adoc
+++ b/modules/ROOT/partials/configuration/height.adoc
@@ -3,7 +3,13 @@
 
 `+height+` sets the height of the entire editor, including the menu bar, toolbars, and status bar.
 
-NOTE: If a number is provided, {productname} sets the height in pixels. If a string is provided, {productname} assumes the value is valid CSS and sets the editor's height as the string value. This allows for alternate units such as `+%+`, `+em+`, and `+vh+`.
+[NOTE]
+====
+* If a number is provided, {productname} sets the height in pixels by defult.
+* If a string is provided, {productname} assumes the value is valid CSS and sets the editor's height as the string value such as `+300px+`, `+50pt+`, or `+10em+`.
+
+Note: that values such as `+100%+`, `+10vh+` and `auto` are not currently supported.
+====
 
 *Type:* `+Number+` or `+String+`
 
diff --git a/modules/ROOT/partials/configuration/icon_list.adoc b/modules/ROOT/partials/configuration/icon_list.adoc
index d656230b70..f1588936fe 100644
--- a/modules/ROOT/partials/configuration/icon_list.adoc
+++ b/modules/ROOT/partials/configuration/icon_list.adoc
@@ -92,7 +92,7 @@
 | `+horizontal-rule+` | image:icons/horizontal-rule.svg[horizontal-rule.svg] | `+horizontal-rule.svg+`
 | `+huddle+` | image:icons/huddle.svg[huddle.svg] | `+huddle.svg+`
 | `+image-decorative+` | image:icons/image-decorative.svg[image-decorative.svg] | `+image-decorative.svg+`
-| `+image-enhancements+` | image:icons/image-enhancements.svg[image-enhancements.svg] | `+image-enhancements.svg+`
+| `+auto-image-enhancement+` | image:icons/auto-image-enhancement.svg[auto-image-enhancement.svg] | `+auto-image-enhancement.svg+`
 | `+image-options+` | image:icons/image-options.svg[image-options.svg] | `+image-options.svg+`
 | `+image+` | image:icons/image.svg[image.svg] | `+image.svg+`
 | `+import-word+` | image:icons/import-word.svg[import-word.svg] | `+import-word.svg+`
diff --git a/modules/ROOT/partials/configuration/onboarding.adoc b/modules/ROOT/partials/configuration/onboarding.adoc
new file mode 100644
index 0000000000..2e0b0952a2
--- /dev/null
+++ b/modules/ROOT/partials/configuration/onboarding.adoc
@@ -0,0 +1,21 @@
+[[onboarding]]
+== `+onboarding+`
+
+The cloud version of {productname} contains a promotion for paid features included in the 14-day trial. This promotion can be toggled on or off with the `+onboarding+` option.
+
+The promotion will automatically disappear when the trial ends.
+
+*Type:* `+Boolean+`
+
+*Default value:* `+true+` for cloud instances; otherwise `+false+`.
+
+*Possible values:* `+true+`, `+false+`
+
+.Example: using cloud `+onboarding+`
+[source,js]
+----
+tinymce.init({
+  selector: "textarea",  // change this value according to your HTML
+  onboarding: false
+});
+----
\ No newline at end of file
diff --git a/modules/ROOT/partials/configuration/promotion.adoc b/modules/ROOT/partials/configuration/promotion.adoc
index d1e54e82a4..f1dde7a210 100644
--- a/modules/ROOT/partials/configuration/promotion.adoc
+++ b/modules/ROOT/partials/configuration/promotion.adoc
@@ -1,7 +1,7 @@
 [[promotion]]
-== `+promotion+`
+== `+promotion+`  
 
-{productname} 6.2 and later includes the `promotion` option. It controls the presentation or otherwise of a Tiny-specific promotion button.
+The open source version of {productname} contains a promotion for paid features. This promotion can be toggled on or off with the `+promotion+` option.
 
 *Type:* `+Boolean+`
 
@@ -9,18 +9,11 @@
 
 *Possible values:* `+true+`, `+false+`
 
-See xref:editor-premium-upgrade-promotion.adoc#premium-upgrade-promotion-defaults[Premium upgrade promotion defaults] for details.
-
-=== Example: using `+promotion+`
-
+.Example: using open source `+promotion+`
 [source,js]
 ----
 tinymce.init({
   selector: "textarea",  // change this value according to your HTML
   promotion: true
 });
-----
-
-The *Upgrade* promotion appears in the unused corner of the {productname} menu bar. Consequently it does not appear if the menu bar is disabled.
-
-NOTE: The distribution-specific defaults are not fixed. Someone running {productname} as part of a Premium plan can turn this option on. And someone running the Community distribution of {productname} as a self-hosted instance can turn this option off.
+----
\ No newline at end of file
diff --git a/modules/ROOT/partials/configuration/tinycomments_fetch_author_info.adoc b/modules/ROOT/partials/configuration/tinycomments_fetch_author_info.adoc
new file mode 100644
index 0000000000..077409d53d
--- /dev/null
+++ b/modules/ROOT/partials/configuration/tinycomments_fetch_author_info.adoc
@@ -0,0 +1,65 @@
+[[tinycomments_fetch_author_info]]
+== `+tinycomments_fetch_author_info+`
+
+The {pluginname} plugin uses the `+tinycomments_fetch_author_info+` callback function to provide author details for comments displayed in the editor.
+
+This function is called whenever a comment is rendered, and it allows the editor to display the author’s name and avatar based on the current user.
+
+The `+tinycomments_fetch_author_info+` function is passed a `+done+` callback parameter.
+
+The function must call `+done+` with an object containing the following properties:
+
+* `+author+` (`+string+`): A unique identifier for the user.
+* `+authorName+` (`+string+`): The full name to display for the user. (`optional`)
+* `+authorAvatar+` (`+string+`): A URL pointing to the user's avatar image. (`optional`)
+
+.Example of `+tinycomments_fetch_author_info+` function
+[source,js]
+----
+const tinycomments_fetch_author_info = (done) => {
+  setTimeout(() => done({
+    author: currentUser.id, // Maps to the `author` field in the comment object
+    authorName: currentUser.fullName, // Maps to the `authorName` field in the comment object. (optional)
+    authorAvatar: currentUser.image, // Maps to the `authorAvatar` field in the comment object. (optional)
+  }), fakeDelay);
+};
+----
+
+.Example of `+tinycomments_fetch_author_info+` function with a custom author
+[source,js]
+----
+const currentUser = {
+  id: 'johnsmith',
+  name: 'John Smith',
+  fullName: 'John Smith',
+  description: 'Company Founder',
+  image: '{{imagesdir}}/users/johnsmith.png'
+};
+
+const tinycomments_fetch_author_info = (done) => {
+  fetch('https://example.api.com/currentUser')
+    .then(res => res.json())
+    .then(currentUser => {
+      done({
+        author: currentUser.id, // Maps to the `author` field in the comment object
+        authorName: currentUser.fullName, // Maps to the `authorName` field in the comment object. (optional)
+        authorAvatar: currentUser.image, // Maps to the `authorAvatar` field in the comment object. (optional)
+      });
+    });
+};
+
+tinymce.init({
+  selector: '#editor',
+  plugins: 'tinycomments',
+  tinycomments_mode: 'callback',
+  tinycomments_create: create_comment,
+  tinycomments_reply: reply_comment,
+  tinycomments_edit_comment: edit_comment,
+  tinycomments_delete: delete_comment_thread,
+  tinycomments_delete_all: delete_all_comment_threads,
+  tinycomments_delete_comment: delete_comment,
+  tinycomments_lookup: lookup_comment,
+  tinycomments_fetch: fetch_comments, // Optional callback
+  tinycomments_fetch_author_info: fetch_comments
+});
+----
\ No newline at end of file
diff --git a/modules/ROOT/partials/configuration/uploadcare_filters.adoc b/modules/ROOT/partials/configuration/uploadcare_filters.adoc
new file mode 100644
index 0000000000..cf430b2fb7
--- /dev/null
+++ b/modules/ROOT/partials/configuration/uploadcare_filters.adoc
@@ -0,0 +1,128 @@
+[[uploadcare-filters]]
+== `uploadcare_filters`
+
+The `+uploadcare_filters+` option defines the list of image filters available when using the {pluginname} plugin. Each filter applies a stylized image effect consistent with the visual design of the content and can be configured with an amount value to control its intensity. Filters enhance images by applying consistent styling, improving overall quality, and boosting user engagement.
+
+
+Each filter is defined as an object with the following properties:
+[source,js]
+----
+{
+  name: 'filterName', // Required: name of the filter to apply
+  amount: number, // Optional: strength of the filter (default = 100)
+  label: 'string' // Optional: custom name to display in the UI
+}
+----
+
+* `name`: A predefined filter identifier (e.g., adaris, zevcen, galen).
+* `amount`: The intensity of the filter effect, ranging from -100 to 200:
+** **0**: No effect (image stays original).
+** **0** to **100**: Gradually increases filter strength.
+** **100**: Default intensity (as the filter is designed).
+** **>100**: Exaggerates the effect.
+** **<0**: Inverts the filter effect (produces a "negative" version).
+* `label`: Optional display name for the filter in your UI. If omitted, it defaults to the name.
+
+=== Example: Setting `uploadcare_filters`
+
+[source,js]
+----
+tinymce.init({
+  selector: "textarea",
+  plugins: 'uploadcare',
+  toolbar: 'uploadcare',
+  uploadcare_public_key: '<your-public-key>',
+
+  // Define available Uploadcare image filters and their intensity levels
+  uploadcare_filters: [
+    { name: 'none' }, // No filter applied
+    { name: 'adaris', amount: -100 }, // Adaris with inverted effect (amount -100), label defaults to 'adaris'
+    { name: 'adaris', amount: -100, label: 'Vintage Fade' }, // Adaris with inverted effect (amount -100), label reads 'Vintage Fade'
+    { name: 'adaris', amount: 0, label: 'Base' }, // Adaris with neutral effect (amount 0), label reads 'Base'
+    { name: 'adaris', amount: 50, label: 'Light' }, // Adaris with light effect (amount 50), label reads 'Light'
+    { name: 'adaris', amount: 100, label: 'Standard' }, // Adaris with standard effect (amount 100), label reads 'Standard'
+    { name: 'adaris', amount: 200, label: 'Intense' }, // Adaris with intense effect (amount 200), label reads 'Intense'
+    { name: 'zevcen', amount: 200, label: 'Glow Boost' }, // Zevcen with intense effect (amount 200), label reads 'Glow Boost'
+    { name: 'galen', amount: 80, label: 'Soft Focus' }, // Galen with softening effect (amount 80), label reads 'Soft Focus'
+    { name: 'carris', amount: 120, label: 'Sharp Contrast' }, // Carris with high contrast (amount 120), label reads 'Sharp Contrast'
+    { name: 'ferand', amount: 60, label: 'Light Touch' }, // Ferand with light enhancement (amount 60), label reads 'Light Touch'
+    { name: 'sorahel', amount: -50, label: 'Night Mood' } // Sorahel with darkened effect (amount -50), label reads 'Night Mood'
+  ]
+});
+----
+
+[NOTE]
+====
+* Filter names must be selected from the supported set:
+** `adaris`, `briaril`, `calarel`, `carris`, `cynarel`, `cyren`, `elmet`, `elonni`, `enzana`, `erydark`, `fenralan`, `ferand`, `galen`, `gavin`, `gethriel`, `iorill`, `iothari`, `iselva`, `jadis`, `lavra`, `misiara`, `namala`, `nerion`, `nethari`, `pamaya`, `sarnar`, `sedis`, `sewen`, `sorahel`, `sorlen`, `tarian`, `thellassan`, `varriel`, `varven`, `vevera`, `virkas`, `yedis`, `yllara`, `zatvel`, `zevcen`.
+* If the amount is not set, it defaults to 100.
+* Some filters may behave unpredictably outside the 0–100 range.
+* Applying negative amount values inverts the filter, useful for creative effects.
+====
+
+=== Uploadcare Filter Previews
+
+Each image below represents a filter applied to the same source image.
+
+[cols="1,1,1,1", options="header"]
+|===
+|adaris |briaril |calarel |carris
+|image:uploadcare/filters/cynarel.jpg[adaris]
+|image:uploadcare/filters/briaril.jpg[briaril]
+|image:uploadcare/filters/calarel.jpg[calarel]
+|image:uploadcare/filters/carris.jpg[carris]
+
+|cynarel |cyren |elmet |elonni
+|image:uploadcare/filters/cynarel.jpg[cynarel]
+|image:uploadcare/filters/cyren.jpg[cyren]
+|image:uploadcare/filters/elmet.jpg[elmet]
+|image:uploadcare/filters/elonni.jpg[elonni]
+
+|enzana |erydark |fenralan |ferand
+|image:uploadcare/filters/enzana.jpg[enzana]
+|image:uploadcare/filters/erydark.jpg[erydark]
+|image:uploadcare/filters/fenralan.jpg[fenralan]
+|image:uploadcare/filters/ferand.jpg[ferand]
+
+|galen |gavin |gethriel |iorill
+|image:uploadcare/filters/galen.jpg[galen]
+|image:uploadcare/filters/gavin.jpg[gavin]
+|image:uploadcare/filters/gethriel.jpg[gethriel]
+|image:uploadcare/filters/iorill.jpg[iorill]
+
+|iothari |iselva |jadis |lavra
+|image:uploadcare/filters/iothari.jpg[iothari]
+|image:uploadcare/filters/iselva.jpg[iselva]
+|image:uploadcare/filters/jadis.jpg[jadis]
+|image:uploadcare/filters/lavra.jpg[lavra]
+
+|misiara |namala |nerion |nethari
+|image:uploadcare/filters/misiara.jpg[misiara]
+|image:uploadcare/filters/namala.jpg[namala]
+|image:uploadcare/filters/nerion.jpg[nerion]
+|image:uploadcare/filters/nethari.jpg[nethari]
+
+|pamaya |sarnar |sedis |sewen
+|image:uploadcare/filters/pamaya.jpg[pamaya]
+|image:uploadcare/filters/sarnar.jpg[sarnar]
+|image:uploadcare/filters/sedis.jpg[sedis]
+|image:uploadcare/filters/sewen.jpg[sewen]
+
+|sorahel |sorlen |tarian |thellassan
+|image:uploadcare/filters/sorahel.jpg[sorahel]
+|image:uploadcare/filters/sorlen.jpg[sorlen]
+|image:uploadcare/filters/tarian.jpg[tarian]
+|image:uploadcare/filters/thellassan.jpg[thellassan]
+
+|varriel |varven |vevera |virkas
+|image:uploadcare/filters/varriel.jpg[varriel]
+|image:uploadcare/filters/varven.jpg[varven]
+|image:uploadcare/filters/vevera.jpg[vevera]
+|image:uploadcare/filters/virkas.jpg[virkas]
+
+|yedis |yllara |zatvel |zevcen
+|image:uploadcare/filters/yedis.jpg[yedis]
+|image:uploadcare/filters/yllara.jpg[yllara]
+|image:uploadcare/filters/zatvel.jpg[zatvel]
+|image:uploadcare/filters/zevcen.jpg[zevcen]
+|===
\ No newline at end of file
diff --git a/modules/ROOT/partials/misc/premium-upgrade-promotion-option.adoc b/modules/ROOT/partials/misc/premium-upgrade-promotion-option.adoc
index fff022bc2d..f056248aaf 100644
--- a/modules/ROOT/partials/misc/premium-upgrade-promotion-option.adoc
+++ b/modules/ROOT/partials/misc/premium-upgrade-promotion-option.adoc
@@ -1,4 +1,7 @@
-[[premium-upgrade-promotion-option]]
-== Premium upgrade promotion option
+== Open source promotion
 
-include::partial$configuration/promotion.adoc[leveloffset=+1]
\ No newline at end of file
+include::partial$configuration/promotion.adoc[leveloffset=+1]
+
+== Cloud promotion
+
+include::partial$configuration/onboarding.adoc[leveloffset=+1]
\ No newline at end of file
diff --git a/modules/ROOT/partials/toolbar-button-ids/core-toolbar-buttons.adoc b/modules/ROOT/partials/toolbar-button-ids/core-toolbar-buttons.adoc
index c239685d09..f56e173f33 100644
--- a/modules/ROOT/partials/toolbar-button-ids/core-toolbar-buttons.adoc
+++ b/modules/ROOT/partials/toolbar-button-ids/core-toolbar-buttons.adoc
@@ -30,6 +30,7 @@ The `+fontsize+` and `+fontsizeinput+` toolbar buttons should not be placed in a
 |`+italic+` |Applies the italic format to the current selection.
 |`+language+` |Dropdown list with languages to apply to the selection. This button requires the xref:content-localization.adoc#content_langs[`+content_langs+` option].
 |`+lineheight+` |Dropdown list with line heights to apply to selection.
+|`+navigateback+` | Allows navigation between subtoolbar levels for multi-level toolbar configurations.
 |`+newdocument+` |Creates a new document.
 |`+outdent+` |Outdents the current list item or block element.
 |`+paste+` |Pastes the current clipboard into the editor.