Merge "Keep track of pilfered pointer explicitly"