Synchronize with trunk up to r121298
Synchronize up to trunk r124929