diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3982d64a4..70b5f66fb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,12 @@
 - [#2411](https://github.com/xmrig/xmrig/pull/2411) Added support for Yada (`rx/yada` algorithm).
 
 
+# v6.16.4
+- [#2904](https://github.com/xmrig/xmrig/pull/2904) Fixed unaligned memory accesses.
+- [#2908](https://github.com/xmrig/xmrig/pull/2908) Added MSVC/2022 to `version.h`.
+- [#2910](https://github.com/xmrig/xmrig/issues/2910) Fixed donation for GhostRider/RTM.
+
+
 # v6.16.3
 - [#2778](https://github.com/xmrig/xmrig/pull/2778) Fixed `READY threads X/X` display after algorithm switching.
 - [#2782](https://github.com/xmrig/xmrig/pull/2782) Updated GhostRider documentation.
diff --git a/src/base/net/stratum/AutoClient.cpp b/src/base/net/stratum/AutoClient.cpp
index 702c0fa04..675be865a 100644
--- a/src/base/net/stratum/AutoClient.cpp
+++ b/src/base/net/stratum/AutoClient.cpp
@@ -65,6 +65,12 @@ bool xmrig::AutoClient::parseLogin(const rapidjson::Value &result, int *code)
     m_mode = ETH_MODE;
     setAlgo(algo);
 
+#   ifdef XMRIG_ALGO_GHOSTRIDER
+    if (algo.family() == Algorithm::GHOSTRIDER) {
+        setExtraNonce2Size(Json::getUint64(result, "extra_nonce2_size"));
+    }
+#   endif
+
     return true;
 }
 
diff --git a/src/base/net/stratum/EthStratumClient.h b/src/base/net/stratum/EthStratumClient.h
index c1fde9b62..ebfda6ac3 100644
--- a/src/base/net/stratum/EthStratumClient.h
+++ b/src/base/net/stratum/EthStratumClient.h
@@ -47,6 +47,10 @@ protected:
 
     void setExtraNonce(const rapidjson::Value &nonce);
 
+#   ifdef XMRIG_ALGO_GHOSTRIDER
+    inline void setExtraNonce2Size(uint64_t size)   { m_extraNonce2Size = size; }
+#   endif
+
 private:
     static const char *errorMessage(const rapidjson::Value &error);
 
diff --git a/src/version.h b/src/version.h
index e8ff870f4..c574c8370 100644
--- a/src/version.h
+++ b/src/version.h
@@ -33,7 +33,9 @@
 #define APP_VER_PATCH  0
 
 #ifdef _MSC_VER
-#   if (_MSC_VER >= 1920)
+#   if (_MSC_VER >= 1930)
+#       define MSVC_VERSION 2022
+#   elif (_MSC_VER >= 1920 && _MSC_VER < 1930)
 #       define MSVC_VERSION 2019
 #   elif (_MSC_VER >= 1910 && _MSC_VER < 1920)
 #       define MSVC_VERSION 2017