Mouse - sync the patch with upstream