erratum references swh-graph#4788 (closed)
(two independent changes, but they would merge-conflict. do not squash this MR)