Merge branch 'bridge-tx-fwd'