Cleanup dummy tracking information slot
Merge with upstream and rebuild