Enable Improved ping sending
(cherry-picked from 3902727)