Merge branch 'core/locking' into perfcounters/core