Update documentation, see #2993
Add uid to Heartbeat msg to be able to quarantine, see #2993