Bring Back Common Sense 26502

Stability for the Next Generation 26461