Merge with Trunk Revision 9520.