am ead3d06b: am 67e82fb1: Merge "Atomic/SMP update, part 2." into kraken