Change with Stability 25737

Stability for the Next Generation 25735