diff --git a/Build/Changes.txt b/Build/Changes.txt
index ac366f759..dad4043a8 100644
--- a/Build/Changes.txt
+++ b/Build/Changes.txt
@@ -32,7 +32,7 @@ UCD - (UCD)ARDET is an Encoding Detector Library
 
 
 ========================================================
-Current BETA/RC Version 5.21.218.(build_#) (2021-02-18)
+Current BETA/RC Version 5.21.219.(build_#) (2021-02-19)
 ========================================================
 
 --------------------------------------------------------
@@ -67,6 +67,8 @@ NEW:
 CHANGES:
 --------------------------------------------------------
 [.xxx.x]- .
+[.219.1]- Simple Line Comment Toggle handles each line separately (Line Edit after toggle will still set mode of 1st line = former behavior).
+[.219.1]- Menu move Line/Stream Comment items to Edit -> Selection top.
 [.218.1]- Find/Repl dialog - refactoring and minor fixes.
 [.213.1]- JSON5 enhancements to Scintilla's original JSON-Lexer.
 [.211.1]- Statusbar Selection-Info: switch to byte (instead of character) counting for huge files.
@@ -112,6 +114,9 @@ CHANGES:
 FIXES:
 --------------------------------------------------------
 [.xxx.x]- .
+[.219.1]- Do not move selection on search pattern change if in Replace-Dlg.
+[.219.1]- FJSON Lexer has comments enabled now.
+[.219.1]- F/R-Dialog - allow multi-line clipboard paste to Replace String combobox too.
 [.218.2]- F/R: fixes some issues around RegEx zero-length match/findings.
 [.218.1]- ReplaceAll. avoid busy loop (infinity) while replacing zero-length-match (RegExpr).
 [.218.1]- F/R dialog don't change selection by typing search pattern.
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 dc6f4a877..037ba9719 100644
--- a/Versions/day.txt
+++ b/Versions/day.txt
@@ -1 +1 @@
-218
+219
diff --git a/res/Notepad3.exe.manifest.conf b/res/Notepad3.exe.manifest.conf
index 06665dd08..d52be9b77 100644
--- a/res/Notepad3.exe.manifest.conf
+++ b/res/Notepad3.exe.manifest.conf
@@ -3,7 +3,7 @@
   <assemblyIdentity
     name="Notepad3"
     processorArchitecture="*"
-    version="5.21.218.2"
+    version="5.21.219.1"
     type="win32"
   />
   <description>Notepad3 rc</description>
diff --git a/src/VersionEx.h b/src/VersionEx.h
index 5d4c2c359..cd1c274a2 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 218
-#define VERSION_BUILD 2
+#define VERSION_REV 219
+#define VERSION_BUILD 1
 #define SCINTILLA_VER 446
 #define ONIGURUMA_REGEX_VER 6.9.6
 #define UCHARDET_VER 2018.09.27
diff --git a/test/test_files/StyleLexers/styleLexJSON/Sample_JSON.json b/test/test_files/StyleLexers/styleLexJSON/Sample_JSON (issue #3070).json
similarity index 100%
rename from test/test_files/StyleLexers/styleLexJSON/Sample_JSON.json
rename to test/test_files/StyleLexers/styleLexJSON/Sample_JSON (issue #3070).json
diff --git a/test/test_files/StyleLexers/styleLexTEXT/Find.since.certain_current.line.not.1st.line (issue #3107).txt b/test/test_files/StyleLexers/styleLexTEXT/Find.since.certain_current.line.not.1st.line (issue #3107).txt
new file mode 100644
index 000000000..c72f7f845
--- /dev/null
+++ b/test/test_files/StyleLexers/styleLexTEXT/Find.since.certain_current.line.not.1st.line (issue #3107).txt	
@@ -0,0 +1,22 @@
+1
+1
+1
+start
+1
+1
+start
+1
+1
+1
+start
+1
+1
+1
+start
+1
+1
+1
+end
+1
+1
+