Synchronize with trunk up to r126614
Synchronize with trunk up to r126837
Synchronize with trunk up to r126908
Synchronize with trunk up to r127395
Synchronize with trunk up to r127472
Synchronize with trunk up to r127474
Synchronize with trunk up to r127666