Minimal upgrade to 20220815

This is the minimal amount of changes to get the source package to build with 20220815 upstream. Comments welcome!

I'll base other MRs on top of this one.