Merged 17073:17076 from trunk.