Merge branch 'js/rsync-local' into maint