Restore Order 24599

Optimizing the Future 22817

Stability for the Next Generation 22265