Merge pull request #14089 from annando/ping-lock