Taking Back Control 10647

Change with Stability 10608