Merge to trunk head (r46631)