New stuff and fix for transaction controller [skip ci]