Merge "Modify the cursor position." into devel/master