Restore Balance 1063

Change with Stability 1018