- Merge to trunk r37270.