Rebase events leak

Close #6844