Stability for the Next Generation 25634

Change with Stability 25624