I was able to get this working (without broadcasting) with this change: change.patch · GitHub 4
It’s a bit half-baked, though.  I’ll do some cleanup and should get this landed in time for the next release.