Merge branch 'bridge-fixes'