[avatar] Added armor.
Merge branch 'armor'