Merge branch 'mmci' into fixes