Change with Stability 27385

Protect What Matters 26062