Take Back What Matters 8012

Change with Stability 7678