Merge pull request #8492 from BKPepe/fping