[MERGE] sync with trunk