Merged with trunk R874.