Merged with Trunk Revision 10109.
Merge with Trunk Revision 10477
Merge conflict resolution.