Merge branch 'fetch-after-add-remote'