Merge pull request #4163 from wfleurant/diagnostic-ping