Merge branch 'fix-locks'

1 job for master in 12 seconds (queued for 3 seconds)