Refs https://redmine.teklia.com/issues/5994
Demo: https://gitlab.teklia.com/workers/dan/-/merge_requests/142