Merge pull request #16753 from agh1/consolidated-php-version