Merge branch 'mh/ref-transaction'