As discussed in meeting. Depends on #1069. We should also check that this is something that is wanted before we implement it.
