Merge pull request #18116 from hnyman/oping