Merge with Trunk Revision 9613