Merge devel into feature/buster post-3.11
Type of work:
I'm skipping the merge from devel into feature/buster during the 3.11 release process because:
- there are a few conflicts to be taken care of
- I'm one of the developers dealing with feature/buster anyway.
Let's get feature/buster-specific things out of the way for the time being. :)