Merge branch 'rs/ref-transaction'