Heartbeat every 60 seconds to get more accurate stats
Merge remote-tracking branch 'upstream/master'
fixed merge with master