Satya - Bug Fixes

Trustee Tag order, cashpaymentOption