Merge branch 'locking/arch-atomic' into locking/core, because the topic is ready