Merge branch 'fixes-mmc' into fixes