Merge branch 'cc/replace-graft' into next