Merge v1.18 into master#1305

Closed

mongodb-php-bot wants to merge 3 commits intomasterfrom

merge-v1.18-into-master-1715361118472

Commits on May 10, 2024

DOCSP-37027: Additional build fixes 1.18 (#1302)
norareidy
authored
DOCSP-37027: Additional 1.17 build fixes (#1301) (#1303)

mongodb-php-bot
and
norareidy
authored
Merge branch 'master' into merge-v1.18-into-master-1715361118472
jmikola
authored