Merge with Trunk Revision 10477
Merge with Trunk Revision 10506.