Merge with Trunk Revision 10477
Merge with Trunk Revision 10506.
Merge with Trunk Revision 10743
Fixed merge conflicts.