Fix random Upgrade failure
Test and impl Mandarin
Test and Impl Margrave
Test and Impl Stables