Merge branch 'locks'