Merge "Fix Heap Corruption from too long of a TAG"