Restore Balance 84635

Change with Stability 74096

Stability for the Next Generation 73385