Change with Stability 2736

Stability for the Next Generation 2693