Merge pull request #10799 from hydra/bf-sdcard-fixes-2