backported_fix_for_fetch.diff
