Merge with Trunk Revision 11021.