Merge branch 'sp/fetch-fix'