Update to upstream 2.1