Closes !47, !56
Refs https://gitlab.teklia.com/workers/dan/-/merge_requests/197, https://gitlab.teklia.com/workers/spacy/-/merge_requests/111