Update to trunk revision 2394