Merge pull request #12069 from riidefi/silent-sd-failure Prevent SD data loss from silent resync failure
