Manually import MtMNCs changes

Turns out I'm not very good at merging...