diff --git a/mac/Focalboard/Focalboard.entitlements b/mac/Focalboard/Focalboard.entitlements
index 85c03d7b4..a0463869a 100644
--- a/mac/Focalboard/Focalboard.entitlements
+++ b/mac/Focalboard/Focalboard.entitlements
@@ -8,7 +8,5 @@
 	<true/>
 	<key>com.apple.security.network.client</key>
 	<true/>
-	<key>com.apple.security.network.server</key>
-	<true/>
 </dict>
 </plist>
diff --git a/mac/Focalboard/Info.plist b/mac/Focalboard/Info.plist
index 2d7a7ed47..5146a0978 100644
--- a/mac/Focalboard/Info.plist
+++ b/mac/Focalboard/Info.plist
@@ -19,16 +19,20 @@
 	<key>CFBundleShortVersionString</key>
 	<string>0.6</string>
 	<key>CFBundleVersion</key>
-	<string>1</string>
+	<string>4</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.productivity</string>
 	<key>LSMinimumSystemVersion</key>
 	<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
+    <key>ITSAppUsesNonExemptEncryption</key>
+	<false/>
 	<key>NSAppTransportSecurity</key>
 	<dict>
 		<key>NSAllowsArbitraryLoads</key>
 		<true/>
 	</dict>
+    <key>NSHumanReadableCopyright</key>
+	<string>Copyright © 2021 Mattermost, Inc. All rights reserved.</string>
 	<key>NSMainStoryboardFile</key>
 	<string>Main</string>
 	<key>NSPrincipalClass</key>
diff --git a/webapp/package-lock.json b/webapp/package-lock.json
index f8dc5fdde..a052393d4 100644
--- a/webapp/package-lock.json
+++ b/webapp/package-lock.json
@@ -1,6 +1,6 @@
 {
 	"name": "focalboard",
-	"version": "0.5.0",
+	"version": "0.6.0",
 	"lockfileVersion": 1,
 	"requires": true,
 	"dependencies": {
@@ -1905,9 +1905,9 @@
 			}
 		},
 		"@types/estree": {
-			"version": "0.0.45",
-			"resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.45.tgz",
-			"integrity": "sha512-jnqIUKDUqJbDIUxm0Uj7bnlMnRm1T/eZ9N+AVMqhPgzrba2GhGG5o/jCTwmdPK709nEZsGoMzXEDUjcXHa3W0g=="
+			"version": "0.0.46",
+			"resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.46.tgz",
+			"integrity": "sha512-laIjwTQaD+5DukBZaygQ79K1Z0jb1bPEMRrkXSLjtCcZm+abyp5YbrqpSLzD42FwWW6gK/aS4NYpJ804nG2brg=="
 		},
 		"@types/graceful-fs": {
 			"version": "4.1.4",
@@ -3593,9 +3593,9 @@
 			"optional": true
 		},
 		"codemirror": {
-			"version": "5.58.1",
-			"resolved": "https://registry.npmjs.org/codemirror/-/codemirror-5.58.1.tgz",
-			"integrity": "sha512-UGb/ueu20U4xqWk8hZB3xIfV2/SFqnSLYONiM3wTMDqko0bsYrsAkGGhqUzbRkYm89aBKPyHtuNEbVWF9FTFzw=="
+			"version": "5.59.4",
+			"resolved": "https://registry.npmjs.org/codemirror/-/codemirror-5.59.4.tgz",
+			"integrity": "sha512-achw5JBgx8QPcACDDn+EUUXmCYzx/zxEtOGXyjvLEvYY8GleUrnfm5D+Zb+UjShHggXKDT9AXrbkBZX6a0YSQg=="
 		},
 		"codemirror-spell-checker": {
 			"version": "1.1.2",
@@ -4531,20 +4531,13 @@
 			}
 		},
 		"easymde": {
-			"version": "2.12.1",
-			"resolved": "https://registry.npmjs.org/easymde/-/easymde-2.12.1.tgz",
-			"integrity": "sha512-4cYP+tK/vU9/KuiUskKnF9EM+DTvBe77EKduEu+HDa+nfRVVphZM76gfz2BjrWv8vbTJLOFcwlJ/NJ6+SzMApQ==",
+			"version": "2.14.0",
+			"resolved": "https://registry.npmjs.org/easymde/-/easymde-2.14.0.tgz",
+			"integrity": "sha512-yQh3EF1amknaxDhXE1L28kwknREU8S19o01ki0t6Q8ThECCipXTOM3E/LL32Ia5D3AsCBRbC1/fT5tpLniVGuw==",
 			"requires": {
-				"codemirror": "^5.58.1",
+				"codemirror": "^5.59.2",
 				"codemirror-spell-checker": "1.1.2",
-				"marked": "^1.2.0"
-			},
-			"dependencies": {
-				"marked": {
-					"version": "1.2.9",
-					"resolved": "https://registry.npmjs.org/marked/-/marked-1.2.9.tgz",
-					"integrity": "sha512-H8lIX2SvyitGX+TRdtS06m1jHMijKN/XjfH6Ooii9fvxMlh8QdqBfBDkGUpMWH2kQNrtixjzYUa3SH8ROTgRRw=="
-				}
+				"marked": "^2.0.0"
 			}
 		},
 		"ecc-jsbn": {
@@ -4563,24 +4556,24 @@
 			"optional": true
 		},
 		"elliptic": {
-			"version": "6.5.3",
-			"resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.3.tgz",
-			"integrity": "sha512-IMqzv5wNQf+E6aHeIqATs0tOLeOTwj1QKbRcS3jBbYkl5oLAserA8yJTT7/VyHUYG91PRmPyeQDObKLPpeS4dw==",
+			"version": "6.5.4",
+			"resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.4.tgz",
+			"integrity": "sha512-iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ==",
 			"dev": true,
 			"requires": {
-				"bn.js": "^4.4.0",
-				"brorand": "^1.0.1",
+				"bn.js": "^4.11.9",
+				"brorand": "^1.1.0",
 				"hash.js": "^1.0.0",
-				"hmac-drbg": "^1.0.0",
-				"inherits": "^2.0.1",
-				"minimalistic-assert": "^1.0.0",
-				"minimalistic-crypto-utils": "^1.0.0"
+				"hmac-drbg": "^1.0.1",
+				"inherits": "^2.0.4",
+				"minimalistic-assert": "^1.0.1",
+				"minimalistic-crypto-utils": "^1.0.1"
 			},
 			"dependencies": {
 				"bn.js": {
-					"version": "4.11.9",
-					"resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.9.tgz",
-					"integrity": "sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==",
+					"version": "4.12.0",
+					"resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
+					"integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
 					"dev": true
 				}
 			}
@@ -13014,9 +13007,9 @@
 			"dev": true
 		},
 		"typo-js": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/typo-js/-/typo-js-1.1.0.tgz",
-			"integrity": "sha512-W3kLbx+ML9PBl5Bzso/lTvVxk4BCveSNAtQeht59FEtxCdGThmn6wSHA4Xq3eQYAK24NHdisMM4JmsK0GFy/pg=="
+			"version": "1.2.0",
+			"resolved": "https://registry.npmjs.org/typo-js/-/typo-js-1.2.0.tgz",
+			"integrity": "sha512-dELuLBVa2jvWdU/CHTKi2L/POYaRupv942k+vRsFXsM17acXesQGAiGCio82RW7fvcr7bkuD/Zj8XpUh6aPC2A=="
 		},
 		"union-value": {
 			"version": "1.0.1",