That seems to work. I’ll publish it to edge now, if you want to try it.
Edit: In edge, firewall release 13.0.35.2