3 backports to do

master 8.7 7.6
Oliver Hader
Files: 2
Patches: 7
Review:
Tested:
Oliver Hader
Files: 2
Patches: 6
Review:
Tested:
Oliver Hader
Files: 1
Patches: 4
Review:
Tested:
Wouter Wolters
Files: 1
Patches: 4
Review:
Tested:
Files: 1
Patches: 1
Review:
Tested:
Tymoteusz Motylewski
Files: 3
Patches: 2
Review:
Tested:
Files: 3
Patches: 2
Review:
Tested: