Merge branch 'mce/bugfixes' into mce-combined