Merged to trunk.