Merge head r274391 through 274403.