Co-authored-by: Peter Goodspeed-Niklaus <coriolinus@users.noreply.github.com>