Merged with trunk R1283.