Merge branch '9-fix-builds-post-release-of-php-8' into develop