Suggested by @peterkraus a while ago; won't take long to implement but will probably need some e2e tests updates, and then can use #1212 when merged.