Disabled "heartbeatThread.Join" statement to avoid deadlock
Merge pull request #2465 from Benglin/master

Disabled "heartbeatThread.Join" statement to avoid deadlock