Merge release 3.0

Creating a PR as I had to fix some merge conflicts.