yet another attempt at resolving deadlock issues
Merge pull request #1387 from marcel-blonk/PLFM-2856

yet another attempt at resolving deadlock issues