Stability for the Next Generation 25137

Change with Stability 25082