Merged with trunk revision 600