Removed different potential multi-node deadlocks
Merge pull request #3988 from noctarius/issue_3824

Removed different potential multi-node deadlocks