commited merge from trunk revision 5445