Stability for the Next Generation 24564

Change with Stability 24539