Merge head r256150 through r274349.