Merge branch 'bridge-non-promisc'