Only fetch when creating the dist output
Merge branch 'v3.0'