Merge branch 'locking/atomics' into locking/core, to pick up WIP commits