Add Originator support
Merge branch 'feature/gift_cards' into giftcard_search