move heartbeat check to only occur on timeouts
Merge branch 'djmitche/call-heartbeat'