Change with Stability 5707

Stability for the Next Generation 5626