Merge pull request #1820 from pavelbraginskiy/custom-armor-kit

Merge pull request #1820 from pavelbraginskiy/custom-armor-kit #646