Change with Stability 7814

Protect What Matters 4863