Implement heartbeat [64208666]
Added proxy [68385122]
removed some comments
Heartbeat support
Merge branch 'feature/64208666' into develop
Merge branch 'feature/68385122' into develop