Stability for the Next Generation 21876

Change with Stability 21778