Change with Stability 25381

Protect What Matters 23560