Change with Stability 8662

Stability for the Next Generation 8638