Reduce duplication in MBC code
Merge branch 'mbc-rewrite'