Merged with trunk R861