Merge branch 'jk/no-optional-locks'