diff --git a/CHANGELOG.md b/CHANGELOG.md
index 45ad457..14baeec 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,7 @@ Tested on OS build 22000.376.
 #### Highlights
 
 * Built-in support for OS build 22000.376 (.12)
+* Hotfix: Windows 10 taskbar "always combine"/"show labels" setting is properly preserved when upgrading from an older release (multiple reports, #612, #614) (.21)
 * Primary taskbar remembers position when moved to a secondary monitor (multiple issues, like #504)
 * Ability to set Control Center as network icon action (merged #492)
 * Added possibility to use the original Windows 10 (Alt-Tab) window switcher; thus, the available options are now:
@@ -59,7 +60,6 @@ Tested on OS build 22000.376.
 * Improved reliability of startup delay and window dismiss when quickly Alt-Tabbing
 * Window icons are retrieved async now
 * Better icon drawing using GDI+ flat API
-* Reversed UWP apps detection to checking whether the executable is called ApplicationFrameHost.exe
 * Added some more debug messages
 * Fixed some rendering problems when themes are disabled
 * Fixed regression of [#161](https://github.com/valinet/ExplorerPatcher/issues/161#issuecomment-986234002) (.1)
diff --git a/ExplorerPatcher/dllmain.c b/ExplorerPatcher/dllmain.c
index 973f792..72644d6 100644
--- a/ExplorerPatcher/dllmain.c
+++ b/ExplorerPatcher/dllmain.c
@@ -3983,6 +3983,43 @@ void WINAPI LoadSettings(LPARAM lParam)
                         sizeof(DWORD)
                     );
                     RegDeleteKeyExW(hKey, TEXT(STARTDOCKED_SB_NAME), KEY_WOW64_64KEY, 0);
+                    DWORD dwTaskbarGlomLevel = 0, dwMMTaskbarGlomLevel = 0;
+                    dwSize = sizeof(DWORD);
+                    RegGetValueW(
+                        HKEY_CURRENT_USER,
+                        L"Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Advanced",
+                        L"TaskbarGlomLevel",
+                        REG_DWORD,
+                        NULL,
+                        &dwTaskbarGlomLevel,
+                        &dwSize
+                    );
+                    RegSetValueExW(
+                        hKey,
+                        TEXT("TaskbarGlomLevel"),
+                        0,
+                        REG_DWORD,
+                        &dwTaskbarGlomLevel,
+                        sizeof(DWORD)
+                    );
+                    dwSize = sizeof(DWORD);
+                    RegGetValueW(
+                        HKEY_CURRENT_USER,
+                        L"Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Advanced",
+                        L"MMTaskbarGlomLevel",
+                        REG_DWORD,
+                        NULL,
+                        &dwMMTaskbarGlomLevel,
+                        &dwSize
+                    );
+                    RegSetValueExW(
+                        hKey,
+                        TEXT("MMTaskbarGlomLevel"),
+                        0,
+                        REG_DWORD,
+                        &dwMMTaskbarGlomLevel,
+                        sizeof(DWORD)
+                    );
                 }
             }
             dwTemp = TRUE;
diff --git a/version.h b/version.h
index 39f7b54..4222ad5 100644
--- a/version.h
+++ b/version.h
@@ -1,7 +1,7 @@
 #define VER_MAJOR 22000
 #define VER_MINOR 376
 #define VER_BUILD_HI    40
-#define VER_BUILD_LO 20
+#define VER_BUILD_LO 21
 #define VER_FLAGS   VS_FF_PRERELEASE
 
 
@@ -12,5 +12,5 @@
 #define VER_STR(arg) #arg
 
 // The String form of the version numbers
-#define VER_FILE_STRING VALUE "FileVersion", "22000.376.40.20"
-#define VER_PRODUCT_STRING VALUE "ProductVersion", "22000.376.40.20"
+#define VER_FILE_STRING VALUE "FileVersion", "22000.376.40.21"
+#define VER_PRODUCT_STRING VALUE "ProductVersion", "22000.376.40.21"