Stability for the Next Generation 26075

Change with Stability 26054