Should be later doable with #971 .