MLHR-930 #resolve
Merge pull request #860 from andyperlitch/heartbeat_-1.MLHR-930

MLHR-930 #resolve