Merge branch 'jk/maint-remote-mirror-safer'