Armor Trims Backport

Backport of the Armor Trims from 1.20