diff --git a/CHANGELOG.md b/CHANGELOG.md
index 75e03c79663f..cbe7df85679f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -28,10 +28,16 @@
 - Add support for window resized and positioned by @lich426
 - Add extension: Inspector by @iAndyHD3
 - Add *experimental* WebSocket support for both wasm and native platforms
-- Mark 32bit build deprecated, and will be removed in next release axmol-2.2.0
 - Add extension: DrawNodeEx by @aismann
 - Add fairygui lua support by @Samoongeer
 
+### Mark as deprecated, and will be removed in next release axmol-2.2.0
+- 32bit build
+- Extensions
+    - DragonBones
+    - GUI
+- Zwoptex (Commented on cpp-test)
+
 ### BugFixs
 
 - Fix MSL texture order does not follow GLSL binding order
diff --git a/extensions/README.md b/extensions/README.md
index 036817f6c62a..05281c74b618 100644
--- a/extensions/README.md
+++ b/extensions/README.md
@@ -1,11 +1,15 @@
-# The axmol extensions
-
-## DragonBones
+# The Axmol extensions
 
+## DragonBones - Deprecrated, will be removed in axmol-2.2.0 (see #1602)
 - Upstream: https://github.com/DragonBones/DragonBonesCPP
 - Version: 4.5
 - License: MIT
 
+## DrawNodeEx
+- Upstream: https://github.com/axmolengine/axmol
+- Version: 0.9
+- License: MIT
+
 ## Effekseer (OFF default)
 - [![Upstream](https://img.shields.io/github/v/release/effekseer/Effekseer?label=Upstream)](https://github.com/effekseer/EffekseerForCocos2d-x)
 - https://github.com/effekseer/EffekseerForCocos2d-x
@@ -13,9 +17,7 @@
 - Version: 1.70
 - License: MIT
 
-
-## GUI - DEPRECATED
-
+## GUI - Deprecrated, will be removed in axmol-2.2.0 (see #1602)
 - Upstream: https://github.com/axmolengine/axmol
 - Version: axmol-1.0
 - License: MIT
@@ -24,47 +26,59 @@
 - [![Upstream](https://img.shields.io/github/v/release/ocornut/imgui?label=Upstream)](https://github.com/ocornut/imgui)
 - Version: 1.90-docking
 - License: MIT
+  
+## Inspector
+- Upstream: https://github.com/axmolengine/axmol
+- Version: axmol-1.0
+- License: MIT
 
-## Live2D (OFF default)
+## JSONDefault
+- Upstream: https://github.com/axmolengine/axmol
+- Version: axmol-1.0
+- License: MIT
 
+## Live2D (OFF default)
 - Upstream: https://www.live2d.com/en/download/cubism-sdk/download-native/
 - Version: [4-r.4] - 2021-12-09
 - License: Live2D Proprietary Software License
 
 ## Particle3D
+- Upstream: https://github.com/axmolengine/axmol
+- Version: axmol-1.0
+- License: MIT
 
+## SDFGen
 - Upstream: https://github.com/axmolengine/axmol
 - Version: axmol-1.0
 - License: MIT
 
-## FairyGUI
+## Asset-Manager
+- Upstream: https://github.com/axmolengine/axmol
+- Version: axmol-1.0
+- License: MIT
 
+## CocosStudio
 - Upstream: https://github.com/axmolengine/axmol
-- original repo:  Upstream: https://github.com/fairygui/FairyGUI-cocos2dx
 - Version: axmol-1.0
 - License: MIT
 
+## FairyGUI
+- Upstream: https://github.com/axmolengine/axmol
+- original repo:  Upstream: https://github.com/fairygui/FairyGUI-cocos2dx
+- Version: axmol-1.0
+- License: MIT
 
 ## physics-nodes
-
 - Upstream: https://github.com/axmolengine/axmol
 - Version: axmol-1.0
 - License: MIT
 
 ## scripting/lua
-
 - Upstream: https://github.com/axmolengine/axmol
 - Version: axmol-1.0
 - License: MIT
 
 ## spine
-
 - Upstream: https://github.com/EsotericSoftware/spine-runtimes
 - Version: 4.1-c9af18e with changes to adapte axmol
 - License: Spine Runtimes License
-
-## DrawNodeEx
-
-- Upstream: https://github.com/axmolengine/axmol
-- Version: 0.9
-- License: MIT
diff --git a/tests/cpp-tests/Source/controller.cpp b/tests/cpp-tests/Source/controller.cpp
index 171a4fa137e6..e571f602ffb4 100644
--- a/tests/cpp-tests/Source/controller.cpp
+++ b/tests/cpp-tests/Source/controller.cpp
@@ -138,7 +138,7 @@ class RootTests : public TestList
 #if (AX_TARGET_PLATFORM == AX_PLATFORM_IOS || AX_TARGET_PLATFORM == AX_PLATFORM_ANDROID)
         addTest("Vibrate", []() { return new VibrateTests(); });
 #endif
-        addTest("Zwoptex", []() { return new ZwoptexTests(); });
+ //       addTest("Zwoptex Deprecrated, will be removed in release axmol-2.2.0 (see #1602)", []() { return new ZwoptexTests(); });
         addTest("SpriteFrameCache", []() { return new SpriteFrameCacheTests(); });  // TODO
 #if (AX_TARGET_PLATFORM == AX_PLATFORM_MAC || AX_TARGET_PLATFORM == AX_PLATFORM_WIN32 || \
      AX_TARGET_PLATFORM == AX_PLATFORM_LINUX)