Merge "Add constant for zip separator"