Merge branch 'core/locking'