Merge "Check for cursor closed." into ics-mr0