Merge pull request #1870 from thloh85-intel/s10_mmc