fyi, I’ve added a ticket EA-90 and started working on this.
I wasn’t planning on touching the “matching” logic, at least in the first pass.
I’m currently blocked on testing due to: