The selection outputs should work with D12463, which would ideally be committed first.
Design task: T91648
I'll have a go at this.