Merged with trunk R1622.