Taking Back Control 26473

Change with Stability 25288