Partial DirtArmor commit