- Merge from trunk up to r45543