Backport patches
These changes cherry picks commits from experimental done by @delta-one. I have tested them building against stable, but I'll do another build before uploading, if approved.
These changes cherry picks commits from experimental done by @delta-one. I have tested them building against stable, but I'll do another build before uploading, if approved.