Add heartbeat support
Merge branch 'feature-leader-heartbeat'