Plan is still to include it in 12.1. I'll review the patch in detail today or tomorrow, and will let you know if there are any issues. Not sure if I'll make the UI changes for 12.1, but it seems like you're okay either way. Commit will likely take place in the next couple days, so testing late this week would be ideal.

Adam