re-applied commits from MR10
MR10: !10 (merged)
(manually done using cherry-picking in magit).
This should not have been necessary, but somehow we lost the commits in main.
MR10: !10 (merged)
(manually done using cherry-picking in magit).
This should not have been necessary, but somehow we lost the commits in main.