Please do not check-in anything in the branch until I'm done figuring out the various regressions in the last couple of days. Folks, please run all tests with all languages to make sure no new regressions are introduced by your patch (I think some of these regressions are coming from one of my patches). Thanks. Diego.