Armor Trims Backport

Armor Trims Backport

Backport of the Armor Trims from 1.20

4,189
25