Synchronize with trunk up to r127395