Merge from A3Armory

Merge from A3Armory