Merge branch 'rs/leave-base-name-in-name-field-of-tar' into maint