Merge -r 127928:132243 from trunk