Merge with Trunk Revision 11021.
Merge with Trunk revision 11046.
Fixed merge conflicts.