Merge from upstream (2.2.1).