diff --git a/Versions/build.txt b/Versions/build.txt
index 91c5a6f44..c2f485878 100644
--- a/Versions/build.txt
+++ b/Versions/build.txt
@@ -1 +1 @@
-2643
+2644
diff --git a/res/Notepad3.exe.manifest.conf b/res/Notepad3.exe.manifest.conf
index e43308478..72ca35760 100644
--- a/res/Notepad3.exe.manifest.conf
+++ b/res/Notepad3.exe.manifest.conf
@@ -3,7 +3,7 @@
   <assemblyIdentity
     name="Notepad3"
     processorArchitecture="*"
-    version="5.19.919.2643"
+    version="5.19.920.2644"
     type="win32"
   />
   <description>Notepad3 BETA</description>
diff --git a/scintilla/src/AutoComplete.cxx b/scintilla/src/AutoComplete.cxx
index d042c19e6..3113fbd02 100644
--- a/scintilla/src/AutoComplete.cxx
+++ b/scintilla/src/AutoComplete.cxx
@@ -218,10 +218,12 @@ void AutoComplete::Move(int delta) {
 	const int count = lb->Length();
 	int current = lb->GetSelection();
 	current += delta;
+	// >>>>>>>>>>>>>>>   BEG NON STD SCI PATCH   >>>>>>>>>>>>>>>
 	if (current >= count)
 		current = (current == count ? 0 : count - 1);
 	if (current < 0)
 		current = (current == -1 ? count - 1 : 0);
+	// <<<<<<<<<<<<<<<   END NON STD SCI PATCH   <<<<<<<<<<<<<<<
 	lb->Select(current);
 }
 
diff --git a/scintilla/src/ScintillaBase.cxx b/scintilla/src/ScintillaBase.cxx
index 794ff91f0..eab8e08fc 100644
--- a/scintilla/src/ScintillaBase.cxx
+++ b/scintilla/src/ScintillaBase.cxx
@@ -157,12 +157,17 @@ int ScintillaBase::KeyCommand(unsigned int iMessage) {
 		case SCI_PAGEUP:
 			AutoCompleteMove(-ac.lb->GetVisibleRows());
 			return 0;
+		// >>>>>>>>>>>>>>>   BEG NON STD SCI PATCH   >>>>>>>>>>>>>>>
 		case SCI_VCHOME:
-			AutoCompleteMove(-5000);
+		case SCI_HOMEWRAP:
+		case SCI_VCHOMEWRAP:
+			AutoCompleteMove(-10000);
 			return 0;
 		case SCI_LINEEND:
-			AutoCompleteMove(5000);
+		case SCI_LINEENDWRAP:
+			AutoCompleteMove(10000);
 			return 0;
+		// <<<<<<<<<<<<<<<   END NON STD SCI PATCH   <<<<<<<<<<<<<<<
 		case SCI_DELETEBACK:
 			DelCharBack(true);
 			AutoCompleteCharacterDeleted();
diff --git a/src/Edit.c b/src/Edit.c
index cb8e40bc0..46dd3d663 100644
--- a/src/Edit.c
+++ b/src/Edit.c
@@ -7066,10 +7066,11 @@ bool EditAutoCompleteWord(HWND hwnd, bool autoInsert)
     // cppcheck-suppress constArgument
     SciCall_AutoCSetSeperator(sep[0]);
     SciCall_AutoCSetIgnoreCase(true);
-    //SendMessage(hwnd, SCI_AUTOCSETCASEINSENSITIVEBEHAVIOUR, (WPARAM)SC_CASEINSENSITIVEBEHAVIOUR_IGNORECASE, 0);
+    //~SciCall_AutoCSetCaseInsensitiveBehaviour(SC_CASEINSENSITIVEBEHAVIOUR_IGNORECASE);
     SciCall_AutoCSetChooseSingle(autoInsert);
     //~SciCall_AutoCSetOrder(SC_ORDER_PERFORMSORT); // already sorted
     SciCall_AutoCSetFillups(AutoCompleteFillUpChars);
+    //~SciCall_AutoCSetMulti(SC_MULTIAUTOC_EACH);
 
     ++iWListSize; // zero termination
     char* const pList = AllocMem(iWListSize, HEAP_ZERO_MEMORY);
diff --git a/src/SciCall.h b/src/SciCall.h
index 5a54b75f7..01ba48160 100644
--- a/src/SciCall.h
+++ b/src/SciCall.h
@@ -317,10 +317,12 @@ DeclareSciCallR0(AutoCActive, AUTOCACTIVE, bool)
 DeclareSciCallV0(AutoCComplete, AUTOCCOMPLETE)
 DeclareSciCallV0(AutoCCancel, AUTOCCANCEL)
 DeclareSciCallV1(AutoCSetIgnoreCase, AUTOCSETIGNORECASE, bool, flag)
+DeclareSciCallV1(AutoCSetCaseInsensitiveBehaviour, AUTOCSETCASEINSENSITIVEBEHAVIOUR, int, options)
 DeclareSciCallV1(AutoCSetSeperator, AUTOCSETSEPARATOR, char, seperator)
 DeclareSciCallV01(AutoCSetFillups, AUTOCSETFILLUPS, const char*, text)
 DeclareSciCallV1(AutoCSetChooseSingle, AUTOCSETCHOOSESINGLE, bool, flag)
 DeclareSciCallV1(AutoCSetOrder, AUTOCSETORDER, int, options)
+DeclareSciCallV1(AutoCSetMulti, AUTOCSETMULTI, int, options)
 DeclareSciCallV2(AutoCShow, AUTOCSHOW, DocPos, len, const char*, list)
 
 
diff --git a/src/VersionEx.h b/src/VersionEx.h
index b2ae34057..8b5c42755 100644
--- a/src/VersionEx.h
+++ b/src/VersionEx.h
@@ -7,8 +7,8 @@
 #define SAPPNAME "Notepad3"
 #define VERSION_MAJOR 5
 #define VERSION_MINOR 19
-#define VERSION_REV 919
-#define VERSION_BUILD 2643
+#define VERSION_REV 920
+#define VERSION_BUILD 2644
 #define SCINTILLA_VER 420
 #define ONIGURUMA_REGEX_VER 6.9.3
 #define UCHARDET_VER 2018.09.27