Merge branch 'bridge-replay-helpers'