Synchronize with trunk up to r120997