* Move rewrite branch to master branch