Merge branch 'bridge'