I've pushed those sources as a PR
I'd make this a feature branch so I stop rebasing stuff and you can all send "final adjustments" as follow-up commits?