diff --git a/CHANGELOG.md b/CHANGELOG.md
index 639b82ee9..902ecad68 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,13 @@
+# 4.12.1
+
+This minor release contains a few bug fixes based on feedback we received and adjustments to prepare for the update to OnlyOffice 6.4.
+
+* We noticed that charts and tables in the Document and Presentation (early access) applications cause conflicts with the upcoming OnlyOffice update. They are now disabled until the next release.
+* We found that the button to export form results to a CryptPad sheet was empty so we added the missing text.
+* Several issues were reported with the Forms application and are now fixed. This patch will prevent conditional sections from losing their content (questions and conditions) while editing the form. The "max options" selector won't be displayed anymore when converting "checkbox" questions to other types. The first two lines of a "choice grid" weren't always registered when submitting a form and this patch fixes it for newly created choice grids.
+* Some calendars created with external tools couldn't be imported in CryptPad due to notifications settings. We've changed the "import" script to make sure the event could still be imported but without the problematic notification.
+* We've received conflicting feedback about the privacy settings in forms. In the existing system, the users had to untick a box to submit with their name but, depending on the context, it's not always a good solution to make a form result anonymous by default. Similarly submitting form results with the username by default isn't privacy-friendly. We implemented a new system to prompt users to choose between submitting anonymously or with their name (unless one of the options is disabled).
+
 # 4.12.0
 
 ## Goals
diff --git a/customize.dist/pages.js b/customize.dist/pages.js
index c53a7a78a..a493f8997 100644
--- a/customize.dist/pages.js
+++ b/customize.dist/pages.js
@@ -105,7 +105,7 @@ define([
     var imprintUrl = AppConfig.imprint && (typeof(AppConfig.imprint) === "boolean" ?
                         '/imprint.html' : AppConfig.imprint);
 
-    Pages.versionString = "v4.12.0";
+    Pages.versionString = "v4.12.1";
 
 
     // used for the about menu
diff --git a/package-lock.json b/package-lock.json
index 4e31acb53..5697225c2 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "cryptpad",
-  "version": "4.12.0",
+  "version": "4.12.1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 343353bb6..39bb0a312 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "cryptpad",
   "description": "realtime collaborative visual editor with zero knowlege server",
-  "version": "4.12.0",
+  "version": "4.12.1",
   "license": "AGPL-3.0+",
   "repository": {
     "type": "git",
diff --git a/www/common/translations/messages.de.json b/www/common/translations/messages.de.json
index 317f9dad2..9db594195 100644
--- a/www/common/translations/messages.de.json
+++ b/www/common/translations/messages.de.json
@@ -1423,5 +1423,7 @@
     "fc_openIn": "In {0} öffnen",
     "premiumOnly": "Die Erstellung neuer Dokumente in dieser Anwendung ist derzeit nur für Abonnenten auf {0} möglich. Dies ist eine experimentelle Anwendung für Testzwecke. Sie wird bald für jeden Benutzer auf {0} verfügbar sein.",
     "premiumAccess": "Als Abonnent auf {0} kannst du in dieser Anwendung neue Dokumente erstellen. Bitte beachte, dass es sich um eine experimentelle Anwendung handelt, der man noch keine wichtigen Daten anvertrauen sollte.",
-    "earlyAccessBlocked": "Diese Anwendung ist auf dieser Instanz noch nicht verfügbar"
+    "earlyAccessBlocked": "Diese Anwendung ist auf dieser Instanz noch nicht verfügbar",
+    "form_exportSheet": "In Tabelle exportieren",
+    "form_answerChoice": "Bitte wähle aus, wie du dieses Formular beantworten möchtest:"
 }
diff --git a/www/common/translations/messages.fr.json b/www/common/translations/messages.fr.json
index d78a7e018..a972426b4 100644
--- a/www/common/translations/messages.fr.json
+++ b/www/common/translations/messages.fr.json
@@ -1424,5 +1424,6 @@
     "fc_openIn": "Ouvrir avec {0}",
     "creation_new": "Créer : {0}",
     "premiumAccess": "En tant qu'abonné sur {0}, vous pouvez créer de nouveaux documents dans cette application en accès restreint. Veuillez noter qu'elle est expérimentale et qu'il n'est pas recommandé d'y stocker des données importantes.",
-    "form_exportSheet": "Exporter vers Tableur"
+    "form_exportSheet": "Exporter vers Tableur",
+    "form_answerChoice": "Veuillez choisir comment vous souhaitez répondre à ce formulaire :"
 }
diff --git a/www/common/translations/messages.json b/www/common/translations/messages.json
index 29631bff3..bfad627d7 100644
--- a/www/common/translations/messages.json
+++ b/www/common/translations/messages.json
@@ -1424,5 +1424,6 @@
     "premiumOnly": "Creating new documents in this application is currently limited to subscribers on {0}. This is an early-access experimental application for testing purposes. It will soon become available to everyone on {0}.",
     "earlyAccessBlocked": "This application is not available yet on this instance",
     "premiumAccess": "As a subscriber on {0}, you can create new documents in this early-access application. Please be aware that it is experimental and should not yet be trusted with important data.",
-    "form_exportSheet": "Export to Sheet"
+    "form_exportSheet": "Export to Sheet",
+    "form_answerChoice": "Please choose how you would like to answer this form:"
 }
diff --git a/www/form/inner.js b/www/form/inner.js
index cb8f56968..961cee634 100644
--- a/www/form/inner.js
+++ b/www/form/inner.js
@@ -3032,7 +3032,6 @@ define([
                 anonOffContent, false, {
                     input: { value: 0 },
                 });
-        Messages.form_answerChoice = "Please choose how you would like to answer this form: "; // XXX
         var radioContainer = h('div.cp-form-required-radio', [
             Messages.form_answerChoice,
             anonRadioOn,