diff --git a/.meteor/versions b/.meteor/versions
index 8a8883de7..3335c4531 100644
--- a/.meteor/versions
+++ b/.meteor/versions
@@ -89,7 +89,7 @@ modern-browsers@0.1.7
 modules@0.18.0
 modules-runtime@0.12.0
 momentjs:moment@2.29.1
-mongo@1.14.1
+mongo@1.14.5
 mongo-decimal@0.1.2
 mongo-dev-server@1.1.0
 mongo-id@1.0.8
diff --git a/client/components/activities/activities.jade b/client/components/activities/activities.jade
index d6e6bfbad..33a2378bd 100644
--- a/client/components/activities/activities.jade
+++ b/client/components/activities/activities.jade
@@ -42,7 +42,7 @@ template(name="addReactionPopup")
       span.add-comment-reaction(data-codepoint="#{codepoint}") !{codepoint}
 
 template(name="activity")
-  .activity
+  .activity(data-id=activity._id)
     +userAvatar(userId=activity.user._id)
     p.activity-desc
       span.activity-member
@@ -153,10 +153,10 @@ template(name="activity")
                 +editOrDeleteComment
 
         if($eq activity.activityType 'deleteComment')
-          | {{{_ 'activity-deleteComment' currentData.commentId}}}.
+          | {{{_ 'activity-deleteComment' activity.commentId}}}.
 
         if($eq activity.activityType 'editComment')
-          | {{{_ 'activity-editComment' currentData.commentId}}}.
+          | {{{_ 'activity-editComment' activity.commentId}}}.
       else
         //- if we are not in card mode we only display a summary of the comment
         if($eq activity.activityType 'addComment')
diff --git a/client/components/boards/boardBody.js b/client/components/boards/boardBody.js
index d52404a86..e0b3c5dd0 100644
--- a/client/components/boards/boardBody.js
+++ b/client/components/boards/boardBody.js
@@ -269,9 +269,10 @@ BlazeComponent.extendComponent({
 
   openNewListForm() {
     if (this.isViewSwimlanes()) {
-      this.childComponents('swimlane')[0]
-        .childComponents('addListAndSwimlaneForm')[0]
-        .open();
+      // The form had been removed in 416b17062e57f215206e93a85b02ef9eb1ab4902
+      // this.childComponents('swimlane')[0]
+      //   .childComponents('addListAndSwimlaneForm')[0]
+      //   .open();
     } else if (this.isViewLists()) {
       this.childComponents('listsGroup')[0]
         .childComponents('addListForm')[0]
diff --git a/client/components/lists/listBody.js b/client/components/lists/listBody.js
index 6cf1ebb4b..9d04d72b5 100644
--- a/client/components/lists/listBody.js
+++ b/client/components/lists/listBody.js
@@ -43,7 +43,6 @@ BlazeComponent.extendComponent({
     const position = this.currentData().position;
     const title = textarea.val().trim();
 
-    const formComponent = this.childComponents('addCardForm')[0];
     let sortIndex;
     if (position === 'top') {
       sortIndex = Utils.calculateIndex(null, firstCardDom).base;
@@ -51,6 +50,7 @@ BlazeComponent.extendComponent({
       sortIndex = Utils.calculateIndex(lastCardDom, null).base;
     }
 
+    const formComponent = this.cardFormComponent();
     const members = formComponent.members.get();
     const labelIds = formComponent.labels.get();
     const customFields = formComponent.customFields.get();
@@ -132,6 +132,16 @@ BlazeComponent.extendComponent({
     }
   },
 
+  cardFormComponent() {
+    for (const inlinedForm of this.childComponents('inlinedForm')) {
+      const [addCardForm] = inlinedForm.childComponents('addCardForm');
+      if (addCardForm) {
+        return addCardForm;
+      }
+    }
+    return null;
+  },
+
   scrollToBottom() {
     const container = this.firstNode();
     $(container).animate({
diff --git a/models/cards.js b/models/cards.js
index c95665934..ce67128f7 100644
--- a/models/cards.js
+++ b/models/cards.js
@@ -5,6 +5,7 @@ import {
   TYPE_LINKED_BOARD,
   TYPE_LINKED_CARD,
 } from '../config/const';
+import Attachments from './attachments';
 
 Cards = new Mongo.Collection('cards');
 
diff --git a/server/publications/boards.js b/server/publications/boards.js
index 695161946..6968e3d6c 100644
--- a/server/publications/boards.js
+++ b/server/publications/boards.js
@@ -5,6 +5,7 @@
 import Users from "../../models/users";
 import Org from "../../models/org";
 import Team from "../../models/team";
+import Attachments from '../../models/attachments';
 
 Meteor.publish('boards', function() {
   const userId = this.userId;