Merge branch 'partial-rewrite' into next