Merged with trunk R1393.