Merge branch 'partial-rewrite' into less-critical