Merge branch 'hsmmc' into fixes-non-critical