Added patch to fix NEXUS-3877; Added HeartBeat System; General improvements