Merge with Trunk Revision 9613
Merged with Trunk Revision 10109.
Resolved conflicts.