Merge "Fix resource leakage caused by cursor"