latest from upstream PYCA