Merge branch 't/zero-rsync-fix'