Merge with Trunk revision 11167
Complete the incomplete merge.
Fixed merge conflicts.