Synchronize with trunk up to r127666