[MERGE] sync with latest trunk