Merge "Preventing cursor leaks"