Synchronize with trunk up to r126837