Merge branch 'rs/ref-transaction' into jch