[BT-23] Fix Quest and little change in armory patch.