Merge "Fix broken wincache merge() implementation"