mouse - sync the patch with upstream