#193. Adding support for fulfillment options.(cherry picked from commit 19ef6d26ebddd8e22446d43c895b2af45490b66c)