Merge "monitor: ping back on startup"