Merge commit 'c4f52bd7550f57b1d483091a71871653d8928901' * commit 'c4f52bd7550f57b1d483091a71871653d8928901': Fix issue #2163654: deadlock, runtime restart