Merge branch 'PHP-7.4'

diff --cc azure-pipelines.yml
index 7f03f3f9ffdaf07d3daf091ca23016954f43276d,c6f047145ba8a72f7159a271b758ee45babe66cf..915b743658ac15e862100e53761ea0523494ef4d
--- 1/azure-pipelines.yml
--- 2/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@@ -63,4 -63,9 +63,9 @@@ jobs
              CFLAGS='-fsanitize=undefined,address -DZEND_TRACK_ARENA_ALLOC'
              LDFLAGS='-fsanitize=undefined,address'
          runTestsParameters: --asan
 -        timeoutInMinutes: 120
 +        timeoutInMinutes: 150
+     - template: azure/msan_job.yml
+       parameters:
+         configurationName: DEBUG_ZTS_MSAN
+         configurationParameters: '--enable-debug --enable-maintainer-zts'
+         runTestsParameters: --asan