Merge with Trunk revision 11167