diff --git a/Build/Changes.txt b/Build/Changes.txt
index d35acae73..f0a4f3178 100644
--- a/Build/Changes.txt
+++ b/Build/Changes.txt
@@ -33,7 +33,7 @@ UCD - (UCD)ARDET is an Encoding Detector Library
 
 
 ========================================================
-Current BETA/RC Version 5.21.511.(build_#) (2021-05-11)
+Current BETA/RC Version 5.21.512.(build_#) (2021-05-12)
 ========================================================
 
 --------------------------------------------------------
@@ -71,6 +71,7 @@ NEW:
 CHANGES:
 --------------------------------------------------------
 [.###.#]- .
+[.512.1]- Keep found initial common base default font in .ini.
 [.507.1]- Base64 Decoding: select source code-page for decoding.
 [.507.1]- Base64: default Encoding/Decoding based on current code-page
 [.427.1]- Color selection dialog: NP3 icon, positioning and dark-mode.
@@ -120,6 +121,7 @@ CHANGES:
 FIXES:
 --------------------------------------------------------
 [.###.#]- .
+[.512.1]- Slow line-break toggle.
 [.511.2]- TinyExpr: expr need not start with blank.
 [.511.2]- TinyExpr: UTF-8 to ANSI-CP-1252 conversion should yield invalid characters instead of blank or currency.
 [.511.1]- Space-width, avgchar-width and tab-width calculation.
diff --git a/Versions/build.txt b/Versions/build.txt
index 0cfbf0888..d00491fd7 100644
--- a/Versions/build.txt
+++ b/Versions/build.txt
@@ -1 +1 @@
-2
+1
diff --git a/Versions/day.txt b/Versions/day.txt
index c0556fb20..4d0e90cbc 100644
--- a/Versions/day.txt
+++ b/Versions/day.txt
@@ -1 +1 @@
-511
+512
diff --git a/res/Notepad3.exe.manifest.conf b/res/Notepad3.exe.manifest.conf
index 0d2856a1b..8e05c9561 100644
--- a/res/Notepad3.exe.manifest.conf
+++ b/res/Notepad3.exe.manifest.conf
@@ -3,7 +3,7 @@
   <assemblyIdentity
     name="Rizonesoft.Notepad3"
     processorArchitecture="*"
-    version="5.21.511.2"
+    version="5.21.512.1"
     type="win32"
   />
   <description>Notepad3 beta</description>
diff --git a/src/VersionEx.h b/src/VersionEx.h
index 5139d2b76..49ab18889 100644
--- a/src/VersionEx.h
+++ b/src/VersionEx.h
@@ -8,8 +8,8 @@
 #define SAPPNAME "Notepad3"
 #define VERSION_MAJOR 5
 #define VERSION_MINOR 21
-#define VERSION_REV 511
-#define VERSION_BUILD 2
+#define VERSION_REV 512
+#define VERSION_BUILD 1
 #define SCINTILLA_VER 502
 #define LEXILLA_VER 502
 #define ONIGURUMA_REGEX_VER 7.0.0
diff --git a/test/test_files/calculation/chinese.wording.s.issue.while.math.calculation (issue #3417).txt b/test/test_files/calculation/chinese.wording.s.issue.while.math.calculation (issue #3417).txt
new file mode 100644
index 000000000..472dc69b0
--- /dev/null
+++ b/test/test_files/calculation/chinese.wording.s.issue.while.math.calculation (issue #3417).txt	
@@ -0,0 +1,18 @@
+tip:
+"箱" in Chinese: means "box" in English;
+
+==========================================================wrong start==========================================================
+1箱6*3=48(the program regard it as 16*3=48, which is not expected;)
+1box6*3=3(the program regard it as 1*3=3, while not the same as above, also is not expected;)
+
+1箱:6*3=0.5(don't know why it's wrong with this format)
+1箱: 6*3=0.5(don't know why it's wrong with this format)
+==========================================================wrong end==========================================================
+
+==========================================================correct start==========================================================
+1箱 6*3=18
+1box 6*3=18
+1box:6*3=18(as above, this version of Chinese is expected to be correct)
+1box: 6*3=18(as above, this version of Chinese is expected to be correct)
+
+==========================================================correct end==========================================================