Merge branch 'bugfix-fetch'