Merge branch 'km/fetch-do-not-free-remote-name' into maint