Synchronize with trunk up to r121298
Synchronize up to trunk r124929
Synchronize with trunk up to r125276
Synchronize with trunk up to r125282
Synchronize with trunk up to r125283
Synchronize with trunk up to r125375
Synchronize with trunk up to r126142