Merge branch 'fetcher-fixes' into 'develop'