Merge branch 'pa/import-tars-long-names'