Merge branch 'rs/tar-tests' into maint