Manually merging in changes from 6.x-3.3-rc1 to avoid merge conflicts with this branch.