4.x
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
Merge pull request #11897 from Jakub-Golinowski:hpx_backend