Fix/deadlock

Merged Sylvain Berfini requested to merge fix/deadlock into release/4.3

Merge request reports