Merge branch 'jk/stash-disable-renames-internally' into maint