Merge branch 'mz/remote-rename' into maint-1.7.6