Merge pull request #20518 from seamuslee001/php8_contribution_page