Changes to prepare for the MC change
Merge remote-tracking branch 'origin/master'