diff --git a/.github/scripts/windows/build_task.bat b/.github/scripts/windows/build_task.bat
index e802ad10a1985..cf2f748fb13d7 100644
--- a/.github/scripts/windows/build_task.bat
+++ b/.github/scripts/windows/build_task.bat
@@ -32,7 +32,11 @@ if "%THREAD_SAFE%" equ "0" set ADD_CONF=%ADD_CONF% --disable-zts
 if "%INTRINSICS%" neq "" set ADD_CONF=%ADD_CONF% --enable-native-intrinsics=%INTRINSICS%
 if "%ASAN%" equ "1" set ADD_CONF=%ADD_CONF% --enable-sanitizer --enable-debug-pack
 
-set CFLAGS=/W2 /WX /w14013 /wd4146 /wd4244
+rem C4018: comparison: signed/unsigned mismatch
+rem C4146: unary minus operator applied to unsigned type
+rem C4244: type conversion, possible loss of data
+rem C4267: 'size_t' type conversion, possible loss of data
+set CFLAGS=/W3 /WX /wd4018 /wd4146 /wd4244 /wd4267
 
 cmd /c configure.bat ^
 	--enable-snapshot-build ^
diff --git a/Zend/tests/bug30346.phpt b/Zend/tests/ArrayAccess/bug30346.phpt
similarity index 100%
rename from Zend/tests/bug30346.phpt
rename to Zend/tests/ArrayAccess/bug30346.phpt
diff --git a/Zend/tests/bug33710.phpt b/Zend/tests/ArrayAccess/bug33710.phpt
similarity index 100%
rename from Zend/tests/bug33710.phpt
rename to Zend/tests/ArrayAccess/bug33710.phpt
diff --git a/Zend/tests/bug39297.phpt b/Zend/tests/ArrayAccess/bug39297.phpt
similarity index 100%
rename from Zend/tests/bug39297.phpt
rename to Zend/tests/ArrayAccess/bug39297.phpt
diff --git a/Zend/tests/bug41209.phpt b/Zend/tests/ArrayAccess/bug41209.phpt
similarity index 100%
rename from Zend/tests/bug41209.phpt
rename to Zend/tests/ArrayAccess/bug41209.phpt
diff --git a/Zend/tests/bug63217.phpt b/Zend/tests/ArrayAccess/bug63217.phpt
similarity index 100%
rename from Zend/tests/bug63217.phpt
rename to Zend/tests/ArrayAccess/bug63217.phpt
diff --git a/Zend/tests/bug64417.phpt b/Zend/tests/ArrayAccess/bug64417.phpt
similarity index 100%
rename from Zend/tests/bug64417.phpt
rename to Zend/tests/ArrayAccess/bug64417.phpt
diff --git a/Zend/tests/bug68896.phpt b/Zend/tests/ArrayAccess/bug68896.phpt
similarity index 100%
rename from Zend/tests/bug68896.phpt
rename to Zend/tests/ArrayAccess/bug68896.phpt
diff --git a/Zend/tests/bug69955.phpt b/Zend/tests/ArrayAccess/bug69955.phpt
similarity index 100%
rename from Zend/tests/bug69955.phpt
rename to Zend/tests/ArrayAccess/bug69955.phpt
diff --git a/Zend/tests/bug71731.phpt b/Zend/tests/ArrayAccess/bug71731.phpt
similarity index 100%
rename from Zend/tests/bug71731.phpt
rename to Zend/tests/ArrayAccess/bug71731.phpt
diff --git a/Zend/tests/bug78356.phpt b/Zend/tests/ArrayAccess/bug78356.phpt
similarity index 100%
rename from Zend/tests/bug78356.phpt
rename to Zend/tests/ArrayAccess/bug78356.phpt
diff --git a/Zend/tests/bug26697.phpt b/Zend/tests/autoload/bug26697.phpt
similarity index 100%
rename from Zend/tests/bug26697.phpt
rename to Zend/tests/autoload/bug26697.phpt
diff --git a/Zend/tests/bug33116.phpt b/Zend/tests/autoload/bug33116.phpt
similarity index 100%
rename from Zend/tests/bug33116.phpt
rename to Zend/tests/autoload/bug33116.phpt
diff --git a/Zend/tests/bug37138.phpt b/Zend/tests/autoload/bug37138.phpt
similarity index 100%
rename from Zend/tests/bug37138.phpt
rename to Zend/tests/autoload/bug37138.phpt
diff --git a/Zend/tests/bug39003.phpt b/Zend/tests/autoload/bug39003.phpt
similarity index 100%
rename from Zend/tests/bug39003.phpt
rename to Zend/tests/autoload/bug39003.phpt
diff --git a/Zend/tests/bug42798.phpt b/Zend/tests/autoload/bug42798.phpt
similarity index 100%
rename from Zend/tests/bug42798.phpt
rename to Zend/tests/autoload/bug42798.phpt
diff --git a/Zend/tests/bug46665.phpt b/Zend/tests/autoload/bug46665.phpt
similarity index 100%
rename from Zend/tests/bug46665.phpt
rename to Zend/tests/autoload/bug46665.phpt
diff --git a/Zend/tests/bug46665_autoload.inc b/Zend/tests/autoload/bug46665_autoload.inc
similarity index 100%
rename from Zend/tests/bug46665_autoload.inc
rename to Zend/tests/autoload/bug46665_autoload.inc
diff --git a/Zend/tests/bug49908.phpt b/Zend/tests/autoload/bug49908.phpt
similarity index 100%
rename from Zend/tests/bug49908.phpt
rename to Zend/tests/autoload/bug49908.phpt
diff --git a/Zend/tests/bug61011.phpt b/Zend/tests/autoload/bug61011.phpt
similarity index 100%
rename from Zend/tests/bug61011.phpt
rename to Zend/tests/autoload/bug61011.phpt
diff --git a/Zend/tests/bug63741.phpt b/Zend/tests/autoload/bug63741.phpt
similarity index 100%
rename from Zend/tests/bug63741.phpt
rename to Zend/tests/autoload/bug63741.phpt
diff --git a/Zend/tests/bug65322.phpt b/Zend/tests/autoload/bug65322.phpt
similarity index 100%
rename from Zend/tests/bug65322.phpt
rename to Zend/tests/autoload/bug65322.phpt
diff --git a/Zend/tests/bug78868.phpt b/Zend/tests/autoload/bug78868.phpt
similarity index 100%
rename from Zend/tests/bug78868.phpt
rename to Zend/tests/autoload/bug78868.phpt
diff --git a/Zend/tests/bug78921.phpt b/Zend/tests/autoload/bug78921.phpt
similarity index 100%
rename from Zend/tests/bug78921.phpt
rename to Zend/tests/autoload/bug78921.phpt
diff --git a/Zend/tests/bug81626.phpt b/Zend/tests/bug81626.phpt
index b05cb23097bbb..26f549795a66e 100644
--- a/Zend/tests/bug81626.phpt
+++ b/Zend/tests/bug81626.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Bug #81626: Error on use static:: in __сallStatic() wrapped to Closure::fromCallable()
+Bug #81626: Error on use static:: in __callStatic() wrapped to Closure::fromCallable()
 --FILE--
 <?php
 class TestClass {
diff --git a/Zend/tests/bug54624.phpt b/Zend/tests/class_alias/bug54624.phpt
similarity index 100%
rename from Zend/tests/bug54624.phpt
rename to Zend/tests/class_alias/bug54624.phpt
diff --git a/Zend/tests/bug24884.phpt b/Zend/tests/clone/bug24884.phpt
similarity index 100%
rename from Zend/tests/bug24884.phpt
rename to Zend/tests/clone/bug24884.phpt
diff --git a/Zend/tests/bug27268.phpt b/Zend/tests/clone/bug27268.phpt
similarity index 100%
rename from Zend/tests/bug27268.phpt
rename to Zend/tests/clone/bug27268.phpt
diff --git a/Zend/tests/bug36071.phpt b/Zend/tests/clone/bug36071.phpt
similarity index 100%
rename from Zend/tests/bug36071.phpt
rename to Zend/tests/clone/bug36071.phpt
diff --git a/Zend/tests/bug42817.phpt b/Zend/tests/clone/bug42817.phpt
similarity index 100%
rename from Zend/tests/bug42817.phpt
rename to Zend/tests/clone/bug42817.phpt
diff --git a/Zend/tests/bug42818.phpt b/Zend/tests/clone/bug42818.phpt
similarity index 100%
rename from Zend/tests/bug42818.phpt
rename to Zend/tests/clone/bug42818.phpt
diff --git a/Zend/tests/bug68262.phpt b/Zend/tests/clone/bug68262.phpt
similarity index 100%
rename from Zend/tests/bug68262.phpt
rename to Zend/tests/clone/bug68262.phpt
diff --git a/Zend/tests/bug69996.phpt b/Zend/tests/clone/bug69996.phpt
similarity index 100%
rename from Zend/tests/bug69996.phpt
rename to Zend/tests/clone/bug69996.phpt
diff --git a/Zend/tests/bug79778.phpt b/Zend/tests/closures/bug79778.phpt
similarity index 100%
rename from Zend/tests/bug79778.phpt
rename to Zend/tests/closures/bug79778.phpt
diff --git a/Zend/tests/bug24699.phpt b/Zend/tests/constants/bug24699.phpt
similarity index 100%
rename from Zend/tests/bug24699.phpt
rename to Zend/tests/constants/bug24699.phpt
diff --git a/Zend/tests/bug30702.phpt b/Zend/tests/constants/bug30702.phpt
similarity index 100%
rename from Zend/tests/bug30702.phpt
rename to Zend/tests/constants/bug30702.phpt
diff --git a/Zend/tests/bug33732.phpt b/Zend/tests/constants/bug33732.phpt
similarity index 100%
rename from Zend/tests/bug33732.phpt
rename to Zend/tests/constants/bug33732.phpt
diff --git a/Zend/tests/bug41633_1.phpt b/Zend/tests/constants/bug41633_1.phpt
similarity index 100%
rename from Zend/tests/bug41633_1.phpt
rename to Zend/tests/constants/bug41633_1.phpt
diff --git a/Zend/tests/bug41633_2.phpt b/Zend/tests/constants/bug41633_2.phpt
similarity index 100%
rename from Zend/tests/bug41633_2.phpt
rename to Zend/tests/constants/bug41633_2.phpt
diff --git a/Zend/tests/bug41633_3.phpt b/Zend/tests/constants/bug41633_3.phpt
similarity index 100%
rename from Zend/tests/bug41633_3.phpt
rename to Zend/tests/constants/bug41633_3.phpt
diff --git a/Zend/tests/bug41633_4.phpt b/Zend/tests/constants/bug41633_4.phpt
similarity index 100%
rename from Zend/tests/bug41633_4.phpt
rename to Zend/tests/constants/bug41633_4.phpt
diff --git a/Zend/tests/bug41640.phpt b/Zend/tests/constants/bug41640.phpt
similarity index 100%
rename from Zend/tests/bug41640.phpt
rename to Zend/tests/constants/bug41640.phpt
diff --git a/Zend/tests/bug44827.phpt b/Zend/tests/constants/bug44827.phpt
similarity index 100%
rename from Zend/tests/bug44827.phpt
rename to Zend/tests/constants/bug44827.phpt
diff --git a/Zend/tests/bug45742.phpt b/Zend/tests/constants/bug45742.phpt
similarity index 100%
rename from Zend/tests/bug45742.phpt
rename to Zend/tests/constants/bug45742.phpt
diff --git a/Zend/tests/bug45910.phpt b/Zend/tests/constants/bug45910.phpt
similarity index 100%
rename from Zend/tests/bug45910.phpt
rename to Zend/tests/constants/bug45910.phpt
diff --git a/Zend/tests/bug45910_2.phpt b/Zend/tests/constants/bug45910_2.phpt
similarity index 100%
rename from Zend/tests/bug45910_2.phpt
rename to Zend/tests/constants/bug45910_2.phpt
diff --git a/Zend/tests/bug46304.phpt b/Zend/tests/constants/bug46304.phpt
similarity index 100%
rename from Zend/tests/bug46304.phpt
rename to Zend/tests/constants/bug46304.phpt
diff --git a/Zend/tests/bug48930.phpt b/Zend/tests/constants/bug48930.phpt
similarity index 100%
rename from Zend/tests/bug48930.phpt
rename to Zend/tests/constants/bug48930.phpt
diff --git a/Zend/tests/bug49472.phpt b/Zend/tests/constants/bug49472.phpt
similarity index 100%
rename from Zend/tests/bug49472.phpt
rename to Zend/tests/constants/bug49472.phpt
diff --git a/Zend/tests/bug50816.phpt b/Zend/tests/constants/bug50816.phpt
similarity index 100%
rename from Zend/tests/bug50816.phpt
rename to Zend/tests/constants/bug50816.phpt
diff --git a/Zend/tests/bug51791.phpt b/Zend/tests/constants/bug51791.phpt
similarity index 100%
rename from Zend/tests/bug51791.phpt
rename to Zend/tests/constants/bug51791.phpt
diff --git a/Zend/tests/bug53305.phpt b/Zend/tests/constants/bug53305.phpt
similarity index 100%
rename from Zend/tests/bug53305.phpt
rename to Zend/tests/constants/bug53305.phpt
diff --git a/Zend/tests/bug63976.phpt b/Zend/tests/constants/bug63976.phpt
similarity index 100%
rename from Zend/tests/bug63976.phpt
rename to Zend/tests/constants/bug63976.phpt
diff --git a/Zend/tests/bug65291.phpt b/Zend/tests/constants/bug65291.phpt
similarity index 100%
rename from Zend/tests/bug65291.phpt
rename to Zend/tests/constants/bug65291.phpt
diff --git a/Zend/tests/bug69676.phpt b/Zend/tests/constants/bug69676.phpt
similarity index 100%
rename from Zend/tests/bug69676.phpt
rename to Zend/tests/constants/bug69676.phpt
diff --git a/Zend/tests/bug69676_2.phpt b/Zend/tests/constants/bug69676_2.phpt
similarity index 100%
rename from Zend/tests/bug69676_2.phpt
rename to Zend/tests/constants/bug69676_2.phpt
diff --git a/Zend/tests/bug69676_3.phpt b/Zend/tests/constants/bug69676_3.phpt
similarity index 100%
rename from Zend/tests/bug69676_3.phpt
rename to Zend/tests/constants/bug69676_3.phpt
diff --git a/Zend/tests/bug69832.phpt b/Zend/tests/constants/bug69832.phpt
similarity index 100%
rename from Zend/tests/bug69832.phpt
rename to Zend/tests/constants/bug69832.phpt
diff --git a/Zend/tests/bug70164.phpt b/Zend/tests/constants/bug70164.phpt
similarity index 100%
rename from Zend/tests/bug70164.phpt
rename to Zend/tests/constants/bug70164.phpt
diff --git a/Zend/tests/bug74657.phpt b/Zend/tests/constants/bug74657.phpt
similarity index 100%
rename from Zend/tests/bug74657.phpt
rename to Zend/tests/constants/bug74657.phpt
diff --git a/Zend/tests/bug76754.phpt b/Zend/tests/constants/bug76754.phpt
similarity index 100%
rename from Zend/tests/bug76754.phpt
rename to Zend/tests/constants/bug76754.phpt
diff --git a/Zend/tests/bug72162.phpt b/Zend/tests/error_reporting/bug72162.phpt
similarity index 100%
rename from Zend/tests/bug72162.phpt
rename to Zend/tests/error_reporting/bug72162.phpt
diff --git a/Zend/tests/bug26698.phpt b/Zend/tests/exceptions/bug26698.phpt
similarity index 100%
rename from Zend/tests/bug26698.phpt
rename to Zend/tests/exceptions/bug26698.phpt
diff --git a/Zend/tests/bug47771.phpt b/Zend/tests/exceptions/bug47771.phpt
similarity index 100%
rename from Zend/tests/bug47771.phpt
rename to Zend/tests/exceptions/bug47771.phpt
diff --git a/Zend/tests/bug50005.phpt b/Zend/tests/exceptions/bug50005.phpt
similarity index 100%
rename from Zend/tests/bug50005.phpt
rename to Zend/tests/exceptions/bug50005.phpt
diff --git a/Zend/tests/bug70944.phpt b/Zend/tests/exceptions/bug70944.phpt
similarity index 100%
rename from Zend/tests/bug70944.phpt
rename to Zend/tests/exceptions/bug70944.phpt
diff --git a/Zend/tests/bug73338.phpt b/Zend/tests/exceptions/bug73338.phpt
similarity index 100%
rename from Zend/tests/bug73338.phpt
rename to Zend/tests/exceptions/bug73338.phpt
diff --git a/Zend/tests/bug76025.phpt b/Zend/tests/exceptions/bug76025.phpt
similarity index 100%
rename from Zend/tests/bug76025.phpt
rename to Zend/tests/exceptions/bug76025.phpt
diff --git a/Zend/tests/bug78239.phpt b/Zend/tests/exceptions/bug78239.phpt
similarity index 100%
rename from Zend/tests/bug78239.phpt
rename to Zend/tests/exceptions/bug78239.phpt
diff --git a/Zend/tests/bug78589.phpt b/Zend/tests/gc/bug78589.phpt
similarity index 100%
rename from Zend/tests/bug78589.phpt
rename to Zend/tests/gc/bug78589.phpt
diff --git a/Zend/tests/bug68775.phpt b/Zend/tests/generators/bug68775.phpt
similarity index 100%
rename from Zend/tests/bug68775.phpt
rename to Zend/tests/generators/bug68775.phpt
diff --git a/Zend/tests/bug69740.phpt b/Zend/tests/generators/bug69740.phpt
similarity index 100%
rename from Zend/tests/bug69740.phpt
rename to Zend/tests/generators/bug69740.phpt
diff --git a/Zend/tests/bug69989_1.phpt b/Zend/tests/generators/bug69989_1.phpt
similarity index 100%
rename from Zend/tests/bug69989_1.phpt
rename to Zend/tests/generators/bug69989_1.phpt
diff --git a/Zend/tests/bug69989_2.phpt b/Zend/tests/generators/bug69989_2.phpt
similarity index 100%
rename from Zend/tests/bug69989_2.phpt
rename to Zend/tests/generators/bug69989_2.phpt
diff --git a/Zend/tests/bug69989_3.phpt b/Zend/tests/generators/bug69989_3.phpt
similarity index 100%
rename from Zend/tests/bug69989_3.phpt
rename to Zend/tests/generators/bug69989_3.phpt
diff --git a/Zend/tests/bug71980.phpt b/Zend/tests/generators/bug71980.phpt
similarity index 100%
rename from Zend/tests/bug71980.phpt
rename to Zend/tests/generators/bug71980.phpt
diff --git a/Zend/tests/bug72373.phpt b/Zend/tests/generators/bug72373.phpt
similarity index 100%
rename from Zend/tests/bug72373.phpt
rename to Zend/tests/generators/bug72373.phpt
diff --git a/Zend/tests/bug74840.phpt b/Zend/tests/generators/bug74840.phpt
similarity index 100%
rename from Zend/tests/bug74840.phpt
rename to Zend/tests/generators/bug74840.phpt
diff --git a/Zend/tests/bug75786.phpt b/Zend/tests/generators/bug75786.phpt
similarity index 100%
rename from Zend/tests/bug75786.phpt
rename to Zend/tests/generators/bug75786.phpt
diff --git a/Zend/tests/bug76946.phpt b/Zend/tests/generators/bug76946.phpt
similarity index 100%
rename from Zend/tests/bug76946.phpt
rename to Zend/tests/generators/bug76946.phpt
diff --git a/Zend/tests/bug79657.phpt b/Zend/tests/generators/bug79657.phpt
similarity index 100%
rename from Zend/tests/bug79657.phpt
rename to Zend/tests/generators/bug79657.phpt
diff --git a/Zend/tests/bug79927.phpt b/Zend/tests/generators/bug79927.phpt
similarity index 100%
rename from Zend/tests/bug79927.phpt
rename to Zend/tests/generators/bug79927.phpt
diff --git a/Zend/tests/bug30889.phpt b/Zend/tests/magic_methods/bug30889.phpt
similarity index 100%
rename from Zend/tests/bug30889.phpt
rename to Zend/tests/magic_methods/bug30889.phpt
diff --git a/Zend/tests/bug32429.phpt b/Zend/tests/magic_methods/bug32429.phpt
similarity index 100%
rename from Zend/tests/bug32429.phpt
rename to Zend/tests/magic_methods/bug32429.phpt
diff --git a/Zend/tests/bug43450.phpt b/Zend/tests/magic_methods/bug43450.phpt
similarity index 100%
rename from Zend/tests/bug43450.phpt
rename to Zend/tests/magic_methods/bug43450.phpt
diff --git a/Zend/tests/bug46238.phpt b/Zend/tests/magic_methods/bug46238.phpt
similarity index 100%
rename from Zend/tests/bug46238.phpt
rename to Zend/tests/magic_methods/bug46238.phpt
diff --git a/Zend/tests/bug46409.phpt b/Zend/tests/magic_methods/bug46409.phpt
similarity index 100%
rename from Zend/tests/bug46409.phpt
rename to Zend/tests/magic_methods/bug46409.phpt
diff --git a/Zend/tests/bug47353.phpt b/Zend/tests/magic_methods/bug47353.phpt
similarity index 100%
rename from Zend/tests/bug47353.phpt
rename to Zend/tests/magic_methods/bug47353.phpt
diff --git a/Zend/tests/bug51421.phpt b/Zend/tests/magic_methods/bug51421.phpt
similarity index 100%
rename from Zend/tests/bug51421.phpt
rename to Zend/tests/magic_methods/bug51421.phpt
diff --git a/Zend/tests/bug51822.phpt b/Zend/tests/magic_methods/bug51822.phpt
similarity index 100%
rename from Zend/tests/bug51822.phpt
rename to Zend/tests/magic_methods/bug51822.phpt
diff --git a/Zend/tests/bug52879.phpt b/Zend/tests/magic_methods/bug52879.phpt
similarity index 100%
rename from Zend/tests/bug52879.phpt
rename to Zend/tests/magic_methods/bug52879.phpt
diff --git a/Zend/tests/bug61025.phpt b/Zend/tests/magic_methods/bug61025.phpt
similarity index 100%
rename from Zend/tests/bug61025.phpt
rename to Zend/tests/magic_methods/bug61025.phpt
diff --git a/Zend/tests/bug61970.phpt b/Zend/tests/magic_methods/bug61970.phpt
similarity index 100%
rename from Zend/tests/bug61970.phpt
rename to Zend/tests/magic_methods/bug61970.phpt
diff --git a/Zend/tests/bug61970_1.phpt b/Zend/tests/magic_methods/bug61970_1.phpt
similarity index 100%
rename from Zend/tests/bug61970_1.phpt
rename to Zend/tests/magic_methods/bug61970_1.phpt
diff --git a/Zend/tests/bug61970_2.phpt b/Zend/tests/magic_methods/bug61970_2.phpt
similarity index 100%
rename from Zend/tests/bug61970_2.phpt
rename to Zend/tests/magic_methods/bug61970_2.phpt
diff --git a/Zend/tests/bug63462.phpt b/Zend/tests/magic_methods/bug63462.phpt
similarity index 100%
rename from Zend/tests/bug63462.phpt
rename to Zend/tests/magic_methods/bug63462.phpt
diff --git a/Zend/tests/bug66609.phpt b/Zend/tests/magic_methods/bug66609.phpt
similarity index 100%
rename from Zend/tests/bug66609.phpt
rename to Zend/tests/magic_methods/bug66609.phpt
diff --git a/Zend/tests/bug69212.phpt b/Zend/tests/magic_methods/bug69212.phpt
similarity index 100%
rename from Zend/tests/bug69212.phpt
rename to Zend/tests/magic_methods/bug69212.phpt
diff --git a/Zend/tests/bug70215.phpt b/Zend/tests/magic_methods/bug70215.phpt
similarity index 100%
rename from Zend/tests/bug70215.phpt
rename to Zend/tests/magic_methods/bug70215.phpt
diff --git a/Zend/tests/bug70223.phpt b/Zend/tests/magic_methods/bug70223.phpt
similarity index 100%
rename from Zend/tests/bug70223.phpt
rename to Zend/tests/magic_methods/bug70223.phpt
diff --git a/Zend/tests/bug70967.phpt b/Zend/tests/magic_methods/bug70967.phpt
similarity index 100%
rename from Zend/tests/bug70967.phpt
rename to Zend/tests/magic_methods/bug70967.phpt
diff --git a/Zend/tests/bug71818.phpt b/Zend/tests/magic_methods/bug71818.phpt
similarity index 100%
rename from Zend/tests/bug71818.phpt
rename to Zend/tests/magic_methods/bug71818.phpt
diff --git a/Zend/tests/bug72177.phpt b/Zend/tests/magic_methods/bug72177.phpt
similarity index 100%
rename from Zend/tests/bug72177.phpt
rename to Zend/tests/magic_methods/bug72177.phpt
diff --git a/Zend/tests/bug72177_2.phpt b/Zend/tests/magic_methods/bug72177_2.phpt
similarity index 100%
rename from Zend/tests/bug72177_2.phpt
rename to Zend/tests/magic_methods/bug72177_2.phpt
diff --git a/Zend/tests/bug72854.phpt b/Zend/tests/magic_methods/bug72854.phpt
similarity index 100%
rename from Zend/tests/bug72854.phpt
rename to Zend/tests/magic_methods/bug72854.phpt
diff --git a/Zend/tests/bug73288.phpt b/Zend/tests/magic_methods/bug73288.phpt
similarity index 100%
rename from Zend/tests/bug73288.phpt
rename to Zend/tests/magic_methods/bug73288.phpt
diff --git a/Zend/tests/bug74053.phpt b/Zend/tests/magic_methods/bug74053.phpt
similarity index 100%
rename from Zend/tests/bug74053.phpt
rename to Zend/tests/magic_methods/bug74053.phpt
diff --git a/Zend/tests/bug77613.phpt b/Zend/tests/magic_methods/bug77613.phpt
similarity index 100%
rename from Zend/tests/bug77613.phpt
rename to Zend/tests/magic_methods/bug77613.phpt
diff --git a/Zend/tests/bug78973.phpt b/Zend/tests/magic_methods/bug78973.phpt
similarity index 100%
rename from Zend/tests/bug78973.phpt
rename to Zend/tests/magic_methods/bug78973.phpt
diff --git a/Zend/tests/bug80037.phpt b/Zend/tests/magic_methods/bug80037.phpt
similarity index 100%
rename from Zend/tests/bug80037.phpt
rename to Zend/tests/magic_methods/bug80037.phpt
diff --git a/Zend/tests/bug80045.phpt b/Zend/tests/magic_methods/bug80045.phpt
similarity index 100%
rename from Zend/tests/bug80045.phpt
rename to Zend/tests/magic_methods/bug80045.phpt
diff --git a/Zend/tests/bug78454_1.phpt b/Zend/tests/numeric_literal_separator/bug78454_1.phpt
similarity index 100%
rename from Zend/tests/bug78454_1.phpt
rename to Zend/tests/numeric_literal_separator/bug78454_1.phpt
diff --git a/Zend/tests/bug78454_2.phpt b/Zend/tests/numeric_literal_separator/bug78454_2.phpt
similarity index 100%
rename from Zend/tests/bug78454_2.phpt
rename to Zend/tests/numeric_literal_separator/bug78454_2.phpt
diff --git a/Zend/tests/bug68446.phpt b/Zend/tests/parameter_default_values/bug68446.phpt
similarity index 100%
rename from Zend/tests/bug68446.phpt
rename to Zend/tests/parameter_default_values/bug68446.phpt
diff --git a/Zend/tests/bug34045.phpt b/Zend/tests/serialize/bug34045.phpt
similarity index 100%
rename from Zend/tests/bug34045.phpt
rename to Zend/tests/serialize/bug34045.phpt
diff --git a/Zend/tests/bug64354.phpt b/Zend/tests/serialize/bug64354.phpt
similarity index 100%
rename from Zend/tests/bug64354.phpt
rename to Zend/tests/serialize/bug64354.phpt
diff --git a/Zend/tests/bug69761.phpt b/Zend/tests/serialize/bug69761.phpt
similarity index 100%
rename from Zend/tests/bug69761.phpt
rename to Zend/tests/serialize/bug69761.phpt
diff --git a/Zend/tests/bug70121.phpt b/Zend/tests/serialize/bug70121.phpt
similarity index 100%
rename from Zend/tests/bug70121.phpt
rename to Zend/tests/serialize/bug70121.phpt
diff --git a/Zend/tests/bug70187.phpt b/Zend/tests/serialize/bug70187.phpt
similarity index 100%
rename from Zend/tests/bug70187.phpt
rename to Zend/tests/serialize/bug70187.phpt
diff --git a/Zend/tests/bug70187_2.phpt b/Zend/tests/serialize/bug70187_2.phpt
similarity index 100%
rename from Zend/tests/bug70187_2.phpt
rename to Zend/tests/serialize/bug70187_2.phpt
diff --git a/Zend/tests/bug70253.phpt b/Zend/tests/serialize/bug70253.phpt
similarity index 100%
rename from Zend/tests/bug70253.phpt
rename to Zend/tests/serialize/bug70253.phpt
diff --git a/Zend/tests/bug71841.phpt b/Zend/tests/serialize/bug71841.phpt
similarity index 100%
rename from Zend/tests/bug71841.phpt
rename to Zend/tests/serialize/bug71841.phpt
diff --git a/Zend/tests/bug73900.phpt b/Zend/tests/serialize/bug73900.phpt
similarity index 100%
rename from Zend/tests/bug73900.phpt
rename to Zend/tests/serialize/bug73900.phpt
diff --git a/Zend/tests/bug76502.phpt b/Zend/tests/serialize/bug76502.phpt
similarity index 100%
rename from Zend/tests/bug76502.phpt
rename to Zend/tests/serialize/bug76502.phpt
diff --git a/Zend/tests/bug26281.phpt b/Zend/tests/switch/bug26281.phpt
similarity index 100%
rename from Zend/tests/bug26281.phpt
rename to Zend/tests/switch/bug26281.phpt
diff --git a/Zend/tests/bug26696.phpt b/Zend/tests/switch/bug26696.phpt
similarity index 100%
rename from Zend/tests/bug26696.phpt
rename to Zend/tests/switch/bug26696.phpt
diff --git a/Zend/tests/bug26801.phpt b/Zend/tests/switch/bug26801.phpt
similarity index 100%
rename from Zend/tests/bug26801.phpt
rename to Zend/tests/switch/bug26801.phpt
diff --git a/Zend/tests/bug29944.phpt b/Zend/tests/switch/bug29944.phpt
similarity index 100%
rename from Zend/tests/bug29944.phpt
rename to Zend/tests/switch/bug29944.phpt
diff --git a/Zend/tests/bug38623.phpt b/Zend/tests/switch/bug38623.phpt
similarity index 100%
rename from Zend/tests/bug38623.phpt
rename to Zend/tests/switch/bug38623.phpt
diff --git a/Zend/tests/bug71756.phpt b/Zend/tests/switch/bug71756.phpt
similarity index 100%
rename from Zend/tests/bug71756.phpt
rename to Zend/tests/switch/bug71756.phpt
diff --git a/Zend/tests/bug71914.phpt b/Zend/tests/switch/bug71914.phpt
similarity index 100%
rename from Zend/tests/bug71914.phpt
rename to Zend/tests/switch/bug71914.phpt
diff --git a/Zend/tests/bug72508.phpt b/Zend/tests/switch/bug72508.phpt
similarity index 100%
rename from Zend/tests/bug72508.phpt
rename to Zend/tests/switch/bug72508.phpt
diff --git a/Zend/tests/bug33318.phpt b/Zend/tests/throw/bug33318.phpt
similarity index 100%
rename from Zend/tests/bug33318.phpt
rename to Zend/tests/throw/bug33318.phpt
diff --git a/Zend/tests/bug55825.phpt b/Zend/tests/traits/bug55825.phpt
similarity index 100%
rename from Zend/tests/bug55825.phpt
rename to Zend/tests/traits/bug55825.phpt
diff --git a/Zend/tests/bug60536_001.phpt b/Zend/tests/traits/bug60536_001.phpt
similarity index 100%
rename from Zend/tests/bug60536_001.phpt
rename to Zend/tests/traits/bug60536_001.phpt
diff --git a/Zend/tests/bug60536_002.phpt b/Zend/tests/traits/bug60536_002.phpt
similarity index 100%
rename from Zend/tests/bug60536_002.phpt
rename to Zend/tests/traits/bug60536_002.phpt
diff --git a/Zend/tests/bug60536_003.phpt b/Zend/tests/traits/bug60536_003.phpt
similarity index 100%
rename from Zend/tests/bug60536_003.phpt
rename to Zend/tests/traits/bug60536_003.phpt
diff --git a/Zend/tests/bug60536_004.phpt b/Zend/tests/traits/bug60536_004.phpt
similarity index 100%
rename from Zend/tests/bug60536_004.phpt
rename to Zend/tests/traits/bug60536_004.phpt
diff --git a/Zend/tests/bug60536_005.phpt b/Zend/tests/traits/bug60536_005.phpt
similarity index 100%
rename from Zend/tests/bug60536_005.phpt
rename to Zend/tests/traits/bug60536_005.phpt
diff --git a/Zend/tests/bug62892.phpt b/Zend/tests/traits/bug62892.phpt
similarity index 100%
rename from Zend/tests/bug62892.phpt
rename to Zend/tests/traits/bug62892.phpt
diff --git a/Zend/tests/bug70156.phpt b/Zend/tests/traits/bug70156.phpt
similarity index 100%
rename from Zend/tests/bug70156.phpt
rename to Zend/tests/traits/bug70156.phpt
diff --git a/Zend/tests/bug67938.phpt b/Zend/tests/variadic/bug67938.phpt
similarity index 100%
rename from Zend/tests/bug67938.phpt
rename to Zend/tests/variadic/bug67938.phpt
diff --git a/Zend/tests/bug80049.phpt b/Zend/tests/variadic/bug80049.phpt
similarity index 100%
rename from Zend/tests/bug80049.phpt
rename to Zend/tests/variadic/bug80049.phpt
diff --git a/Zend/zend_multiply.h b/Zend/zend_multiply.h
index 1eece465feefa..bdeb435d44319 100644
--- a/Zend/zend_multiply.h
+++ b/Zend/zend_multiply.h
@@ -290,6 +290,19 @@ static zend_always_inline size_t zend_safe_address(size_t nmemb, size_t size, si
 	return (size_t) res;
 }
 
+#elif defined(_MSC_VER)
+
+static zend_always_inline size_t zend_safe_address(size_t nmemb, size_t size, size_t offset, bool *overflow)
+{
+	size_t res;
+	if (UNEXPECTED(FAILED(ULongLongMult(nmemb, size, &res)) || FAILED(ULongLongAdd(res, offset, &res)))) {
+		*overflow = 1;
+		return 0;
+	}
+	*overflow = 0;
+	return res;
+}
+
 #else
 
 static zend_always_inline size_t zend_safe_address(size_t nmemb, size_t size, size_t offset, bool *overflow)
diff --git a/Zend/zend_portability.h b/Zend/zend_portability.h
index 0acec2bf3baf7..f5e0b15788ecc 100644
--- a/Zend/zend_portability.h
+++ b/Zend/zend_portability.h
@@ -338,9 +338,7 @@ char *alloca();
 # define HAVE_BUILTIN_CONSTANT_P
 #endif
 
-#if __has_attribute(element_count)
-#define ZEND_ELEMENT_COUNT(m) __attribute__((element_count(m)))
-#elif __has_attribute(counted_by)
+#if __has_attribute(counted_by)
 #define ZEND_ELEMENT_COUNT(m) __attribute__((counted_by(m)))
 #else
 #define ZEND_ELEMENT_COUNT(m)
diff --git a/docs/source/core/data-structures/index.rst b/docs/source/core/data-structures/index.rst
index 327e025b92c72..8fcb860f686b2 100644
--- a/docs/source/core/data-structures/index.rst
+++ b/docs/source/core/data-structures/index.rst
@@ -8,5 +8,6 @@
    zval
    reference-counting
    zend_string
+   zend_constant
 
 This section provides an overview of the core data structures used in php-src.
diff --git a/docs/source/core/data-structures/zend_constant.rst b/docs/source/core/data-structures/zend_constant.rst
new file mode 100644
index 0000000000000..a4245d6e3c13f
--- /dev/null
+++ b/docs/source/core/data-structures/zend_constant.rst
@@ -0,0 +1,64 @@
+###############
+ zend_constant
+###############
+
+PHP constants (referring to non-class constants) are stored in a dedicated structure
+``zend_constant``, which holds both the value of the constant and details for using it.
+
+************
+ definition
+************
+
+.. code:: c
+
+   typedef struct _zend_constant {
+       zval value;
+       zend_string *name;
+       zend_string *filename;
+   } zend_constant;
+
+The ``value`` field stores both the value itself and some metadata. The ``name`` and ``filename``
+store the name of the constant and the name of the file in which it was defined.
+
+*******
+ value
+*******
+
+The value of the constant is stored in the :doc:`./zval` ``value``. However, since the ``zval``
+structure has extra space, for constants this is used to store both the number of the module that
+the constant was defined in, and a combination of the flags that affect the usage of the constant.
+
+This extra information is placed in the ``uint32_t`` field ``value.u2.constant_flags``.
+
+The bottom 16 bits are used to hold flags about the constant
+
+.. code:: c
+
+   #define CONST_PERSISTENT     (1<<0) /* Persistent */
+   #define CONST_NO_FILE_CACHE  (1<<1) /* Can't be saved in file cache */
+   #define CONST_DEPRECATED     (1<<2) /* Deprecated */
+   #define CONST_OWNED          (1<<3) /* constant should be destroyed together
+                                            with class */
+
+These bottom 16 bits can be accessed with the ``ZEND_CONSTANT_FLAGS()`` macro, which is given a
+``zend_constant`` pointer as a parameter.
+
+On the other hand, the top 16 bits are used to store the number of the PHP module that registered
+the constant. For constants defined by the user, the module number stored will be
+``PHP_USER_CONSTANT``. This module number can be accessed with the ``ZEND_CONSTANT_MODULE_NUMBER()``
+macro, which is likewise given a ``zend_constant`` pointer as a parameter.
+
+******
+ name
+******
+
+The ``name`` holds a :doc:`zend_string` with the name of the constant, to allow searching for
+constants that have already been defined. This string is released when the constant itself is freed.
+
+**********
+ filename
+**********
+
+Finally, the ``filename`` holds another ``zend_string`` with the name of the file in which the
+constant was defined, or ``NULL`` if not defined userland code. This field provides the foundation
+for the PHP method ``ReflectionConstant::getFileName()``.
diff --git a/ext/com_dotnet/com_com.c b/ext/com_dotnet/com_com.c
index 05c2f98e903c4..cf44858c93b78 100644
--- a/ext/com_dotnet/com_com.c
+++ b/ext/com_dotnet/com_com.c
@@ -38,7 +38,7 @@ PHP_METHOD(com, __construct)
 	OLECHAR *moniker;
 	CLSID clsid;
 	CLSCTX ctx = CLSCTX_SERVER;
-	HRESULT res = E_FAIL;
+	HRESULT res = E_FAIL, res2;
 	ITypeLib *TL = NULL;
 	COSERVERINFO	info;
 	COAUTHIDENTITY	authid = {0};
@@ -142,7 +142,7 @@ PHP_METHOD(com, __construct)
 		}
 	}
 
-	if (FAILED(CLSIDFromString(moniker, &clsid))) {
+	if (FAILED(res2 = CLSIDFromString(moniker, &clsid))) {
 		/* try to use it as a moniker */
 		IBindCtx *pBindCtx = NULL;
 		IMoniker *pMoniker = NULL;
@@ -182,6 +182,9 @@ PHP_METHOD(com, __construct)
 		if (pBindCtx) {
 			IBindCtx_Release(pBindCtx);
 		}
+		if (FAILED(res) && res2 == CO_E_CLASSSTRING && !wcspbrk(moniker, L"\\:")) {
+			res = res2;
+		}
 	} else if (server_name) {
 		MULTI_QI		qi;
 
diff --git a/ext/curl/tests/check_win_config.phpt b/ext/curl/tests/check_win_config.phpt
index b3beb044a7cfc..fc29e37281970 100644
--- a/ext/curl/tests/check_win_config.phpt
+++ b/ext/curl/tests/check_win_config.phpt
@@ -54,7 +54,7 @@ UNICODE => No
 ZSTD => No
 HSTS => Yes
 GSASL => No
-Protocols => dict, file, ftp, ftps, gopher, %r(gophers, )?%rhttp, https, imap, imaps, ldap, ldaps, %r(mqtt, )?%rpop3, pop3s, rtsp, scp, sftp, smb, smbs, smtp, smtps, telnet, tftp
+Protocols => dict, file, ftp, ftps, gopher, %r(gophers, )?%rhttp, https, imap, imaps, ldap, ldaps, %r(mqtt, )?%rpop3, pop3s, rtsp, scp, sftp, smb, smbs, smtp, smtps, telnet, tftp%r(, ws)?(, wss)?%r
 Host => %s-pc-win32
 SSL Version => OpenSSL/%s
 ZLib Version => %s
diff --git a/ext/gd/libgd/gd.c b/ext/gd/libgd/gd.c
index a87e7131375d9..757af88414d5a 100644
--- a/ext/gd/libgd/gd.c
+++ b/ext/gd/libgd/gd.c
@@ -3187,7 +3187,11 @@ int gdImagePaletteToTrueColor(gdImagePtr src)
 		const unsigned int sy = gdImageSY(src);
 		const unsigned int sx = gdImageSX(src);
 
-		src->tpixels = (int **) gdMalloc(sizeof(int *) * sy);
+		// Note: do not revert back to gdMalloc() below ; reason here,
+		// due to a bug with a certain memory_limit INI value treshold,
+		// imagepalettetotruecolor crashes with even unrelated ZendMM allocations.
+		// See GH-17772 for an use case.
+		src->tpixels = (int **) gdCalloc(sizeof(int *), sy);
 		if (src->tpixels == NULL) {
 			return 0;
 		}
diff --git a/ext/gd/tests/gh17772.phpt b/ext/gd/tests/gh17772.phpt
new file mode 100644
index 0000000000000..6252a13341f41
--- /dev/null
+++ b/ext/gd/tests/gh17772.phpt
@@ -0,0 +1,28 @@
+--TEST--
+GH-17772 (imagepalettetotruecolor segfault on image deallocation)
+--EXTENSIONS--
+gd
+--INI--
+memory_limit=2M
+--CREDITS--
+YuanchengJiang
+--SKIPIF--
+<?php
+if (!GD_BUNDLED) die("skip requires bundled GD library");
+?>
+--FILE--
+<?php
+function setStyleAndThickness($im, $color, $thickness)
+{
+$arr = [];
+$i = 0;
+while ($i < 16 * $thickness) {
+$arer[$i++] = $color;
+}
+}
+$im = imagecreate(800, 800);
+setStyleAndThickness($im, 0, 6);
+imagepalettetotruecolor($im);
+?>
+--EXPECTF--
+Fatal error: Allowed memory size of %d bytes exhausted%s(tried to allocate %d bytes) in %s on line %d
diff --git a/ext/reflection/php_reflection.c b/ext/reflection/php_reflection.c
index fcaa5c270e25c..6d5b9d71c27ae 100644
--- a/ext/reflection/php_reflection.c
+++ b/ext/reflection/php_reflection.c
@@ -4828,24 +4828,19 @@ ZEND_METHOD(ReflectionClass, isCloneable)
 	if (ce->ce_flags & (ZEND_ACC_INTERFACE | ZEND_ACC_TRAIT | ZEND_ACC_EXPLICIT_ABSTRACT_CLASS | ZEND_ACC_IMPLICIT_ABSTRACT_CLASS | ZEND_ACC_ENUM)) {
 		RETURN_FALSE;
 	}
+	if (ce->clone) {
+		RETURN_BOOL(ce->clone->common.fn_flags & ZEND_ACC_PUBLIC);
+	}
 	if (!Z_ISUNDEF(intern->obj)) {
-		if (ce->clone) {
-			RETURN_BOOL(ce->clone->common.fn_flags & ZEND_ACC_PUBLIC);
-		} else {
-			RETURN_BOOL(Z_OBJ_HANDLER(intern->obj, clone_obj) != NULL);
-		}
+		RETURN_BOOL(Z_OBJ_HANDLER(intern->obj, clone_obj) != NULL);
 	} else {
-		if (ce->clone) {
-			RETURN_BOOL(ce->clone->common.fn_flags & ZEND_ACC_PUBLIC);
-		} else {
-			if (UNEXPECTED(object_init_ex(&obj, ce) != SUCCESS)) {
-				return;
-			}
-			/* We're not calling the constructor, so don't call the destructor either. */
-			zend_object_store_ctor_failed(Z_OBJ(obj));
-			RETVAL_BOOL(Z_OBJ_HANDLER(obj, clone_obj) != NULL);
-			zval_ptr_dtor(&obj);
+		if (UNEXPECTED(object_init_ex(&obj, ce) != SUCCESS)) {
+			return;
 		}
+		/* We're not calling the constructor, so don't call the destructor either. */
+		zend_object_store_ctor_failed(Z_OBJ(obj));
+		RETVAL_BOOL(Z_OBJ_HANDLER(obj, clone_obj) != NULL);
+		zval_ptr_dtor(&obj);
 	}
 }
 /* }}} */
diff --git a/ext/standard/tests/mail/mail_util.inc b/ext/standard/tests/mail/mail_util.inc
index 72e9f32fb82b3..0eee6cb9caaee 100644
--- a/ext/standard/tests/mail/mail_util.inc
+++ b/ext/standard/tests/mail/mail_util.inc
@@ -143,7 +143,7 @@ class MailBox
 
         $this->mailConnecter->send(self::SEARCH, "UID SEARCH SUBJECT \"{$subject}\"");
         $res = $this->mailConnecter->getResponse(self::SEARCH);
-        preg_match('/SEARCH ([0-9 ]+)/is', $res, $matches);
+        preg_match('/SEARCH ([0-9 ]+)/i', $res, $matches);
         return isset($matches[1]) ? explode(' ', trim($matches[1])) : [];
     }
 
@@ -166,8 +166,7 @@ class MailBox
             if (!$line) {
                 continue;
             }
-            $items = explode(':', $line);
-            preg_match('/^(.+?):(.+?)$/', $line, $matches);
+            preg_match('/^(.+?):(.+)$/', $line, $matches);
             $key = trim($matches[1] ?? '');
             $val = trim($matches[2] ?? '');
             if (!$key || !$val || $val === self::FETCH_HEADERS.' OK UID completed' || $val === ')') {
diff --git a/win32/build/phpize.js.in b/win32/build/phpize.js.in
index 0f7a8ab18123b..2be46a476b352 100644
--- a/win32/build/phpize.js.in
+++ b/win32/build/phpize.js.in
@@ -92,6 +92,7 @@ function find_config_w32(dirname)
 
 		deps = get_module_dep(contents);
 
+		n = "";
 		item = new Module_Item(n, c, dir_line, deps, contents);
 		MODULES.Add(n, item);
 	}