Merged with trunk R1304