Merge pull request #2749 from BrzVlad/fix-suspend-deadlock