Fixes #5579: Implement heartbeat mode