Merge "Fix cursor position update issue" into devel/master