[MERGE] merged trunk up to revision 9350