CBM armor fix.
Merge pull request #10359 from Rivet-the-Zombie/cbm-armor-fix

CBM armor fix.