Build #928:   Merge branch 'rewrite' into v2 on branch v2 over 6 years ago