Merge branch 'cc/replace-graft'