Merge "Prevent cursor from causing global reference leaks."