Merge branch 'bridge-mc-fixes'