Merge pull request #24340 from mhei/23.05-php8-update-to-8.2.20