Update to upstream 22ff2e7