Merge pull request #22312 from mlutfy/eventPhpTweak