Merge remote-tracking branch 'remotes/philmd-gitlab/tags/sdmmc-20201117' into staging