add heartbeat handle
Merge branch 'feature-heartbeat' into develop