Merge with Trunk Revision 10794.