Merge pull request #19084 from jtkohl/watchcat-ping-bugfix