Merge branch 'locking'