Potential deadlock

Merged Piotr Gawron requested to merge potential-deadlock into devel_16.0.x
Edited by Piotr Gawron

Merge request reports