Merge trunk up to 45598.
2 files changed