Merge branch 'bank-transaction-improvements'