Merge branch 'ab/replace-graft-with-replace-advice'