ARMORY-113 ARMORY-110 Add Lock Boxes to Address Book
Fixed a few related issues