Merge branch 'rewrite' into 'master'