Introduce the first pass at the EDD_Heartbeat class. #1209
Refactor class so that the heartbeat can be disabled
Fix merge conflict of heartbeat