Merged with trunk revision 610