Update to trunk revision 2163