fix failing when heartbeat isn't set
Merge branch 'pulse' into 1-x-stable