Upstreaming of some fixes
Here are some fixes we collected that we would like to upstream, see the individual commit messages for more details
Here are some fixes we collected that we would like to upstream, see the individual commit messages for more details