Merge branch 'bridge_mode'