Merged with trunk R1612.