Merge branch 'bridge-mdb-fixes'