Merge 17944:17988 from trunk.