Merge from upstream (r1450)