Merge "Fix cursor position issue" into devel/master