Merge branch 'core/locking' into core/urgent