[release-1.11] 1.11 backports

[IanButterworth]

Backported PRs:

• [x] #3852
• [x] #3865
• [x] #4020
• [x] #4000
• [x] #4022
• [x] #4025

Contains multiple commits, manual intervention needed:

• [x] #4001