Merge "Atomic/SMP update." into kraken