Merge branch 'WIP.locking/atomics' into locking/core