PRs: here and here
Hopefully they will get merged. If I can’t get them merged, I will release builds with the features here.
