pull in additional changes from 2.0 branch.