Manually merge r68095,68186,68187,68188,68190 from 2.6 branch.
5 files changed