Merge remote-tracking branch 'origin/wip-ungrafting' into HEAD