[MERGE] trunk