Merge from mainline.
3 files changed