Merge pull request #20246 from mhei/php8-update-8.2.1