Add support for manual heartbeat control