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.

requested review from @delta-one

assigned to @lisandro

@delta-one told me he is about to push Qt 6.2.4 to unstable, so it makes sense to just wait for it to arrive to testing.

closed