Change 'mixed mode' to 'general mode'
Merge remote branch 'remotes/origin/rewrite' into rewrite