Merge branch 'locking/core'