Merge branch 'jk/rebase-apply-leakfix'