Fix locking issues

Mateusz Żebrakrequested to merge
mzebrak/fix-lock-sync-race-condition into develop

Closes #405 (closed), #394 (closed)

Requires: !601 (merged)

Edited by Mateusz Żebrak

Merge request reports