Merged from trunk 17645:17739