Synchronize with trunk up to r127472
Synchronize with trunk up to r127474