SM-8158 Ping Support update