Restore Order 25788

Stability for the Next Generation 23032