Merged with trunk R992.