r1839: pulling a few more changes from 3.0