Merge pull request #1137 from TheBlueMatt/2021-10-ping-fixes