Merged from trunk