Protect What Matters 20879

Change with Stability 20676