Stability for the Next Generation 23258

Change with Stability 23225