Merge "Fix cursor position issues." into devel/master