IIRC, the Clarity bill is supposed to include that

Although, I must admit that I don't have confirmation that it's in the current bills being debated

I hope so!