CA-132066 Make Heartbeat work as designed