Merge Cursor_GraphicInterface into Master