Merge "Atomic/SMP update, part 2." into kraken