Initial rewrite commit
Merge branch 'master' into 2.0