Merge branch 'fm/fetch-raw-sha1' into next