Update brushrewrite branch