Add experimental heartbeat for mappers
Oops, uncomment code
Missing FlowId
Merge branch 'master' into heartbeat
Merge branch 'heartbeat'