Merge with Trunk Revision 11109