Fight for the Many 21699

Change with Stability 20796