Merge from rewrite branch.