Merge "Use a faster 7z command line by default"