Merge "Speed up *TS zip file creation"