Merged to trunk