Manually merge r68096,68189 from 3.0 branch.
4 files changed