Merge branch 'sh/sdio' into sh-latest