Update to 2.2.0 from upstream