Change the System 26732

Stability for the Next Generation 25426