Update to upstream 2.2.3