Fix lock
Fix crash
Merge remote-tracking branch 'upstream/master' into next