diff --git a/Build/Changes.txt b/Build/Changes.txt
index 18672023f..e1cb4bcf2 100644
--- a/Build/Changes.txt
+++ b/Build/Changes.txt
@@ -33,7 +33,7 @@ SUP - (S)et(UP) / Installer Package
 
 
 =====================================================
-Current RC2 Version 5.20.719.(build_#) (2020-07-19)
+Current RC2 Version 5.20.721.(build_#) (2020-07-21)
 =====================================================
 
 -----------------------------------------------------
@@ -43,7 +43,7 @@ NEW:
 - changed grepWinNP3 icon (GRE).
 - Add Toolbar icon for grepWinNP3.
 - Configurable Zoom-Tooltip display timeout ([Settings2] ZoomTooltipTimeout=3200).
-- Add Install/Remove "Open with Notepad3" to Notepad3 Setup/Installer (SUP). 
+- Add Install/Remove "Open with Notepad3" to Notepad3 Setup/Installer (SUP).
 - Add additional Dark Theme "Sombra".
 - Strip first char: allow multi-selection.
 - Open default browser while clicking tooltip (hovering hyperlink).
@@ -56,6 +56,7 @@ NEW:
 -----------------------------------------------------
 CHANGES:
 -----------------------------------------------------
+- "grepWinNP3" About dialog wrapping long text (GRE).
 - Silent ignore write permissions missing on Inifile.
 - Replace non DPI Aware MessageBox for "Save on Close" by internal InfoBox
 - Set DirectWite (D2D) rendering technology as new default.
@@ -83,7 +84,7 @@ CHANGES:
 - Changed Default long-line wrap settings.
 - Remove spinning wait-cursor for text operations (may need reactivation for long operations).
 - Add filepath to message on file locking error.
-- Update grepWinNP3 (GRE) version 2.1.3.18 (2020-07-14).
+- Update grepWinNP3 (GRE) version 2.1.3.20 (2020-07-21).
 - Update Oniguruma Regex (ONI) engine version 6.9.6 (2020/07/05).
 - Update Scintilla Library (SCI) version 4.4.3 (2020/06/03).
 
@@ -97,6 +98,9 @@ ENHANCEMENT:
 -----------------------------------------------------
 FIXES:
 -----------------------------------------------------
+- TimeStamp handling.
+- Menu selection operation (disable w/o selection).
+- Move view to matching brace (even if outside current work area).
 - Ask before overriding read-only protected configuration file.
 - Respect read-only file attribute of .ini-settings-file (configuration).
 - Undo/redo empty selection redundancy.
@@ -162,8 +166,8 @@ NEW:
 -----------------------------------------------------
 - Executables and dll's are now signed.
 - Fix DPI scaling of Toolbar bitmaps (avoid slicing by rounding errors).
-- "Open with Notepad3" Right-Click in Explorer Context Menu (install/setup version). 
-- In About Resources: Data Sharing Service from https://workupload.com. 
+- "Open with Notepad3" Right-Click in Explorer Context Menu (install/setup version).
+- In About Resources: Data Sharing Service from https://workupload.com.
 - Automatic scrolling when dragging selected text near window edge (SCI).
 - break rectangular selection into multiple selection on end-of-lines (move caret).
 - Infos of screen/display/dpi for "Copy Version Info" button.
@@ -403,12 +407,12 @@ NEW:
 - ToolTip for Hyperlinks.
 - 2nd Solution to build a shared library (DLL) (C++ runtime & Scintilla) version of Notepad3.
 - Menu entry to mute MessageBox beeps.
-- Theme Menu to load exported styles "on the fly" (e.g.: "Dark" or "Obsidian") 
+- Theme Menu to load exported styles "on the fly" (e.g.: "Dark" or "Obsidian")
     Factory Default, Standard Settings, a Dark Theme.
 - Close Zoom Info Bubble after ~3 sec..
 - Recent History button in Toolbar.
 - [Settings2] key-values (internal) to control concurrent encoding detection.
-- 2nd Encoding-Detector "Mozilla's UCHARDET" concurrent to 
+- 2nd Encoding-Detector "Mozilla's UCHARDET" concurrent to
     CED (Google's Compact Encoding Detection).
 - Language selection in Main Menu .
 - Command line option [/Y] to search env PATH for relative filename (NLS: strings).
@@ -434,7 +438,7 @@ CHANGES:
 - Auto-Save after elevating user right.
 - Rework Chinese encoding (GBK,GB2312,GB18030) detection and selection.
 - Make international language menu (language independent).
-- Start dual encoding detectors in (thread) parallel for large files 
+- Start dual encoding detectors in (thread) parallel for large files
     (disabled, due to lack of performance profiling).
 - Support (internal) DevDebugMode.
 - Menu item "HighDPI Toolbar" -> "Toggle Toolbar".
@@ -454,7 +458,7 @@ CHANGES:
 -----------------------------------------------------
 ENHANCEMENT:
 -----------------------------------------------------
-- Allow customizable fileName-RegEx to extensionlist 
+- Allow customizable fileName-RegEx to extensionlist
 	( \rc$; = all filenames (incl. ext) which ends on 'rc').
 - Hand cursor coupled with indicator hover style only on modifier keys.
 - Allow indicator styling for Hyperlink hover rendering.
@@ -507,7 +511,7 @@ Version 5.19.108.1602 (8 January 2019)
 NEW:
 -----------------------------------------------------
 - Added initial "minipath.ini" to Visual Studio Project.
-- Read undefined MiniPath settings from Notepad3.ini 
+- Read undefined MiniPath settings from Notepad3.ini
     (Preferred language and Favorites directory).
 - MiniPath Multilingual support.
 - Handle zero-length lines in line-sorting algorithm.
@@ -526,7 +530,7 @@ CHANGES:
 - Optimized MiniPath resource file (icon/bitmap placement).
 - Enhanced MiniPath.
 - Small design change of MiniPath's Copy/Move dialog box.
-- Print option "Screen Colors" now prints with the same colors 
+- Print option "Screen Colors" now prints with the same colors
     used on screen including line numbers.
 - Changed behavior of removing duplicate lines (ignore EOL/EOF chars).
 - Line sorting: Move empty lines to end of selection (always, if not removed).
@@ -535,32 +539,32 @@ CHANGES:
 - Reorganization of Menus in more sub-menu to shorter the Menus Lists.
 - Show Zoom Percentage on magnification changes.
 - Tidy Notepad3.ini to remove all defaulted [Setting] items
-- Change Default settings to make the first experience of Notepad3 
+- Change Default settings to make the first experience of Notepad3
     more attractive...
-- Open Find/Replace: Use most recent search pattern instead of clipboard 
+- Open Find/Replace: Use most recent search pattern instead of clipboard
     (if selection eis empty)
 - Encoding affinity: UTF-8 instead of local ANSI code-page.
 - Replace dialog: tmp disable "mark all occ" in case of multi-line selection.
 - Adaptations for MS Visual Studio 2019 Preview.
-- Scintilla updated to 412. 
+- Scintilla updated to 412.
 
 -----------------------------------------------------
 FIXES:
 -----------------------------------------------------
-- Do not reset scroll-width tracking on saving file 
+- Do not reset scroll-width tracking on saving file
     (issue #539: https://github.com/rizonesoft/Notepad3/issues/539).
 - Fixed portable MiniPath redirector .ini files.
-- Support Scintilla's new indicator box styles 
+- Support Scintilla's new indicator box styles
     ("INDIC_GRADIENT" and "INDIC_CRADIENTCENTRE").
 - Fixed incremental search on find/replace dialog.
 - Fixed line sorting.
 - Center commandline help dialog.
-- In case of STD lexer only display "Default Text" in statusbar 
+- In case of STD lexer only display "Default Text" in statusbar
     (indicator shows which one).
 - Fixed resource file problem (preproc defines).
 - Fixed save window Position (Default and Initial switch)
 - Fixed problem with bad brace highlighting (indicator)
-- if activated, ESC will close/minimize program immediately 
+- if activated, ESC will close/minimize program immediately
     w/o canceling selection/tooltip first.
 - Fixed broken links in About dialog.
 - fixed behavior of replace (dialog) in case of multi-line selection.
@@ -618,7 +622,7 @@ CHANGES:
 - Focus View and Tail Function icons.
 - Disabling UpdateChecker menu entry if no executable is configured.
 - Adapted test to new Aboutbox calling.
-- Menu Help instead of "?" 
+- Menu Help instead of "?"
 - Move File History (Recent File List) to Accel-Key Ctrl+Alt+H.
 
 -----------------------------------------------------
@@ -630,7 +634,7 @@ ENHANCEMENT:
 - Notepad3.ini redirection to avoid overriding settings by zipped distribution.
 - Added last find pattern to file history.
 - Added option to remove blank lines (containing blanks/tabs only).
-- Added option to skip ANSI Code Page detection (tellenc) 
+- Added option to skip ANSI Code Page detection (tellenc)
     (default is ON to preserve historic behavior).
 - Added "Toggle View" button to toolbar.
 - Compress White Spaces within rectangular selection.
@@ -638,15 +642,15 @@ ENHANCEMENT:
 - Enable "Toggle View" for main window.
 - Enable "Customize Schemes" Preview button only
     if selected lexer corresponds to opened file.
-- External cmd tool using Google's "Compact Encoding Detection" 
+- External cmd tool using Google's "Compact Encoding Detection"
     for encoding analysis.
 - F/R dialog - enable "Ctrl+BS" to delete word in search string.
-- File history dependent last search pattern option combined 
+- File history dependent last search pattern option combined
     with search history on/off option.
 - Handling of F3 (find next - no F/R dialog).
-- Kind of "incremental search" : Find/Replace "Mark All Occ" active: 
+- Kind of "incremental search" : Find/Replace "Mark All Occ" active:
     typing search pattern scrolls to first match.
-- Make Find Next Selected, Find Prev Selected as expected 
+- Make Find Next Selected, Find Prev Selected as expected
     using modern Scintilla API methods (instead of hand made operation).
 - Int to DocPos type changes.
 - Indication of find/replace state in FR dialog status bar.
@@ -665,7 +669,7 @@ ENHANCEMENT:
 - Added user definable relative status width configuration.
 - Added settings to user defined prefix strings for StatusBar sections.
 - Delayed "Spinning Circle" transaction.
-- Added "Extra Line Spacing" style option to ANSI Art (e.g. .nfo files) 
+- Added "Extra Line Spacing" style option to ANSI Art (e.g. .nfo files)
     (predefined -4).
 - Minor speedup on notify changed event.
 
@@ -675,11 +679,11 @@ FIXES:
 - Memory leakage in selection undo/redo stack.
 - Remember initial search start position for incremental search.
 - Some .ini-file handling stuff.
-- Handling of "Mark Occ." and "Focused View" 
+- Handling of "Mark Occ." and "Focused View"
     in cooperation with find/replace dialog.
 - Select initial default standard lexer.
 - Missing document modified call.
-- Pad with Spaces in Rectangular Selection 
+- Pad with Spaces in Rectangular Selection
     (correction for pure virtual space and skip empty lines).
 - Renaming of UpdateChecker => Administration Tool.
 - Issue regarding selection of default and 2nd default styling.
@@ -688,7 +692,7 @@ FIXES:
 - Broken Hyperlink Hotspot handling.
 - Brace matching for Batch Lexer.
 - Y-CaretPolicy ([Settings2] CurrentLineVerticalSlop=0) default.
-- Show replacement count info-box after UI update 
+- Show replacement count info-box after UI update
     (extended selection, replaced pattern).
 - Issue regarding "Auto Complete Word" feature.
 - Slow pasting of multiline clipboard.
@@ -701,13 +705,13 @@ FIXES:
 - Reset scroll width on font (size) changes (automatically adapted).
 - Missing menu shortcut for "Remove Duplicate Lines" ("o").
 - "Remove Duplicate Lines": wrong last line handling in case of no selection.
-- Using process heap allocation instead of global memory allocation method 
+- Using process heap allocation instead of global memory allocation method
     (according to MSDN guidelines).
-- "Remove Duplicate Lines": skipping line on progress to next compare 
+- "Remove Duplicate Lines": skipping line on progress to next compare
     when removing previous duplicate.
 - Toggle line comment on empty line.
 - Issue in Strip First/Last Char within rectangular selection.
-- Update Toolbar,Statusbar and LinNumber Margin 
+- Update Toolbar,Statusbar and LinNumber Margin
     on Observe NotifyEvent reactivation.
 - Endless loop on "zero length match" at EOF.
 - Reverting file from storage - Preserve view, cancel selection.
@@ -725,7 +729,7 @@ FIXES:
 - "Compressed View": re-apply lexer styles on changed marked word.
 - Proper view reset after reverting from compressed view.
 - "Compressed View" - minor issues.
-- UTF-16 LE BOM (Unicode) for Notepad3.ini. - Notepad3.ini should have 
+- UTF-16 LE BOM (Unicode) for Notepad3.ini. - Notepad3.ini should have
     encoding UTF-16 LE BOM (Unicode) not the smaller UTF-8 Sig encoding format.
 - Scroll-to issue in case of incremental search.
 - Bug replacing reverse stream selection.
@@ -748,15 +752,15 @@ FIXES:
 - Toggle Folds of complete document.
 - Small issue reverting from "Focused View".
 - Correct WordWrap after reverting from "Focused view".
-- Small bug preventing Statusbar relative width settings 
+- Small bug preventing Statusbar relative width settings
     smaller than 1/10 of width.
 - Missing last entry of statusbar configuration (ID=11).
 - Bug while reading String to Vector.
-- Switching modes (EOL,OVR, some other), 
+- Switching modes (EOL,OVR, some other),
     statusbar has not been updated accordingly.
-- Deactivate "Focused View": set FoldingLevel to default 
+- Deactivate "Focused View": set FoldingLevel to default
     before applying Lexer's Style (-> speed-up).
-- RAII (__try/__finally) for target transactions and 
+- RAII (__try/__finally) for target transactions and
     notify changed observation guards.
 - StatusBar handling and display of "Default text" vs. "2nd Default Text".
 - Added parameter to force update of Stausbar (e.g. theme change).
@@ -805,7 +809,7 @@ NEW:
 -----------------------------------------------------
 CHANGES:
 -----------------------------------------------------
-- Accelerator Keys: (Alt+0: Toggle Transparency), 
+- Accelerator Keys: (Alt+0: Toggle Transparency),
     (Alt+Shift+N: Launch new empty window).
 - Added "tellenc" acknowledgement to About test.
 - Move "About..." dialog call to end of Help menu.
@@ -815,7 +819,7 @@ CHANGES:
 -----------------------------------------------------
 ENHANCEMENT:
 -----------------------------------------------------
-- Pressing F3 at Find/Replace dialog performs a find and 
+- Pressing F3 at Find/Replace dialog performs a find and
     switches focus to main window.
 
 -----------------------------------------------------
@@ -823,16 +827,16 @@ FIXES:
 -----------------------------------------------------
 - Activation of Undo TB-Icon on operations, that can't be undone.
 - Onigmo: use CR (\r) as mono line-break symbol too.
-- Format number with thousand seperator and digit grouping 
+- Format number with thousand seperator and digit grouping
     acording to regional settings.
 - Integration of "tellenc" encoding detection ideas.
-- Use Windows regional ANSI Code Page settings for fallback in case of file 
+- Use Windows regional ANSI Code Page settings for fallback in case of file
     encoding detection failure (instead of default encoding for created files).
 - Use all ASCII line breaks for line termination ($) meta char.
 - Onigmo backward search.
 - Consider "load 7-bit ASCII as UTF-8" settings on encoding detection.
 - Added BOM detection to encoding analysis.
-- Issue regarding hyperlink positioning of AboutBoy in case of 
+- Issue regarding hyperlink positioning of AboutBoy in case of
     none standard sytem font styling.
 - Swap clipboard while pasting into selection.
 
@@ -868,14 +872,14 @@ NEW:
 -----------------------------------------------------
 CHANGES:
 -----------------------------------------------------
-- Executables now compressed with NRV2E method. 
+- Executables now compressed with NRV2E method.
 - Scintilla version 4.0.3 and documentation update.
 - Adapted VS compiler version string for About dialog.
 - Change start of project on GitHub (date) to 2015 (Version.h).
 - Compiler optimization flags for release build.
-- Encoding type of Version.h from UTF-8 (Signature) to UTF-16 LE, 
+- Encoding type of Version.h from UTF-8 (Signature) to UTF-16 LE,
     to get Copyright sign right
-- Folding STyle: case:L/U for box vs. circle style; 
+- Folding STyle: case:L/U for box vs. circle style;
     charset:0/1/2 single line after/before/enclosing.
 - Registry files lexer to support eolfilled on "Added Keys".
 
@@ -912,7 +916,7 @@ FIXES:
 - Synchronized updates for Toolbar & Statusbar.
 - Empty settings string, if ToolbarButtons are reset to defaults.
 - Changed navigation keys for "Edit" menu.
-- Set virtual space option "SCVS_NOWRAPLINESTART" for 
+- Set virtual space option "SCVS_NOWRAPLINESTART" for
     Alt-Key down rectangular selection only.
 - Bug in calculating position for thousand separator.
 - Handle case: virtual space user access not allowed.
@@ -942,7 +946,7 @@ Version 3.18.131.862 (31 January 2018)
 -----------------------------------------------------
 NEW:
 -----------------------------------------------------
-- Accelerator Key "Ctrl+Alt+J" -> Fuse Lines 
+- Accelerator Key "Ctrl+Alt+J" -> Fuse Lines
     (:= Join Lines, line-breaks NOT replaced by Space).
 - Setting2 parameter to adjust "Mark Occ" and "Hyperlink" styling delay.
 
@@ -964,13 +968,13 @@ FIXES:
 - Join Lines (preserve paragraphs) issue.
 - Byte counting for selection.
 - Bug in joining lines algorithm.
-- Alt+H should open history file access dialog not help menu 
+- Alt+H should open history file access dialog not help menu
     (add ? to revert to known access key).
 - Revisit usage of "Mark Occurrences" and "Hyperlink Styling" delay usage.
 - Rectangular selection: (virtual empty) selection persists after clear.
 - Sentencecase some strings in "Customize Schemes...".
 - SpeedUp undo/redo action collections.
-- Lock NotifyUpdate and TargetSelection in case of multi action 
+- Lock NotifyUpdate and TargetSelection in case of multi action
     redo/undo and target replacements.
 - Handling of document modified flag in case of NotifyChange bypass.
 - Redo/undo and jump-to behavior having an active selection.
@@ -1008,14 +1012,14 @@ CHANGES:
 - Executables not compressed with UPX.
 - Menu "Mark Occurrences" whole word matching: radio button behavior.
 - Onigmo RegEx syntax dialect.
-- Onigmo regex engine: use PERL 5.10 syntax + 
+- Onigmo regex engine: use PERL 5.10 syntax +
     enable "\<" and "\>" word boundary matching.
 - Option "after visible" for styling in background (idle time).
 - Replace Windows Notepad Installer version only.
 - View "2nd Default Style" as (dbl-clickable) status bar item.
 - Word Wrap mode from WORD to SPACE to avoid wrapping at style change edges.
 - Force position progress in case of zero-length matches.
-- Re-introduce "max mark occurrence counter" to avoid lazy UI. 
+- Re-introduce "max mark occurrence counter" to avoid lazy UI.
     (Set .ini section [Settings2] MarkOccurrencesMaxCount=-1 for unlimited (MAX_INT)).
 
 -----------------------------------------------------
@@ -1032,7 +1036,7 @@ ENHANCEMENT:
 - Non visible styling during idle time.
 - Tuning delay parameter of "Mark Occurrences" (instantly).
 - Remove test for set already, if indicator does not change.
-- Redraw indicator ranges (Mark Occurrences) only if needed - 
+- Redraw indicator ranges (Mark Occurrences) only if needed -
     avoiding recursive SCN_UPDATEUI notifications.
 
 -----------------------------------------------------
@@ -1040,14 +1044,14 @@ FIXES:
 -----------------------------------------------------
 - Several Mark Occurrences (instantly) issues.
 - Regarding Scheme customizing (rel. size) and View Menu (Mark Occ.).
-- Onigmo regex engine PERL syntax: supporting named groups referencing 
+- Onigmo regex engine PERL syntax: supporting named groups referencing
     in replacement text.
 - Correct counting of found matches.
 - Broken find/replace (regex) on groups.
 - Some customizing scheme issues (relative font size hierarchy).
 - Document modified flag not set properly (title, toolbar & statusbar only).
 - Renaming menu entries Edit: "Clear" -> "Delete"
-- Menu "Mark Occurrences" whole word matching: add check indicator if 
+- Menu "Mark Occurrences" whole word matching: add check indicator if
     one of word matching options (selected/current) is used.
 - Regex replacement on look-ahead assertion.
 - relative font sizing of non-default-style entries in custom schemes.
@@ -1057,15 +1061,15 @@ FIXES:
 - Bug regarding "Reset" button in "Customizing Schemes..." dialog.
 - Bug in detect and style Hyperlink Hotspot.
 - Losing state of "Transform Backslashes" while switching regex/wildcard search.
-- Block "mark occurrences" event on transaction pair: 
+- Block "mark occurrences" event on transaction pair:
     (SCI_TARGETFROMSELECTIO, SCI_REPLACETARGET).
-- protect SCI target transactions by a guard to break recursion of 
+- protect SCI target transactions by a guard to break recursion of
     Mark Occurrences caused by ChangeNotification() events.
 - Handle "2nd Default Styles" as separate standard (2nd) lexer module.
-- Handling initial 1st or 2nd default style in case of "Default Text", 
+- Handling initial 1st or 2nd default style in case of "Default Text",
     shown on int "Customize Schemes...".
 - Crash on navigation between schemes beyond start/end of tree view.
-- Disable (using 1st Default Style) 
+- Disable (using 1st Default Style)
     "Associated filename extensions" for "2nd Default Style".
 - Clone associated filename extension list of Default Style (for 2nd Default Style).
 - move word wrap start symbol to margin (new WW mode SPACE (instead of WORD))".
@@ -1106,7 +1110,7 @@ FIXES:
 - "Match Current Word" should not highlight partial word matches in other lines.
 - Fetching wrong visible document line number in case of hidden or wrapped lines.
 - Ignoring queued timer event, if timer has been killed.
-- use current lexer's default text font size as base font size for 
+- use current lexer's default text font size as base font size for
     relative sizing of other styles.
 - mark occurrences counter not updated in time.
 
@@ -1280,31 +1284,31 @@ Version 3.17.1124.690 (24 November 2017)
 Version 2.17.1023.632 (23 October 2017)
 =====================================================
 - Add code snippet (activation only prepare for future extensions).
-- Added switch ([Settings2] UseOldStyleBraceMatching) to preserve old style 
+- Added switch ([Settings2] UseOldStyleBraceMatching) to preserve old style
     brace matching behavior.
-- Applied patch from Neil Hodgson (Master of Scintilla Lib - respond to 
+- Applied patch from Neil Hodgson (Master of Scintilla Lib - respond to
     scintilla lib issue report #1976).
 - Changed buffers for operating edit box in customize schemes.
 - Documentation: Minor changes to Notepad3.txt.
-- Documentation: doc/Notepad3.txt - add description of [Section2] .ini settings 
+- Documentation: doc/Notepad3.txt - add description of [Section2] .ini settings
     (mostly taken from orig. Notepad2 FAQs).
-- Default to modern displays settings, using Scintilla's new technology 
+- Default to modern displays settings, using Scintilla's new technology
     : SciDirectWriteTech=1, SciFontQuality=3
-- First prottotype of VirtualSpace RectangularSelection by default (very old 
+- First prottotype of VirtualSpace RectangularSelection by default (very old
     behavior can be turned on by [Settings2] DenyVirtualSpaceAccess=1).
 - Implemented Feature Request #51 (buffer size of file extension edit box).
 - New: Show warning before loading file with unknown (custom schemes) file name extension.
 - License.txt: switch to UTF-8 encoding.
-- Restore wrongly discarded np3portableapps .ini files for NP3Portable, 
+- Restore wrongly discarded np3portableapps .ini files for NP3Portable,
     redirecting .ini reading to correct path.
 - Small code refactoring (replacing deprecated methods).
-- Settings [Section2] (cannot be set via GUI) add all possible names and 
+- Settings [Section2] (cannot be set via GUI) add all possible names and
     default values, if applicable.
 - Fixed .ini paths for np3portableapps.
 - Fix: Crash in Favorites management.
-- Fix: pasting clipboard content into selection box should replace text and 
+- Fix: pasting clipboard content into selection box should replace text and
     cancel selection then (in case of swapping clipboard, the selection is preserved).
-- Remove settings for "Favorites" directory -> NP3 uses then users system 
+- Remove settings for "Favorites" directory -> NP3 uses then users system
     default folder (%USERPROFILE%\Favorites).
 
 
@@ -1313,9 +1317,9 @@ Version 2.17.1016.610 (16 October 2017)
 =====================================================
 - Added remove button for list items.
 - Checkbox for "preserve caret position" settings.
-- File History Dlg: rename button "Remove" -> "Discard" 
+- File History Dlg: rename button "Remove" -> "Discard"
     (discard selected item from file history list).
-- Minor bugfixes for session feature 
+- Minor bugfixes for session feature
     (file history: remember caret pos and encoding).
 - Removed unnecessary build artifacts from np3portable.
 
@@ -1323,7 +1327,7 @@ Version 2.17.1016.610 (16 October 2017)
 =====================================================
 Version 2 Build 605 (15 October 2017)
 =====================================================
-- Fix: Crash on accessing UndoRedo structure while NP3 instance has 
+- Fix: Crash on accessing UndoRedo structure while NP3 instance has
     not been initialized completely (.LOG file opening bug).
 
 
@@ -1331,7 +1335,7 @@ Version 2 Build 605 (15 October 2017)
 Version 2 Build 600 (15 October 2017)
 =====================================================
 - Fix: Virtual space access: column indicator.
-- Fix: Customize Schemes... Font... selection: bold/italic now detected 
+- Fix: Customize Schemes... Font... selection: bold/italic now detected
     (bold: if selection >= FW_SEMIBOLD)
 
 
@@ -1363,9 +1367,9 @@ Version 2 Build 568 (8 October 2017)
 - Fix: minor StatusBar string corrections.
 - Fix: Support pasting position at virtual space.
 - Fix: Move caret to convenient position after pasting clipboard (no current selection).
-- Fix: Virtual space navigation and rectangular selection (allow "Virtual Space Rectangular Selection" 
+- Fix: Virtual space navigation and rectangular selection (allow "Virtual Space Rectangular Selection"
     also allows moving Caret into virtual space (beyond line end))
-- Fix: Copy/Cut & Paste of current line (in case of no selection 
+- Fix: Copy/Cut & Paste of current line (in case of no selection
 - Visual Studio behavior - using SCI's MSDEVLineSelect).
 - Fix: Bug in code-page related text conversion.
 
@@ -1376,11 +1380,11 @@ Version 2 Build 548 (3 October 2017)
 - Code cleanup
 - Fix: Made corrections to build 505 change log (spelling, grammar, etc).
 - Fix: FILE status becomes [MODIFIED] when doing CONTROL+A to select ALL.
-- Fix: Paste from clipboard to ANSI code page: 
+- Fix: Paste from clipboard to ANSI code page:
     unnecessary switching encoding to UTF-8.
 - Fix: Undo/Redo of virtual space selection rectangle not correct.
 - Fix: StatusBar SelectionCount (Sel) : count chars instead of bytes.
-- Fix: Punctuation chars for "Accelerated Word Navigation" (Settings2: 
+- Fix: Punctuation chars for "Accelerated Word Navigation" (Settings2:
     ExtendedWhiteSpaceChars= add non word chars here).
 - Fix: Do mouse wheel scrolling in editor area only.
 - Fix: DPI awareness in manifest.
@@ -1393,48 +1397,48 @@ Version 2 Build 505 (23 September 2017)
 =====================================================
 - 1st chunk of StrSafe migration.
 - Some more StrSafe changes
-- Fix: manually edited settings (SciDirectWriteTech, SciFontQuality) 
+- Fix: manually edited settings (SciDirectWriteTech, SciFontQuality)
     should be placed in settings section [Settings2].
-- Extended default "space char set" for "Accelerated Word Navigation" to avoid 
-    unexpected "accelerated word navigation" behavior, space-char extension is 
+- Extended default "space char set" for "Accelerated Word Navigation" to avoid
+    unexpected "accelerated word navigation" behavior, space-char extension is
     restricted to 7-bit ASCII char set (ignoring specified non-7-bit-ASCII chars).
 - StrSafe adaptions
 - Fixed: settings SciFontQuality have been overwritten by Scheme configuration.
-    (Fonts: Calibri, Cambria, Candara, Consolas, Constantia, Corbel, Segoe UI are using 
-    'cleartype smoothing' (SC_EFF_QUALITY_LCD_OPTIMIZED) by default, if not 
+    (Fonts: Calibri, Cambria, Candara, Consolas, Constantia, Corbel, Segoe UI are using
+    'cleartype smoothing' (SC_EFF_QUALITY_LCD_OPTIMIZED) by default, if not
     configured in Schema definition for Lexer)
 - Added font "Source Code Pro" to list of special fonts for cleartype smoothing.
-- Fix: undo destructive operation on selection (rectangle) does not restore 
+- Fix: undo destructive operation on selection (rectangle) does not restore
     selection or preserves selection mode (extends selection on caret movement)
     -> need to send SCI_CANCEL at the end of restored selection.
-- Found bug caused by StrSafe migration 
+- Found bug caused by StrSafe migration
     (COUNTOF() for buffer size must not be used on buffer pointer)
 - migrate StrCpyN() and StrCatBuff() to corresponding StrSafe.h methods
 - Adapted lstrcpyn() calls according to StrSafe.h requirements.
-- Refactoring of "Accelerated Word Navigation" to be compliant with Scintillas 
+- Refactoring of "Accelerated Word Navigation" to be compliant with Scintillas
     WhiteSpace and Punctuation defines.
 - "Accelerated Word Navigation" activation influences "Mark Occurrences" (whole word) if set
 - Extended: Remember selection undo / redo
 - Added undo / redo selection to more operations
 - Found Scintilla 400 method "SCI_CUT" (cut selection) broken: lost last char
     replaced by SCI_COPY & SCI_CLEAR combination (for now).
-- changes to EditGetClipboardText() solved the SCI_CUT problem, so it can be switched back 
+- changes to EditGetClipboardText() solved the SCI_CUT problem, so it can be switched back
     from SCI_COPY & SCI_CLEAR to SCI_CUT (byte alignment in 64-bit, i am nut sure)
-- switching Scintilla internal codepage to UTF-8 only (resp. Japanese, 
-    Chinese and Korean DBCS) single-byte encoding is supported externally and 
+- switching Scintilla internal codepage to UTF-8 only (resp. Japanese,
+    Chinese and Korean DBCS) single-byte encoding is supported externally and
     converted (fore and back) to UTF-8 internally, this simplifies i.e. clipboard exchange, etc.
 - Removed support for obsolete Korean Johab (1361) codepage.
 - Fixed ConvertText() according to internal SCI codepage
 - Refactoring: Encoding handling
 - More operations for selections undo/redo.
-- Enabled "unlimited" (as in Scintilla Lib: dep. on memory and INT_MAX) 
-    undo / redo selection history using utarray from uthash header library 
+- Enabled "unlimited" (as in Scintilla Lib: dep. on memory and INT_MAX)
+    undo / redo selection history using utarray from uthash header library
     (https://troydhanson.github.io/uthash/index.html)
 - Moved crypto readme to doc dir
-- remove internal codepage support for Chinese, Japan, Korean DBCS use 
-    generalized UTF-8 codepage instead 
+- remove internal codepage support for Chinese, Japan, Korean DBCS use
+    generalized UTF-8 codepage instead
     (conversions do not work as expected within scintilla lib)
-- Dropping Windows XP support , using compiler toolset vc141 Win SDK 10.0. 
+- Dropping Windows XP support , using compiler toolset vc141 Win SDK 10.0.
     (current VC++ redistributable needed?)
 - Replaced lstrcmp() and lstrcmpi() by StrSafe (helper.h defined) methods.
 - Relaunch elevated keeping current changes in a buffer.
@@ -1453,17 +1457,17 @@ Version 2 Build 505 (23 September 2017)
     (externals (handles / pointers) seemed to be a problem on module init instance time in 64-bit)
 - Fixed: Open find dialog the first time (new NP3 instance) while
     clipboard is empty, NP3 crashes (try to LocalFree() static allocated memory)
-- Fixed: RegExpr "Find previous" corrected (find mode "left to right" has been 
+- Fixed: RegExpr "Find previous" corrected (find mode "left to right" has been
     used, which has not the intended behavior).
 - Updated Compiler Info.
-- Added build.txt (and .ps1 changes) for Local Build Version patching 
+- Added build.txt (and .ps1 changes) for Local Build Version patching
     (common AppVeyor/Local script).
 - Fixed issue "Convert to Title Case" while selected text is all upper case.
 - Fixed broken "Complete Word" feature (Ctrl+Enter/Return).
 - Changed accelerator key for feature "Complete Word" from Ctrl+Enter to Ctrl+Alt+Enter.
 - Added feature "Insert New (empty) Line above current line Ctrl+Enter (as in VisualStudio).
 - Code cleanup
-- Added new Settings "Virtual Space on Rectangular Selection" used to select. 
+- Added new Settings "Virtual Space on Rectangular Selection" used to select.
     rectangle not delimited by line endings (but including virtual space).
 - Readme.txt Updated. (Thanks Will)
 
@@ -1549,9 +1553,9 @@ Version 1 Build 386 (08 December 2016)
 - Added RaPeHoff to the contributors list.
 - Update to Scintilla 371 (NP2 adaption due to deprecated data types).
 - Clean-code Solution (instead of "magic numbers").
-- Crypto Module: code cleanup 
+- Crypto Module: code cleanup
 - Crypto Module: Replaced LocalAlloc/GlobalAlloc by HeapAlloc methods.
-- Integration of DeelX RegExpr engine (http://www.regexlab.com/en/deelx/) 
+- Integration of DeelX RegExpr engine (http://www.regexlab.com/en/deelx/)
 - Fixed block selecting cause crash.
 
 
diff --git a/Versions/build.txt b/Versions/build.txt
index d00491fd7..0cfbf0888 100644
--- a/Versions/build.txt
+++ b/Versions/build.txt
@@ -1 +1 @@
-1
+2
diff --git a/Versions/day.txt b/Versions/day.txt
index 0315ecf59..6f210dddb 100644
--- a/Versions/day.txt
+++ b/Versions/day.txt
@@ -1 +1 @@
-719
+721
diff --git a/grepWinNP3/translationsNP3/Беларуская (Беларусь) [be-BY].lang b/grepWinNP3/translationsNP3/Беларуская (Беларусь) [be-BY].lang
index 2675c55d0..746cb2924 100644
--- a/grepWinNP3/translationsNP3/Беларуская (Беларусь) [be-BY].lang	
+++ b/grepWinNP3/translationsNP3/Беларуская (Беларусь) [be-BY].lang	
@@ -588,7 +588,7 @@ msgstr "Скінуць"
 
 #. Resource IDs: (3001)
 msgid "Notepad3's grepWin(NP3)-mod of Stefan Küng's great tool!"
-msgstr "grepWin(NP3) для Notepad3 на аснове выдатнага інструмента ад Stefan Küng!"
+msgstr "grepWin(NP3)-mod для Notepad3 на аснове выдатнага інструмента ад Stefan Küng!"
 
 #. Resource IDs: (3004)
 msgid "Max # of concurrent worker"
diff --git a/grepWinNP3/translationsNP3/Русский (Pоссия) [ru-RU].lang b/grepWinNP3/translationsNP3/Русский (Pоссия) [ru-RU].lang
index b2c8484ac..b51fe4157 100644
--- a/grepWinNP3/translationsNP3/Русский (Pоссия) [ru-RU].lang	
+++ b/grepWinNP3/translationsNP3/Русский (Pоссия) [ru-RU].lang	
@@ -588,7 +588,7 @@ msgstr "Сброс"
 
 #. Resource IDs: (3001)
 msgid "Notepad3's grepWin(NP3)-mod of Stefan Küng's great tool!"
-msgstr "grepWin(NP3) для Notepad3 на основе отличного инструмента от Stefan Küng!"
+msgstr  "grepWin(NP3)-mod для Notepad3 на основе отличного инструмента от Stefan Küng!"
 
 #. Resource IDs: (3004)
 msgid "Max # of concurrent worker"
diff --git a/res/Notepad3.exe.manifest.conf b/res/Notepad3.exe.manifest.conf
index 94e7305b7..c21eb2775 100644
--- a/res/Notepad3.exe.manifest.conf
+++ b/res/Notepad3.exe.manifest.conf
@@ -3,7 +3,7 @@
   <assemblyIdentity
     name="Notepad3"
     processorArchitecture="*"
-    version="5.20.719.1"
+    version="5.20.721.2"
     type="win32"
   />
   <description>Notepad3 RC2</description>
diff --git a/src/Version.h b/src/Version.h
index 3826f8014..b8baf49c0 100644
--- a/src/Version.h
+++ b/src/Version.h
@@ -75,7 +75,7 @@
 #if defined(_MSC_VER)
     #if (_MSC_VER == 1926)
         #if(_MSC_FULL_VER >= 192628806)
-            #define VER_CPL     MS Visual C++ 2019 v16.6.(1-4)
+            #define VER_CPL     MS Visual C++ 2019 v16.6.(1-5)
         #elif(_MSC_FULL_VER >= 192628805)
             #define VER_CPL     MS Visual C++ 2019 v16.6.0
         #endif
diff --git a/src/VersionEx.h b/src/VersionEx.h
index 66584e62b..62172161a 100644
--- a/src/VersionEx.h
+++ b/src/VersionEx.h
@@ -8,8 +8,8 @@
 #define SAPPNAME "Notepad3"
 #define VERSION_MAJOR 5
 #define VERSION_MINOR 20
-#define VERSION_REV 719
-#define VERSION_BUILD 1
+#define VERSION_REV 721
+#define VERSION_BUILD 2
 #define SCINTILLA_VER 443
 #define ONIGURUMA_REGEX_VER 6.9.5
 #define UCHARDET_VER 2018.09.27