Merge with Trunk Revision 10743