Merge branch 'rocker-transaction-fixes'