Main into develop post 0.8.4

[hakonanes]

Description of the change

Main into develop post 0.8.4.

For reviewers

• [ ] The PR title is short, concise, and will make sense 1 year later.
• [ ] New functions are imported in corresponding __init__.py.
• [ ] New features, API changes, and deprecations are mentioned in the unreleased section in CHANGELOG.rst.
• [ ] New contributors are added to release.py, .zenodo.json and .all-contributorsrc with the table regenerated.