Merge pull request #8491 from hydra/bf-h7-sd-fixes