am eabec90b: am f8e9fb3b: Merge "Atomic/SMP update." into kraken